修改了收样室收样样品管理

api/soil/soil-entrust.js

@@ -39,5 +39,6 @@ export default {
       )
       .then(res => res),
   reviewPass: data =>
-    http.post('soil/v1/entrust/review_pass?ids=' + data).then(res => res)
+    http.post('soil/v1/entrust/review_pass?ids=' + data).then(res => res),
+  samplePage: data => http.post('soil/v1/sample/page', data).then(res => res)
 }

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

@@ -8,11 +8,11 @@
           <Col span="24">
             <Form id="search-form" :label-width="70" v-show="searchOpen" inline onsubmit="return false">
               <label class="label-sign"></label>
-              <Form-item class="search-item" label="委托编号:">
-                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
+              <Form-item class="search-item" label="委托商:">
+                <Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
               </Form-item>
-              <Form-item class="search-item" label="委托单位:">
-                <Input v-model="formObj.cname" @on-enter="_formSearch" placeholder="请输入委托单位" clearable></Input>
+              <Form-item class="search-item" label="委托编号:">
+                <Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托单位" clearable></Input>
               </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>
@@ -83,9 +83,8 @@ export default {
   data() {
     return {
       formObj: {
-        code: undefined,
-        cname: undefined,
-        type: undefined
+        client: undefined,
+        entrustCode: undefined
       },
       typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }],
       iconMsg: [

pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManage.vue

@@ -59,7 +59,7 @@ export default {
     },
     // 待接收
     _waitPage() {
-      this.$refs.waitReceiveModal._open(this.contractId, this.type)
+      this.$refs.waitReceiveModal._open(this.entrustId, this.type)
     },
     // 待发放
     _waitSend() {

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue

@@ -79,26 +79,11 @@ export default {
           detail: true,
           fixed: 'left'
         },
-        { title: '样品名称', key: 'name', width: 160, fixed: 'left' },
-        { title: '执行标准', key: 'standard', width: 160 },
-        { title: '大类', key: 'firstClass', width: 130 },
-        { title: '细类', key: 'detectType', width: 200 },
-        { title: '抽样单编号', key: 'samplingNum', width: 200 },
-        { title: '检测项目', key: 'itemName', width: 160 },
-        { title: '规格型号', key: 'specification', width: 160 },
-        { title: '质量等级', key: 'qualityGrade', width: 160 },
-        { title: '样品数量', key: 'quantity', width: 100 },
-        { title: '单位', key: 'unit', width: 90 },
-        { title: '抽样环节', key: 'samplingLink', width: 160 },
-        { title: '备样数量', key: 'backupQuanity', width: 100 },
-        { title: '保存条件', key: 'keepCondition', width: 160 },
-        { title: '抽样地点', key: 'samplingPlace', width: 160 },
-        { title: '抽样地点（其他）', key: 'samplingPlaceRemark', width: 200 },
-        { title: '抽样日期', key: 'samplingDate', width: 200, date: true },
-        { title: '日期类型', key: 'dateType', width: 160 },
-        { title: '日期', key: 'dateTime', width: 120, date: true },
-        { title: '样品形态', key: 'shape', width: 100 },
-        { title: '备注', key: 'remark' }
+        { 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 }
       ],
       iconMsg: [
         { type: 'md-create', id: '', name: '编辑' },
@@ -216,7 +201,7 @@ export default {
       console.log('待接收样品')
       this.formObj = this.$resetFields(this.formObj)
       $('input[name=contractId]').val(contractId)
-      this.contractId = contractId
+      this.entrustId = contractId
       this.type = type
       this.selectIds = []
       this.saveWayList = []
@@ -228,7 +213,10 @@ 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))
+      this.formObj.entrustId = this.entrustId
+      const result = await soilEntrust.samplePage(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result