修改收样室收样页面

api/soil/soil-entrust.js

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

pages/soil-sample-manage/backups-manage/SampleBackupsIndex.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="备样管理" name="wait">
+            <SampleBackupsManage ref="waitTabs"></SampleBackupsManage>
+          </el-tab-pane>
+          <el-tab-pane label="备样查询" name="query">
+            <SampleBackupsQuery ref="queryTabs"></SampleBackupsQuery>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import SampleBackupsManage from './tab/SampleBackupsManage'
+import SampleBackupsQuery from './tab/SampleBackupsQuery'
+
+export default {
+  components: {
+    SampleBackupsManage,
+    SampleBackupsQuery
+  },
+  data() {
+    return {
+      activeName: 'wait'
+    }
+  },
+  mounted() {
+    this.activeName = 'wait'
+    this.$refs.waitTabs._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'wait') {
+        this.$refs.waitTabs._page()
+      } else if (tab.name === 'applyRecord') {
+        // this.$refs.applyRecordTabs._page()
+      } else {
+        this.$refs.queryTabs._page()
+      }
+    }
+  }
+}
+</script>

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

@@ -48,7 +48,7 @@
               sortable
             >
               <template slot-scope="scope">
-                <div v-if>{{scope.row[item.key]}}</div>
+                <div>{{scope.row[item.key]}}</div>
               </template>
             </vxe-table-column>
           </PTVXETable>

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitScan.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: '编辑' },
@@ -212,7 +197,7 @@ export default {
     _open(contractId, type) {
       this.formObj = this.$resetFields(this.formObj)
       $('input[name=contractId]').val(contractId)
-      this.contractId = contractId
+      this.entrustId = contractId
       this.type = type
       this.selectIds = []
       this.$nextTick(() => {
@@ -221,8 +206,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.pageSend(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result

router/soil-routes.js

@@ -10,6 +10,7 @@ import ReviewEntrust from '../pages/meter-entrust/entrust-review/ReviewEntrust'
 import SampleReceiveIndex from '../pages/soil-sample-manage/sample-receive/SampleReceiveIndex'
 import SamplePreparationIndex from '../pages/soil-sample-manage/sample-preparation/SamplePreparationIndex'
 import AddressManage from '../pages/soil-sample-manage/sample-address/AddressManage'
+import BackupsManage from '../pages/soil-sample-manage/backups-manage/SampleBackupsIndex'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -54,7 +55,7 @@ export default [
       },
       {
         path: 'backups',
-        component: workbench,
+        component: BackupsManage,
         meta: { title: '备样管理' }
       },
       {