土工试验Lims

api/soil/soil-statistics.js

@@ -17,6 +17,11 @@ export default {
 
   pageReportCheck: data =>
     http.post('soil/v1/entrust/page_report_check', data).then(res => res),
+
+  pageReportCheckBySummaryReport: data =>
+    http
+      .post('soil/v1/entrust/page_report_check_by_summary_report', data)
+      .then(res => res),
   pageReportIssue: data =>
     http.post('soil/v1/entrust/page_report_issue', data).then(res => res),
   pageAnnual: data =>
@@ -84,5 +89,9 @@ export default {
     http
       .post('soil/v1/statistics/page_personal_task_statistics', data)
       .then(res => res),
-  _getLabel: data => http.post('/res/v1/label/page', data).then(res => res)
+  _getLabel: data => http.post('/res/v1/label/page', data).then(res => res),
+  summaryReportSubmit: data =>
+    http
+      .post('soil/v1/report/summary_report_submit?ids=' + data)
+      .then(res => res)
 }

pages/soil-report-manage/report-audit/tabs/reportAudit.vue

@@ -84,23 +84,24 @@ export default {
         {
           title: '委托商',
           key: 'client',
-          width: 100,
+          width: 160,
           fixed: 'left'
         },
-        { title: '委托编号', key: 'entrustCode', width: 100 },
-        { title: '报告编号', key: 'reportCode', width: 100 },
-        { title: '进度', key: 'progress', width: 110, status: true },
-        { title: '状态', key: 'status', width: 100, status: true },
-        { title: '委托日期', key: 'entrustDate', width: 100, date: true },
-        { title: '钻孔位置', key: 'boreholeLocation', width: 100 },
-        { title: '钻孔名称', key: 'boreholeName', width: 100 },
-        { title: '水深', key: 'waterDepth', width: 100 },
+        { title: '项目名称', key: 'projectName', width: 150 },
+        { title: '委托编号', key: 'entrustCode', width: 150 },
+        // { title: '报告编号', key: 'reportCode', width: 100 },
+        // { title: '进度', key: 'progress', width: 110, status: true },
+        // { title: '状态', key: 'status', width: 100, status: true },
+        { title: '委托日期', key: 'entrustDate', width: 130, date: true },
+        { title: '钻孔位置', key: 'boreholeLocation', width: 140 },
+        { title: '钻孔名称', key: 'boreholeName', width: 140 },
+        { title: '水深', key: 'waterDepth', width: 150 },
         { title: '制表人', key: 'tabulater', width: 110 },
         { title: '制表日期', key: 'tabulateDate', width: 110, date: true }
       ],
       btn: [
-        { id: '', type: 'primary', name: '提交' },
-        { id: '', type: 'primary', name: '退回' }
+        // { id: '', type: 'primary', name: '提交' },
+        // { id: '', type: 'primary', name: '退回' }
       ],
       getPage: {},
       searchOpen: false,
@@ -127,7 +128,7 @@ export default {
     async _page() {
       const data = this.$serialize('lab-sample-form')
       Object.assign(data, this.$refs.pageTable._searchParams())
-      const result = await soilStatistics.pageReportCheck(data)
+      const result = await soilStatistics.pageReportCheckBySummaryReport(data)
       if (result) {
         this.getPage = result
         this.$refs.pageTable._hideLoading()
@@ -139,7 +140,6 @@ export default {
         .each(function() {
           $(this).val('')
         })
-      // this.$refs.sampleTime.handleClear()
     },
     _btnClick(msg, data) {
       switch (msg) {
@@ -152,12 +152,6 @@ export default {
         case '退回':
           this._goBack()
           break
-        case '扫码接收':
-          this._scanReceive()
-          break
-        case '手动接收':
-          this._sampleReceive()
-          break
         case 'search':
           this.searchOpen = !this.searchOpen
           break
@@ -207,12 +201,6 @@ export default {
         }
       })
     },
-    async _receiveIds(ids) {
-      const result = await soilStatistics.submitReportCheck(ids)
-      if (result) {
-        this._resultChange('提交成功!')
-      }
-    },
     _submitReportCheck() {
       const data = this.selectData
       if (data.length === 0) {
@@ -249,16 +237,6 @@ export default {
       this._formSearch()
     },
 
-    _createReport() {
-      console.log(this.currentComponent)
-      const ids = this.selectIds
-      if (ids.length === 0) {
-        this.$Message.warning('请至少选择一条数据!')
-      } else {
-        this.$refs.createReportModal._open(this.selectData)
-      }
-    },
-
     _downloadByIds() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据!')
@@ -326,9 +304,6 @@ export default {
         case 'file-page':
           this.$refs.FileManage._openFile(data)
           break
-        case 'delete-page':
-          this.$refs.FileManage._delEntrustPage('', data)
-          break
         case 'success':
           this.$Message.success('删除成功！')
           this.$refs.FileManage._pageEntrust()