修改了收样室收样

api/soil/soil-entrust.js

@@ -10,6 +10,8 @@ export default {
   page: data => http.post('soil/v1/entrust/page', data).then(res => res),
   pageReview: data =>
     http.post('soil/v1/entrust/page_review', data).then(res => res),
+  pageSampleReceive: data =>
+    http.post('soil/v1/entrust/page_sample_receive', data).then(res => res),
   getById: data => http.get('soil/v1/entrust/' + data).then(res => res),
   getVOById: data => http.get('soil/v1/entrust/vo/' + data).then(res => res),
   deleteById: data =>
@@ -35,5 +37,7 @@ export default {
       .post(
         'soil/v1/entrust/review_back?ids=' + data.ids + '&reason=' + data.remark
       )
-      .then(res => res)
+      .then(res => res),
+  reviewPass: data =>
+    http.post('soil/v1/entrust/review_pass?ids=' + data).then(res => res)
 }

pages/meter-entrust/entrust-review/ReviewEntrust.vue

@@ -38,6 +38,7 @@
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
                   <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+                  <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
@@ -186,13 +187,11 @@ export default {
     },
     _reasonResult(data) {
       if (undefined !== data && data !== '') {
-        console.log(data)
         this._reportCheckBack(data)
-        console.log('退回')
       }
-      console.log(data)
     },
     _reportCheckBack: async function(data) {
+      console.log('开始退回')
       const result = await soilEntrust.back({
         ids: this.selectIds,
         remark: data
@@ -200,6 +199,7 @@ export default {
 
       if (result) {
         this.$Message.success('退回成功！')
+        console.log('退回成功')
         await this._page()
       }
     },
@@ -298,14 +298,13 @@ export default {
         }
       })
     },
-
-    // _passEntrustReview: async function(ids) {
-    //   const result = await meterEntrust.passReview(ids)
-    //   if (result) {
-    //     this.$Message.success('提交成功！')
-    //     await this._page()
-    //   }
-    // },
+    _passEntrustReview: async function(ids) {
+      const result = await soilEntrust.reviewPass(ids)
+      if (result) {
+        this.$Message.success('提交成功！')
+        await this._page()
+      }
+    },
 
     // 追加项目
     _itemModal(data) {

pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue

@@ -46,6 +46,8 @@
                 <template slot-scope="scope">
                   <div v-if="item.detail"><a @click.stop="_detailModal(scope.row.id,scope.row.type)">{{scope.row[item.key]}}</a>
                   </div>
+                  <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+                  <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
                   <div v-else-if="item.type">{{scope.row[item.key] === 0 ? '企业':scope.row[item.key] ===
                     1?'政府':scope.row[item.key] === 2?'食品类抽样单': ''}}
                   </div>
@@ -110,15 +112,20 @@ export default {
       ],
       getPage: {},
       pageColumns: [
-        { title: '委托名称', key: 'name', width: 160 },
-        { title: '委托编号', key: 'code', width: 180, detail: true },
-        { title: '类型', key: 'type', width: 100, type: true },
-        { title: '状态', key: 'progress', width: 110 },
-        { title: '委托单位', key: 'cname' },
-        { title: '主联系人', key: 'linkman', width: 100 },
-        { title: '联系手机', key: 'tel', width: 120 },
-        { title: '检测类型', key: 'detectType', width: 130 },
-        { title: '服务类型', key: 'serviceType' }
+        { title: '委托商', key: 'client', width: 200 },
+        { title: '委托编号', key: 'entrustCode', width: 120 },
+        { title: '委托日期', key: 'entrustDate', width: 120, date: true },
+        { title: '钻孔位置', key: 'boreholeLocation', width: 120 },
+        { title: '水深（米）', key: 'waterDepth', width: 120 },
+        { title: '钻孔名称', key: 'boreholeName', width: 120 },
+        { title: '进度', key: 'progress', width: 120, status: true },
+        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '报告编号', key: 'reportCode', width: 120 },
+        { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
+        { title: '制表人', key: 'tabulater', width: 120 },
+        { title: '批准日期', key: 'approveDate', width: 120, date: true },
+        { title: '批准人', key: 'approver', width: 120 },
+        { title: '检验类别', key: 'testType', width: 120 }
       ],
       searchOpen: false,
       btn: [
@@ -405,7 +412,9 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilEntrust.page(this.$serializeForm(this.formObj))
+      const result = await soilEntrust.pageSampleReceive(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result