Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

api/soil/soil-entrust.js

@@ -8,6 +8,8 @@ import { https } from '../https'
 export default {
   // page
   page: data => http.post('soil/v1/entrust/page', data).then(res => res),
+  pageRegHis: data =>
+    http.post('soil/v1/entrust/page_reg_his', data).then(res => res),
   pageItem: data => http.post('soil/v1/experiment/page', data).then(res => res),
   pageReview: data =>
     http.post('soil/v1/entrust/page_review', data).then(res => res),

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -75,6 +75,11 @@ export default {
         {
           type: 'success',
           id: '',
+          name: '试验委托单导入'
+        },
+        {
+          type: 'success',
+          id: '',
           name: '提交至评审'
         },
         {

pages/meter-entrust/entrust-register/EntrustRegisterHis.vue

@@ -179,7 +179,7 @@ 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.formObj)
+      const result = await soilEntrust.pageRegHis(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result

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

@@ -119,7 +119,6 @@ export default {
         { 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 },