修改了委托单管理委托评审

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

@@ -58,8 +58,8 @@
 import { soilEntrust } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import Reason from '../../../components/base/Reason'
+import SampleManage from '../SoilSampleManage'
 import EntrustDetail from './EntrustDetail'
-import SampleManage from './SampleManage'
 export default {
   components: { Operation, Reason, EntrustDetail, SampleManage },
   data() {
@@ -313,7 +313,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'contractId')
+      this.$refs.FileManage._open(id, 'entrustId')
     }
     // _getById: async function(id) {
     //   const result = await meterSubcontractor.getById(id)

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

@@ -63,6 +63,7 @@
   </div>
 </template>
 <script>
+import { soilEntrust } from '../../../api'
 export default {
   components: {
     // FoodSampleGovernDetail,
@@ -136,14 +137,11 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', width: 140 },
-        { title: '样品名称', key: 'name', width: 140 },
-        { title: '型号规格', key: 'spec', width: 140 },
-        { title: '出厂编号', key: 'factoryNumber', width: 140 },
-        // { title: '检测项目', key: 'itemNames', width: 140 },
-        { title: '是否分包', key: 'jobOut', width: 110 },
-        { title: '检测类型', key: 'type', width: 140 },
-        { title: '数量', key: 'quantity', width: 140 }
+        { title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' },
+        { title: '试样深度', key: 'sampleDepth', width: 160 },
+        { title: '土质描述', key: 'sampleDescribe', width: 160 },
+        { title: '样品包装类型', key: 'samplePack', width: 160 },
+        { title: '现场编号', key: 'siteNo', width: 130 }
       ],
       dateList: [],
       formObj: {
@@ -259,8 +257,15 @@ export default {
     _formSearch() {
       this.$refs.pageTable._pageChange(1)
     },
-    _page() {
-      console.log(123)
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await soilEntrust.samplePage(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
     },
     // _page: async function() {
     //   this.selectIds = []