111

src/api/modules/tentative/material/testSample.js

@@ -9,4 +9,12 @@ export default {
             params: form,
         }, msg)
     },
+    //删除在测样品
+    async sampleRemove(ids, msg = true) {
+        return HcApi({
+            url: '/api/blade-business/entrustinfo/sample_remove',
+            method: 'post',
+            params: { ids },
+        }, msg)
+    },
 }

src/api/modules/tentative/material/testSample/flow.js

@@ -1,68 +0,0 @@
-import { HcApi } from '../../../../request/index'
-
-export default {
-    //进场材料分页条件查询
-    async queryPage(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/page',
-            method: 'get',
-            params: form,
-        }, msg)
-    },
-    //进场材料新增或修改
-    async submitForm(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/submit',
-            method: 'post',
-            data: form,
-        }, msg)
-    },
-    //进场材料批量删除
-    async removeData(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/remove',
-            method: 'post',
-            params: form,
-        }, msg)
-    },
-    //校验材料编号是否唯一
-    async verification(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/verification',
-            method: 'get',
-            params: form,
-        }, msg)
-    },
-    //进场材料批量复制
-    async copyData(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/copy',
-            method: 'post',
-            data: form,
-        }, msg)
-    },
-    //批量打印进场材料Pdf
-    async exportPdf(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/export-pdf',
-            method: 'post',
-            params: form,
-        }, msg)
-    },
-    //材料取样记录
-    async samplingRecord(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/sampling-record',
-            method: 'get',
-            params: form,
-        }, msg)
-    },
-    //材料进场附件附件修改接口：
-    async updateMobilizationFile(form, msg = true) {
-        return HcApi({
-            url: '/api/blade-business/material/mobilization/upload-file',
-            method: 'post',
-            params: form,
-        }, msg)
-    },
-}

src/views/tentative/material/modules/testSample/testUnder.vue

@@ -14,7 +14,7 @@
             </div>
         </template>
         <template #extra>
-            <el-button type="danger" :disabled="tableCheckedKeys.length <= 0" @click="batchDel">批量删除</el-button>
+            <el-button type="danger" :disabled="tableCheckedKeys.length <= 0" @click="batchDel">删除</el-button>
         </template>
         <hc-table
             :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
@@ -61,9 +61,10 @@
 
 <script setup>
 import { onMounted, ref, watch } from 'vue'
+import { HcDelMsg } from 'hc-vue3-ui'
 import { useAppStore } from '~src/store'
 import { getErtractInfo } from '~api/other'
-import { getArrValue, getObjValue, isNullES } from 'js-fast-way'
+import { arrToId, getArrValue, getObjValue, isNullES } from 'js-fast-way'
 import mainApi from '~api/tentative/material/testSample'
 
 //参数
@@ -242,11 +243,34 @@ const disposeClose = () => {
 
 //删除
 const rowDel = (row) => {
-
+    HcDelMsg(async (resolve) => {
+        const { error, code, msg } = await mainApi.sampleRemove(row.id)
+        resolve()
+        if (!error && code === 200) {
+            window.$message.success('删除成功')
+            getTableData().then()
+        } else {
+            window.$message.error(msg ?? '删除失败')
+        }
+    })
 }
 
 //批量删除
 const batchDel = () => {
-
+    const rows = tableCheckedKeys.value
+    if (rows.length <= 0) {
+        window.$message.warning('请先勾选要删除的数据')
+        return
+    }
+    HcDelMsg(async (resolve) => {
+        const { error, code, msg } = await mainApi.sampleRemove(arrToId(rows))
+        resolve()
+        if (!error && code === 200) {
+            window.$message.success('删除成功')
+            getTableData().then()
+        } else {
+            window.$message.error(msg ?? '删除失败')
+        }
+    })
 }
 </script>

src/views/tentative/material/modules/testSample/tested.vue

@@ -11,7 +11,7 @@
             </div>
         </template>
         <template #extra>
-            <el-button type="danger" :disabled="tableCheckedKeys.length <= 0" @click="batchCancel">批量取消待测</el-button>
+            <el-button type="danger" :disabled="tableCheckedKeys.length <= 0" @click="batchCancel">取消待测</el-button>
         </template>
         <hc-table
             :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check