修改删除提醒

src/views/data-fill/collapse-form/index.vue

@@ -617,42 +617,35 @@ const handleMenuSelect = async ({ key }) => {
     } else if (key === 'clear') {
         const { pkeyId, index } = tableFormItemNode.value
         const refs = await getFormRef(pkeyId)
-        delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                const { error, code, msg } = await wbsApi.rmTabdataInfo({
-                        pkeyId: pkeyId,
-                })
-                if (!error && code === 200 ) {
-                    listDatas.value[index].isTableRender = false
-                    if (DragModalTableForm.value.length > 0) {
-                        let draindex = arrIndex( DragModalTableForm.value, 'pkeyId', pkeyId)
-                        DragModalTableForm.value[draindex].isTableRender = false
-                    }
+        await HcDelMsg({}, async (instance, resolve) => {
+            instance.confirmButtonLoading = true
+            instance.confirmButtonText = '删除中...'
+            const { error, code, msg } = await wbsApi.rmTabdataInfo({ pkeyId: pkeyId })
+            if (!error && code === 200 ) {
+                listDatas.value[index].isTableRender = false
+                if (DragModalTableForm.value.length > 0) {
+                    let draindex = arrIndex( DragModalTableForm.value, 'pkeyId', pkeyId)
+                    DragModalTableForm.value[draindex].isTableRender = false
+                }
+                await refs?.getTableFormInfo(pkeyId)
+                await nextTick()
+                listDatas.value[index].isTableRender = true
+                listDatas.value[index].isTableForm = true
+                if (DragModalTableForm.value.length > 0) {
+                    let draindex = arrIndex( DragModalTableForm.value, 'pkeyId', pkeyId)
+                    DragModalTableForm.value[draindex].isTableForm = true
+                    DragModalTableForm.value[draindex].isTableRender = true
+                    listDatas.value[index].isWindow = false
+                    DragModalTableForm.value.splice(draindex, 1)
                     await refs?.getTableFormInfo(pkeyId)
-
-                   nextTick(async ()=>{
-                    listDatas.value[index].isTableRender = true
-                    listDatas.value[index].isTableForm = true
-                    if (DragModalTableForm.value.length > 0) {
-                        let draindex = arrIndex( DragModalTableForm.value, 'pkeyId', pkeyId)
-                        DragModalTableForm.value[draindex].isTableForm = true
-                        DragModalTableForm.value[draindex].isTableRender = true
-                        listDatas.value[index].isWindow = false
-                        DragModalTableForm.value.splice(draindex, 1)
-                        await refs?.getTableFormInfo(pkeyId)
-                        windowClick( listDatas.value[index], index)
-                    }
-                    window.$message.success(msg)
-                   })
-                } else {
-                    window.$message.error(msg)
+                    windowClick( listDatas.value[index], index)
                 }
-                instance.confirmButtonLoading = false
-                done()
+                window.$message.success(msg)
             } else {
-                done()
+                window.$message.error(msg)
             }
+            resolve() //关闭弹窗的回调
+            instance.confirmButtonLoading = false
         })
     } else if (key === 'water') {
         console.log('含水率')

src/views/data-fill/division.vue

@@ -1094,17 +1094,13 @@ const addNodeClickCur = async ()=>{
 }
 //删除节点
 const delModalClick = () => {
-
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                removeContractTreeNode()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+    HcDelMsg({}, async (instance, resolve) => {
+        instance.confirmButtonLoading = true
+        instance.confirmButtonText = '删除中...'
+        await removeContractTreeNode()
+        resolve() //关闭弹窗的回调
+        instance.confirmButtonLoading = false
+    })
 }
 const removeContractTreeNode = async () => {
     const loadingInstance = window.$loading.service({

src/views/data-fill/wbs.vue

@@ -1529,16 +1529,13 @@ const addNodeClickCur = async ()=>{
 
 //删除节点
 const delModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                removeContractTreeNode()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+    HcDelMsg({}, async (instance, resolve) => {
+        instance.confirmButtonLoading = true
+        instance.confirmButtonText = '删除中...'
+        await removeContractTreeNode()
+        resolve() //关闭弹窗的回调
+        instance.confirmButtonLoading = false
+    })
 }
 
 const removeContractTreeNode = async () => {

src/views/gauge/bezier.vue

@@ -62,7 +62,7 @@
                         <el-button size="small" text type="primary" @click="handleTableEdit(row)">编辑</el-button>
                     </HcTooltip>
                     <HcTooltip keys="gauge-station-del">
-                        <el-button size="small" text type="danger" @click="handleTableDelete(row)">删除</el-button>
+                        <el-button v-del-com:[handleTableDelete]="row" size="small" text type="danger">删除</el-button>
                     </HcTooltip>
                 </template>
             </HcTable>
@@ -391,21 +391,9 @@ const handleTableEdit = (row) => {
     showLineEleModal.value = true
 }
 //删除表格
-const handleTableDelete = (row) => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                saveDelMileage(row.id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
-}
-//确认删除
-const saveDelMileage = async (rid) => {
-    const { error, code } = await bezierApi.saveDelMileage({ id: rid }, false)
+const handleTableDelete = async ({ item }, resolve) => {
+    const { error, code } = await bezierApi.saveDelMileage({ id: item.id })
+    resolve()
     //判断状态
     if (!error && code === 200) {
         window?.$message?.success('删除成功')

src/views/gauge/station.vue

@@ -39,7 +39,7 @@
                         <el-button size="small" text type="primary" @click="handleLevelEdit(row)">编辑</el-button>
                     </HcTooltip>
                     <HcTooltip keys="gauge-station-del">
-                        <el-button size="small" text type="danger" @click="handleLevelDelete(row)">删除</el-button>
+                        <el-button v-del-com:[handleLevelDelete]="row" size="small" text type="danger">删除</el-button>
                     </HcTooltip>
                 </template>
             </HcTable>
@@ -49,7 +49,7 @@
                         <el-button size="small" text type="primary" @click="handleTraverseEdit(row)">编辑</el-button>
                     </HcTooltip>
                     <HcTooltip keys="gauge-station-del">
-                        <el-button size="small" text type="danger" @click="handleTraverseDelete(row)">删除</el-button>
+                        <el-button v-del-com:[handleTraverseDelete]="row" size="small" text type="danger">删除</el-button>
                     </HcTooltip>
                 </template>
             </HcTable>
@@ -454,17 +454,9 @@ const handleLevelEdit = (row) => {
     saveFormLoading.value = false
     showRowModal.value = true
 }
-const handleLevelDelete = (row) => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                delData(row.id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
+const handleLevelDelete = async ({ item }, resolve) => {
+    await delData(item.id)
+    resolve()
 }
 
 //导线点
@@ -478,17 +470,9 @@ const handleTraverseEdit = (row) => {
     saveFormLoading.value = false
     showRowModal.value = true
 }
-const handleTraverseDelete = (row) => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                delData(row.id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
+const handleTraverseDelete = async ({ item }, resolve) => {
+    await delData(item.id)
+    resolve()
 }
 
 //删除请求

src/views/gauge/testdata.vue

@@ -34,7 +34,7 @@
                         <el-button size="small" text type="primary" @click="handleLevelEdit(row)">编辑</el-button>
                     </HcTooltip>
                     <HcTooltip keys="gauge-station-del">
-                        <el-button size="small" text type="danger" @click="handleLevelDelete(row)">删除</el-button>
+                        <el-button v-del-com:[handleLevelDelete]="row" size="small" text type="danger">删除</el-button>
                     </HcTooltip>
                 </template>
             </HcTable>
@@ -44,7 +44,7 @@
                         <el-button size="small" text type="primary" @click="handmatchEdit(row)">编辑</el-button>
                     </HcTooltip>
                     <HcTooltip keys="gauge-testdata-del">
-                        <el-button size="small" text type="danger" @click="handmathDelete(row)">删除</el-button>
+                        <el-button v-del-com:[handmathDelete]="row" size="small" text type="danger">删除</el-button>
                     </HcTooltip>
                 </template>
             </HcTable>
@@ -485,18 +485,9 @@ const handleLevelEdit = (row)=>{
     const rows = deepClone(row)
     formRowValue.value = rows
 }
-const handleLevelDelete = (row)=>{
-    console.log(row, '删除')
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                delData(row.id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
+const handleLevelDelete = async ({ item }, resolve) => {
+    await delData(item.id)
+    resolve()
 }
 //原材删除请求
 const delData = async (id) => {
@@ -527,19 +518,9 @@ const handmatchEdit = (row)=>{
     const rows = deepClone(row)
     matchformRowValue.value = rows
 }
-const handmathDelete = (row)=>{
-    console.log(row, '删除')
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                matchdelData(row.id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
-
+const handmathDelete = async ({ item }, resolve) => {
+    await matchdelData(item.id)
+    resolve()
 }
 const saveFormLoading = ref(false)
 const saveFormClick = async ()=>{

src/views/patrol/safe.vue

@@ -19,7 +19,7 @@
                 <template #action="{ row }">
                     <el-link v-if="row.submitRectify == 2 && row.isRectify == 1" type="primary" @click="reviewRow(row)">复核</el-link>
                     <el-link type="primary" :disabled="row.submitRectify === '2'" @click="updateRow(row)">修改</el-link>
-                    <el-link type="primary" :disabled="row.submitRectify === '2'" @click="delRow(row)">删除</el-link>
+                    <el-link v-del-com:[delRow]="row" type="primary" :disabled="row.submitRectify === '2'">删除</el-link>
                 </template>
             </HcTable>
             <template #action>
@@ -112,28 +112,14 @@ const reviewRow = (row)=>{
     })
 }
 //删除
-const delRow = (row)=>{
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                delInfo(row)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
-}
-const delInfo = async (row)=>{
-    const { error, code, msg } = await patrolApi.delete({
-        id:row.id,
-
-    })
+const delRow = async ({ item }, resolve) =>{
+    const { error, code, msg } = await patrolApi.delete({ id: item.id })
     //判断状态
     if (!error && code === 200) {
         window.$message.success(msg)
         getTableData()
     }
+    resolve()
 }
 </script>
 

src/views/tentative/detect/components/HcTreeData.vue

@@ -176,15 +176,12 @@ const handleMenuSelect = ({ key }) => {
         nodeFormModel.value = data
         nodeFormModal.value = true
     } else if (key === 'del') {
-        delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                await treeRemoveData(data.id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
+        HcDelMsg({}, async (instance, resolve) => {
+            instance.confirmButtonLoading = true
+            instance.confirmButtonText = '删除中...'
+            await treeRemoveData(data.id)
+            resolve() //关闭弹窗的回调
+            instance.confirmButtonLoading = false
         })
     }
 }