Merge remote-tracking branch 'origin/dev' into dev

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

@@ -82,6 +82,11 @@ export default {
           type: 'ios-clock',
           id: '',
           name: '操作日志'
+        },
+        {
+          type: 'md-trash',
+          id: '',
+          name: '删除'
         }
       ],
       formObj: {
@@ -236,7 +241,7 @@ export default {
       }
     },
     _delete: async function(ids) {
-      const result = await soilAptitude.deleteById(ids)
+      const result = await soilEntrust.deleteById(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

pages/soil-alone-sample-instock/EntrustRegisterHis.vue

@@ -89,6 +89,11 @@ export default {
           type: 'ios-clock',
           id: '',
           name: '操作日志'
+        },
+        {
+          type: 'md-trash',
+          id: '',
+          name: '删除'
         }
       ],
       formObj: {
@@ -270,7 +275,7 @@ export default {
       }
     },
     _delete: async function(ids) {
-      const result = await soilAptitude.deleteById(ids)
+      const result = await soilEntrust.aloneSampleDelete(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustIndex.vue

@@ -7,6 +7,7 @@
           <el-tab-pane label="历史记录" name="his"></el-tab-pane>
         </el-tabs>
         <keep-alive>
+          <!-- eslint-disable-next-line vue/require-component-is -->
           <component ref="refModal" :is="currentComponent"></component>
         </keep-alive>
       </div>

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterHis.vue

@@ -84,6 +84,11 @@ export default {
           type: 'ios-clock',
           id: '',
           name: '操作日志'
+        },
+        {
+          type: 'md-trash',
+          id: '',
+          name: '删除'
         }
       ],
       formObj: {
@@ -257,7 +262,7 @@ export default {
       }
     },
     _delete: async function(ids) {
-      const result = await soilAptitude.deleteById(ids)
+      const result = await soilEntrust.aloneSampleDelete(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

pages/soil-alone-sample/EntrustRegisterHis.vue

@@ -84,6 +84,11 @@ export default {
           type: 'ios-clock',
           id: '',
           name: '操作日志'
+        },
+        {
+          type: 'md-trash',
+          id: '',
+          name: '删除'
         }
       ],
       formObj: {
@@ -259,10 +264,11 @@ export default {
       }
     },
     _delete: async function(ids) {
-      const result = await soilAptitude.deleteById(ids)
+      const result = await soilEntrust.aloneSampleDelete(ids)(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')
+        this._page()
       }
     }
   }

pages/soil-sample-manage/sample-preparation/SamplePreparation.vue

@@ -75,6 +75,7 @@ export default {
     SampleManage,
     // eslint-disable-next-line vue/no-unused-components
     SoilSampleItemManageEdit,
+    // eslint-disable-next-line vue/no-unused-components
     CreateReport,
     // eslint-disable-next-line vue/no-unused-components
     SoilEntrustItemNum