修改了样品管理

api/soil/soil-entrust.js

@@ -152,5 +152,8 @@ export default {
   submitToInstock: data =>
     http
       .post('soil/v1/alone_sample/submit_to_out_storage', data)
-      .then(res => res)
+      .then(res => res),
+  // 登记历史记录
+  pageRegisterHis: data =>
+    http.post('soil/v1/alone_sample/page_register_his', data).then(res => res)
 }

api/soil/soil-sample.js

@@ -254,5 +254,9 @@ export default {
   pageWaitDelivery: data =>
     http.post('soil/v1/alone_sample/page_wait_delivery', data).then(res => res),
   outStorageSubmit: data =>
-    http.post('soil/v1/alone_sample/out_storage_submit', data).then(res => res)
+    http.post('soil/v1/alone_sample/out_storage_submit', data).then(res => res),
+  pageStorehouseSample: data =>
+    http
+      .post('soil/v1/alone_sample/page_storehouse_sample', data)
+      .then(res => res)
 }

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue

@@ -40,7 +40,6 @@
                   <div v-else-if="item.key==='classify'">
                     {{scope.row[item.key]===0?'判定依据':scope.row[item.key]===1?'检测依据':scope.row[item.key]===2?'其他':''}}
                   </div>
-
                   <div v-else-if="item.key==='type'">
                     {{scope.row[item.key]===0?'待检':scope.row[item.key]===1?'备样':scope.row[item.key]===2?'备用': ''}}
                   </div>
@@ -92,11 +91,12 @@ export default {
       ],
       // 表格
       pageColumns: [
-        { title: '库房号', key: 'warehouse' },
-        { title: '货架号', key: 'name' },
-        { title: '位置分类', key: 'type' },
-        { title: '位置管理人', key: 'manager' },
-        { title: '备注说明', key: 'remark' }
+        { title: '钻孔名称', key: 'boreholeName' },
+        { title: '项目负责人', key: 'projectLeader' },
+        { title: '入库日期', key: 'instockTime', date: true },
+        { title: '留存有效期', key: 'keepLimitTime', date: true },
+        { title: '库房号', key: 'storehouse' },
+        { title: '架位号', key: 'shelfCode' }
       ],
       // 操作
       iconMsg: [
@@ -193,7 +193,7 @@ export default {
     // 获取数据
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await soilSample.aloneWarehouseLocation(
+      const result = await soilSample.pageStorehouseSample(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-alone-sample/EntrustRegister.vue

@@ -8,9 +8,6 @@
           <Col span="24" style="margin-top: 10px">
             <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
-              <Form-item class="search-item" label="委托编号:">
-                <Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable/>
-              </Form-item>
               <Form-item class="search-item" label="项目名称:">
                 <Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
               </Form-item>

pages/soil-alone-sample/EntrustRegisterHis.vue

@@ -8,11 +8,8 @@
           <Col span="24" style="margin-top: 10px">
             <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
-              <Form-item class="search-item" label="委托商:">
-                <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
-              </Form-item>
-              <Form-item class="search-item" label="委托编号:">
-                <Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
+              <Form-item class="search-item" label="项目名称:">
+                <Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
               </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>
@@ -56,9 +53,10 @@
 <script>
 import { soilAptitude, soilEntrust } from '../../api'
 import MeterEntrustRecord from '../../components/operation/Operation'
+import ViewDetail from './ViewDetail'
 export default {
   // eslint-disable-next-line vue/no-unused-components
-  components: { MeterEntrustRecord },
+  components: { MeterEntrustRecord, ViewDetail },
   data() {
     return {
       currentComponent: '',
@@ -75,7 +73,7 @@ export default {
         {
           type: 'ios-list',
           id: '',
-          name: '试样列表'
+          name: '查看'
         },
         {
           type: 'ios-clock',
@@ -90,20 +88,11 @@ export default {
       selectIds: [],
       getPage: {},
       pageColumns: [
-        { 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: 'projectName', width: 120 },
+        { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
         { 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 }
+        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]
     }
   },
@@ -140,6 +129,9 @@ export default {
           case '编辑':
             this._editModal(true, data.id)
             break
+          case '查看':
+            this._viewModal(true, data.id)
+            break
           case '资质项目':
             this._itemModal(data.id)
             break
@@ -161,6 +153,28 @@ export default {
         }
       })
     },
+    _viewModal(edit, id) {
+      this.currentComponent = 'ViewDetail'
+      if (edit) {
+        this.$refs.pageTable._showLoading()
+        // 编辑
+        this._getDetailById(id)
+      } else {
+        // 添加
+        this.$nextTick(() => {
+          this.$refs.refModal._open()
+        })
+      }
+    },
+    _getDetailById: async function(id) {
+      const result = await soilEntrust.aloneSampleGetById(id)
+      if (result) {
+        this.$refs.refModal._open(result)
+        this.$refs.pageTable._hideLoading()
+      } else {
+        this.$refs.pageTable._hideLoading()
+      }
+    },
     _sampleManage(data) {
       // 管理样品
       this.currentComponent = 'SoilSampleManage'
@@ -189,7 +203,9 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilEntrust.pageRegHis(this.formObj)
+      const result = await soilEntrust.pageRegisterHis(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result