修改了委托单登记的样品管理

api/soil/soil-sample.js

@@ -177,5 +177,7 @@ export default {
   pageSecondary: data =>
     http.post('soil/v1/prepare/page_secondary', data).then(res => res),
   pageSecondaryHis: data =>
-    http.post('soil/v1/prepare/page_secondary_his', data).then(res => res)
+    http.post('soil/v1/prepare/page_secondary_his', data).then(res => res),
+  sampleDeleteById: data =>
+    http.delete('soil/v1/sample/?ids=' + data).then(res => res)
 }

pages/meter-entrust/SoilSampleManage.vue

@@ -64,7 +64,7 @@
 </template>
 <script>
 import http from '../../api/http'
-import { soilEntrust } from '../../api'
+import { soilEntrust, soilSample } from '../../api'
 import { getLodop } from '../../plugins/clodop/LodopFuncs'
 import SoilSampleItemManage from './SoilSampleItemManage'
 let LODOP
@@ -162,15 +162,6 @@ export default {
       }
       this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
     },
-
-    // _importItemOk: async function(data) {
-    //   const result = await drugSample.importSampleItemDTO(data)
-    //   if (result) {
-    //     this.$Message.success('导入成功！')
-    //     await this._page()
-    //   }
-    // },
-
     _modalResult(data1, data2) {
       switch (this.currentComponent) {
         case 'CopyModal':
@@ -346,20 +337,16 @@ export default {
         title: '提示',
         content: content || '确定删除该记录？',
         onOk: () => {
-          // this.$store.dispatch('FoodSample/deleteByIds', ids).then(() => {
-          //   this._resultChange('删除成功!')
-          // })
           this._deleteOk(ids)
         }
       })
     },
-
-    // _deleteOk: async function(ids) {
-    //   const result = await drugSample.deleteById(ids)
-    //   if (result) {
-    //     this._resultChange('删除成功')
-    //   }
-    // },
+    _deleteOk: async function(ids) {
+      const result = await soilSample.sampleDeleteById(ids)
+      if (result) {
+        this._resultChange('删除成功')
+      }
+    },
 
     _deleteById(id) {
       // 删除一条记录

pages/meter-entrust/SoilSampleManageHis.vue

@@ -67,7 +67,7 @@
 </template>
 <script>
 import http from '../../api/http'
-import { soilEntrust } from '../../api'
+import { soilEntrust, soilSample } from '../../api'
 import { getLodop } from '../../plugins/clodop/LodopFuncs'
 import SoilSampleItemManage from './SoilSampleItemManageHis'
 let LODOP
@@ -256,7 +256,6 @@ export default {
             this._copy(data)
             break
           case '删除':
-            console.log(index)
             this._deleteById(data.id)
             break
           case '附件':
@@ -347,13 +346,12 @@ export default {
         }
       })
     },
-
-    // _deleteOk: async function(ids) {
-    //   const result = await drugSample.deleteById(ids)
-    //   if (result) {
-    //     this._resultChange('删除成功')
-    //   }
-    // },
+    _deleteOk: async function(ids) {
+      const result = await soilSample.sampleDeleteById(ids)
+      if (result) {
+        this._resultChange('删除成功')
+      }
+    },
 
     _deleteById(id) {
       // 删除一条记录

pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue

@@ -754,7 +754,6 @@ export default {
           break
         case '删除':
           this.getPage.records.splice(index, 1)
-          this._deleteSample(data)
           break
         case '操作日志':
           // this._record(data.id)

pages/meter-entrust/entrust-register/EntrustRegisterHis.vue

@@ -49,10 +49,8 @@
     </div>
     <keep-alive>
       <!-- eslint-disable-next-line vue/require-component-is -->
-      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+      <component ref="refModal" :is="currentComponent"></component>
     </keep-alive>
-<!--    <MeterEntrustRecord ref="entrustRecordModal"  @on-result-change="_page"></MeterEntrustRecord>-->
-<!--    <SoilSampleManage ref="sampleManageModal" @on-result-change="_page"></SoilSampleManage>-->
   </div>
 </template>
 <script>