修改了样品管理

api/soil/soil-sample.js

@@ -21,5 +21,13 @@ export default {
     http.put('soil/v1/receive_location/' + data.id, data.obj).then(res => res),
   // 试验室领样操作
   takeSample: data =>
-    http.post('soil/v1/sample/take_sample?ids=' + data).then(res => res)
+    http.post('soil/v1/sample/take_sample?ids=' + data).then(res => res),
+  // 备样管理提交申请
+  appleHandle: data =>
+    http.post('soil/v1/sample_backup/apply_handle', data).then(res => res),
+  // 样品处理分页列表
+  pageBackupHandleCheck: data =>
+    http
+      .post('soil/v1/sample_backup/page_backup_handle_check', data)
+      .then(res => res)
 }

pages/soil-sample-manage/SoilSampleManage.vue

@@ -268,7 +268,7 @@ export default {
     },
     _samplePre() {
       if (this.selectIds.length === 0) {
-        this.$message.warning('至少选择一条数据')
+        this.$Message.warning('至少选择一条数据')
       } else {
         this.$refs.preModal._open(this.selectIds.join(','))
       }
@@ -334,9 +334,9 @@ export default {
       }
     },
     _tableResultChange(msg, data) {
-      const selectIds = []
       switch (msg) {
         case 'selectData':
+          const selectIds = []
           for (let i = 0; i < data.length; i++) {
             selectIds.push(data[i].id)
           }

pages/soil-sample-manage/sample-dispose/tab/SampleDisposeManage.vue

@@ -25,14 +25,6 @@
             </btn-list>
           </Col>
           <!--样品数量-->
-          <Col span="24">
-          <div style="display: flex;padding-bottom: 10px;">
-            <div v-for="(item,index) in contList" :key="index" class="reimbursement-item">
-              <p :class="item.color?item.color:''">{{item.value}}</p>
-              <p>{{item.name}}</p>
-            </div>
-          </div>
-          </Col>
           <!-- 表格 -->
           <Col span="24">
             <PTVXETable
@@ -120,7 +112,7 @@
 import AutoCompletes from '../../../../components/base/AutoCompletes'
 // eslint-disable-next-line no-unused-vars
 import http from '../../../../api/http'
-import { soilEntrust } from '../../../../api'
+import { soilSample } from '../../../../api'
 export default {
   components: {
     AutoCompletes
@@ -530,8 +522,7 @@ export default {
     _page: async function() {
       this.editIndex = -1
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      console.log('this.formObj', this.formObj)
-      const result = await soilEntrust.pageBackup(
+      const result = await soilSample.pageBackupHandleCheck(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue

@@ -25,14 +25,6 @@
             </btn-list>
           </Col>
           <!--样品数量-->
-          <Col span="24">
-          <div style="display: flex;padding-bottom: 10px;">
-            <div v-for="(item,index) in contList" :key="index" class="reimbursement-item">
-              <p :class="item.color?item.color:''">{{item.value}}</p>
-              <p>{{item.name}}</p>
-            </div>
-          </div>
-          </Col>
           <!-- 表格 -->
           <Col span="24">
             <PTVXETable

plugins/global.js

@@ -10,6 +10,7 @@ import elementTable from '../components/table/elementTable'
 import modalFooter from '../components/base/modalFooter'
 import PTVXETable from '../components/table/PTVXETable'
 import PTVXETableHeight from '../components/table/PTVXETableHeight'
+import PTVXETableTemp from '../components/table/PTVXETableTemp'
 import PTVXETableData from '../components/base/PTVXETableData'
 import VXEIconList from '../components/base/VXEIconList'
 import FileManage from '../components/file/file-manage/FileManage'
@@ -26,6 +27,7 @@ Vue.component('element-table-height', elementTableHeight)
 Vue.component('modal-footer', modalFooter)
 Vue.component('PTVXETable', PTVXETable)
 Vue.component('PTVXETableHeight', PTVXETableHeight)
+Vue.component('PTVXETableTemp', PTVXETableTemp)
 Vue.component('PTVXETableData', PTVXETableData)
 Vue.component('VXEIconList', VXEIconList)
 Vue.component('VXESettingCol', VXESettingCol)