删除提醒

src/views/attendance/business-trip/index.vue

@@ -83,7 +83,7 @@ import { useRouter } from 'vue-router'
 import businessApi from '~api/attendance/business-trip.js'
 import { getArrValue } from 'js-fast-way'
 import { getDictInfo, getProjectList } from '~api/other'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 const router = useRouter()
 onActivated(()=>{
   getProjectData()
@@ -249,13 +249,20 @@ const rowCancel = async (row) => {
 }
 //删除
 const delRowClick = async (row) => {
-    delMessage(async () => {
-        const { error, code, data, msg } = await businessApi.remove({ groupId:row.groupId })  
-            if (!error && code === 200) {
-                window.$message.success(msg)
-                getdraftTableData().then()
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, data, msg } = await businessApi.remove({ groupId:row.groupId })  
+                if (!error && code === 200) {
+                    window.$message.success(msg)
+                    getdraftTableData().then()
+                } else {
+                window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
             } else {
-              window.$message?.error(msg)
+                done()
             }
     })
 }

src/views/expense/finReimburse/index.vue

@@ -86,7 +86,7 @@ import { useRouter } from 'vue-router'
 import mainApi from '~api/expense/finReimburse'
 import { getProjectList, getuserList } from '~api/other'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 import { useAppStore } from '~src/store'
 const useAppState = useAppStore()
 
@@ -254,17 +254,24 @@ const editDraftClick = ({ emdraftIds }) => {
 
 //删除草稿
 const delDraftClick = ({ groupId }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({
-            groupId: groupId,
-        })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getDraftNum().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({
+                    groupId: groupId,
+                })
+                instance.confirmButtonLoading = false
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getDraftNum().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                done()
+            } else {
+                done()
+            }
     })
 }
 </script>

src/views/expense/finReimburse/record.vue

@@ -181,7 +181,7 @@ import mainApi from '~api/expense/finReimburse'
 import { getTokenHeader } from '~src/api/request/header'
 import { arrIndex, deepClone, formValidate, getArrValue, getObjValue } from 'js-fast-way'
 import { getApprovesList, getDictInfo, getProjectList, getuserList } from '~api/other'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 import { useAppStore } from '~src/store'
 const useAppState = useAppStore()
 
@@ -337,8 +337,15 @@ const addDetailsData = () => {
 
 //删除明细
 const delDetailsData = (index) => {
-    delMessage(() => {
-        detailsData.value?.details.splice(index, 1)
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                detailsData.value?.details.splice(index, 1)
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 

src/views/expense/invoice/index.vue

@@ -89,7 +89,7 @@ import { useRouter } from 'vue-router'
 import mainApi from '~api/expense/invoice'
 import { getProjectList } from '~api/other'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 import { getTokenHeader } from '~src/api/request/header'
 
 const router = useRouter()
@@ -235,18 +235,26 @@ const pdfCloseClick = () => {
 //删除
 const rowCancel = (row) => {
     console.log('删除')
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.cancel({
-            id: row.id,
-        })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+               const { error, code, msg } = await mainApi.cancel({
+                    id: row.id,
+                })
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
+               
 }
 
 //草稿箱
@@ -294,17 +302,24 @@ const editDraftClick = ({ id }) => {
 
 //删除草稿
 const delDraftClick = ({ id }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({
-            id: id,
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({
+                    id: id,
+                })
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getDraftNum().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
         })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getDraftNum().then()
-        } else {
-            window.$message?.error(msg)
-        }
-    })
 }
 </script>

src/views/expense/loanRequest/index.vue

@@ -77,7 +77,7 @@ import { onActivated, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import mainApi from '~api/expense/loanRequest'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 const router = useRouter()
 
@@ -217,15 +217,22 @@ const editDraftClick = ({ id }) => {
 
 //删除草稿
 const delDraftClick = ({ id }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({ id })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getDraftNum().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+            const { error, code, msg } = await mainApi.remove({ id })
+            //判断状态
+            if (!error && code === 200) {
+                window.$message?.success(msg)
+                getDraftNum().then()
+            } else {
+                window.$message?.error(msg)
+            }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 </script>

src/views/expense/outsourcing/index.vue

@@ -78,7 +78,7 @@ import { useRouter } from 'vue-router'
 import mainApi from '~api/expense/outsourcing'
 import { getProjectList } from '~api/other'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 
 const router = useRouter()
@@ -224,17 +224,24 @@ const editDraftClick = ({ id }) => {
 
 //删除草稿
 const delDraftClick = ({ id }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({
-            id: id,
-        })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getDraftNum().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({
+                    id: id,
+                })
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getDraftNum().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 </script>

src/views/expense/paymentRequest/index.vue

@@ -83,7 +83,8 @@ import { useRouter } from 'vue-router'
 import mainApi from '~api/expense/paymentRequest'
 import { getProjectList } from '~api/other'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+
+import { delMessageV2 } from '~com/message/index.js'
 
 const router = useRouter()
 
@@ -236,15 +237,22 @@ const editDraftClick = ({ id }) => {
 
 //删除草稿
 const delDraftClick = ({ id }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({ id })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getDraftNum().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({ id })
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getDraftNum().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 </script>

src/views/expense/purchaseRequest/index.vue

@@ -87,7 +87,7 @@ import { useRouter } from 'vue-router'
 import { getDictInfo } from '~api/other'
 import mainApi from '~api/expense/purchaseRequest'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 const router = useRouter()
 
@@ -238,15 +238,22 @@ const editDraftClick = ({ emdraftIds }) => {
 
 //删除草稿
 const delDraftClick = ({ groupId }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({ groupId })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getDraftNum().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({ groupId })
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getDraftNum().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 </script>

src/views/expense/purchaseRequest/record.vue

@@ -128,7 +128,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { getApprovesList, getDictInfo } from '~api/other'
 import mainApi from '~api/expense/purchaseRequest'
 import { arrIndex, deepClone, formValidate, getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 //初始变量
 const router = useRouter()
@@ -277,9 +277,16 @@ const addDetailsData = () => {
 
 //删除明细
 const delDetailsData = (index) => {
-    delMessage(() => {
-        detailsData.value?.details.splice(index, 1)
-    })
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                detailsData.value?.details.splice(index, 1)
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+        })
 }
 
 

src/views/expense/vehicleRequest/index.vue

@@ -77,7 +77,7 @@ import { onActivated, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import mainApi from '~api/expense/vehicleRequest'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 const router = useRouter()
 
@@ -86,7 +86,7 @@ onActivated(() => {
 })
 
 const getApi = () => {
-    getUseCarDeptList()
+    getUseCarDeptListdata()
     getTableData()
     getDraftNum()
 }
@@ -205,8 +205,8 @@ const editDraftClick = ({ emdraftIds }) => {
     })
 }
 const carDeptList = ref([])
-const getUseCarDeptList = async ()=>{
-    const { error, code, data } = await getUseCarDeptList()
+const getUseCarDeptListdata = async ()=>{
+    const { error, code, data } = await mainApi.getUseCarDeptList()
     if (!error && code === 200) {
         carDeptList.value = getArrValue(data)
 
@@ -217,15 +217,22 @@ const getUseCarDeptList = async ()=>{
 }
 //删除草稿
 const delDraftClick = ({ groupId }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({ groupId })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getDraftNum().then()
-        } else {
-            window.$message?.error(msg)
-        }
-    })
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                   const { error, code, msg } = await mainApi.remove({ groupId })
+                    //判断状态
+                    if (!error && code === 200) {
+                        window.$message?.success(msg)
+                        getDraftNum().then()
+                    } else {
+                        window.$message?.error(msg)
+                    }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+        })
 }
 </script>

src/views/expense/vehicleRequest/record.vue

@@ -120,7 +120,7 @@ import mainApi from '~api/expense/vehicleRequest'
 import { getApprovesList } from '~api/other'
 import { getTokenHeader } from '~src/api/request/header'
 import { arrIndex, deepClone, formValidate, getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 //初始变量
 const router = useRouter()
@@ -211,9 +211,16 @@ const addDetailsData = () => {
 
 //删除明细
 const delDetailsData = (index) => {
-    delMessage(() => {
-        detailsData.value?.details.splice(index, 1)
-    })
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                detailsData.value?.details.splice(index, 1)
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+        })
 }
 
 //获取详情数据

src/views/people/archive/index.vue

@@ -64,7 +64,8 @@ import mainApi from '~api/people/archive'
 import { useRouter } from 'vue-router'
 import { getuserList } from '~api/other'
 import { getArrValue } from 'js-fast-way'
-import { delMessage, getFileName } from '~uti/tools'
+import { getFileName } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 const router = useRouter()
 
@@ -168,15 +169,22 @@ const editRowClick = (row) => {
 
 //删除
 const delRowClick = (row) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove(row.id)
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window.$message?.error(msg)
-        }
-    })
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove(row.id)
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+        })
 }
 
 //预览Pdf

src/views/people/contract/index.vue

@@ -52,7 +52,7 @@ import mainApi from '~api/people/contract'
 import { useRouter } from 'vue-router'
 import { getuserList } from '~api/other'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 const router = useRouter()
 
@@ -128,14 +128,21 @@ const editRowClick = (row) => {
 
 //删除
 const delRowClick = (row) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({ ids: row.id })
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({ ids: row.id })
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 

src/views/people/dimission.vue

@@ -78,7 +78,7 @@ import mainApi from '~api/people/contract'
 import { getTokenHeader } from '~src/api/request/header'
 import { getuserList } from '~api/other'
 import { formValidate, getArrValue, getObjValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 onActivated(() => {
     getuserListApi()
@@ -139,14 +139,21 @@ const getTableData = async () => {
 
 //删除
 const delRowClick = (row) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({ ids: row.id })
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({ ids: row.id })
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 

src/views/people/entry.vue

@@ -76,7 +76,7 @@ import mainApi from '~api/people/contract'
 import { getTokenHeader } from '~src/api/request/header'
 import { getuserList } from '~api/other'
 import { formValidate, getArrValue, getObjValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 onActivated(() => {
     getuserListApi()
@@ -134,15 +134,22 @@ const getTableData = async () => {
 
 //删除
 const delRowClick = (row) => {
-    delMessage(async () => {
-        const { error, code, msg } = await mainApi.remove({ ids: row.id })
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window.$message?.error(msg)
-        }
-    })
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await mainApi.remove({ ids: row.id })
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+        })
 }
 
 //表单弹窗

src/views/program/annual/index.vue

@@ -41,7 +41,8 @@
 import { onActivated, onMounted, ref } from 'vue'
 import annualApi from '~api/program/annual.js'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+
+import { delMessageV2 } from '~com/message/index.js'
 import { useRoute, useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -138,17 +139,24 @@ const editRowClick = (row) => {
 }
 //删除
 const rowCancel = (row) => {
-    delMessage(async () => {
-        const { error, code, msg } = await annualApi.deleteAnnualBudget({
-            id: row.id,
-        })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window.$message?.error(msg)
-        }
-    })
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await annualApi.deleteAnnualBudget({
+                    id: row.id,
+                })
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+     })
 }
 </script>

src/views/program/section/index.vue

@@ -90,7 +90,7 @@ import { useRouter } from 'vue-router'
 import sectionApi from '~api/program/section.js'
 import { formValidate, getArrValue, getObjValue } from 'js-fast-way'
 import { getdepartmentList } from '~api/other'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 const router = useRouter()
 onActivated(()=>{
@@ -252,13 +252,20 @@ const editRowClick = (row) => {
 
 //删除
 const delRowClick = async (row) => {
-    delMessage(async () => {
-        const { error, code, data, msg } = await sectionApi.deleteById({ id:row.id })  
-            if (!error && code === 200) {
-                window.$message.success(msg)
-                getTableData()
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                 const { error, code, data, msg } = await sectionApi.deleteById({ id:row.id })  
+                if (!error && code === 200) {
+                    window.$message.success(msg)
+                    getTableData()
+                } else {
+                    getTableData()
+                }
+                instance.confirmButtonLoading = false
+                done()
             } else {
-                getTableData()
+                done()
             }
     })
 }

src/views/project/contract/index.vue

@@ -56,7 +56,7 @@ import { onActivated, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import contractApi from '~api/project/project-contract.js'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 
 const router = useRouter()
@@ -151,15 +151,22 @@ const editRowClick = (row) => {
 
 //删除
 const delRowClick = ({ id }) => {
-    delMessage(async () => {
-        const { error, code, msg } = await contractApi.deleteContractInfoById({ id })
-        //判断状态
-        if (!error && code === 200) {
-            window.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window.$message?.error(msg)
-        }
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await contractApi.deleteContractInfoById({ id })
+                //判断状态
+                if (!error && code === 200) {
+                    window.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window.$message?.error(msg)
+                }
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
     })
 }
 

src/views/project/cost/index.vue

@@ -52,7 +52,7 @@ import { onActivated, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import costApi from '~api/project/cost.js'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 
 const router = useRouter()
@@ -138,13 +138,20 @@ const editRowClick = (row) => {
 //删除成本预算deleteByStatsId
 
 const delRowClick = async (row) => {
-    delMessage(async () => {
-        const { error, code, msg } = await costApi.deleteByStatsId({ id:row.id })  
-            if (!error && code === 200) {
-                window.$message.success(msg)
-                getTableData()
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const { error, code, msg } = await costApi.deleteByStatsId({ id:row.id })  
+                if (!error && code === 200) {
+                    window.$message.success(msg)
+                    getTableData()
+                } else {
+                    getTableData()
+                }
+                instance.confirmButtonLoading = false
+                done()
             } else {
-                getTableData()
+                done()
             }
     })
 }

src/views/project/list/index.vue

@@ -81,7 +81,7 @@ import { onActivated, onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import projectApi from '~api/project/project-list.js'
 import { getArrValue } from 'js-fast-way'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 import { getDictInfo } from '~api/other'
 
 const router = useRouter()
@@ -237,15 +237,22 @@ const addRowClick = () => {
 }
 //删除
 const delRowClick = (row) => {
-    delMessage(async () => {
-            row.delLoad = true
-            const { error, code, msg } = await projectApi.removeProjectInfo({ id:row.id })
-            row.delLoad = false
-            if (!error && code === 200) {
-                window.$message.success(msg)
-                getTableData()
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                row.delLoad = true
+                const { error, code, msg } = await projectApi.removeProjectInfo({ id:row.id })
+                row.delLoad = false
+                if (!error && code === 200) {
+                    window.$message.success(msg)
+                    getTableData()
+                } else {
+                    getTableData()
+                }
+                instance.confirmButtonLoading = false
+                done()
             } else {
-                getTableData()
+                done()
             }
     })
     

src/views/system/menu.vue

@@ -103,7 +103,7 @@ import { onActivated, ref } from 'vue'
 import mainApi from '~api/system/menu'
 import { arrToId, formValidate, getArrValue } from 'js-fast-way'
 import config from '~src/config/index'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 //页面被激活时
 onActivated(() => {
@@ -140,9 +140,16 @@ const tableSelectionChange = (rows) => {
 //删除菜单
 const deleteClick = () => {
     if (tableCheckedKeys.value) {
-        delMessage(() => {
-            deleteApi(tableCheckedKeys.value)
-        })
+        delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                deleteApi(tableCheckedKeys.value)
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+    })
     } else {
         window.$message.warning('请选择要删除的菜单')
     }

src/views/system/organization.vue

@@ -66,7 +66,8 @@ import mainApi from '~api/system/organization'
 import HcTreeData from './components/HcTreeData.vue'
 import { arrIndex, formValidate, getArrValue } from 'js-fast-way'
 import menuApi from '~api/system/menu'
-import { delMessage } from '~uti/tools'
+// import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 
 //显示模式
 const isedit = ref(true)
@@ -166,9 +167,19 @@ const treeMenuTap = ({ key, node, data }) => {
         formModalTitle.value = '编辑' + type + '信息'
         formModal.value = true
     } else if (key === 'del') {
-        delMessage(() => {
-            delNodeClick(data)
-        }, '您确定要删除【' + data.deptName + '】的机构信息吗？一旦注销数据将彻底清除，请谨慎操作')
+        // delMessage(() => {
+        //     delNodeClick(data)
+        // }, '您确定要删除【' + data.deptName + '】的机构信息吗？一旦注销数据将彻底清除，请谨慎操作')
+        delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                delNodeClick(data)
+                instance.confirmButtonLoading = false
+                done()
+            } else {
+                done()
+            }
+    }, '您确定要删除【' + data.deptName + '】的机构信息吗？一旦注销数据将彻底清除，请谨慎操作')
     } else if (key === 'auth') {
         authModalShow(data)
     }

src/views/system/user.vue

@@ -163,7 +163,7 @@ import mainApi from '~api/system/user'
 import organizationApi from '~api/system/organization'
 import { arrIndex, arrToId, formValidate, getArrValue, isIdCard, isPhone } from 'js-fast-way'
 import { Delete, Plus } from '@element-plus/icons-vue'
-import { delMessage } from '~uti/tools'
+import { delMessageV2 } from '~com/message/index.js'
 import { useAppStore } from '~src/store'
 const useAppState = useAppStore()
 
@@ -526,15 +526,22 @@ const formModalClose = () => {
 
 //删除用户
 const delClick = () => {
-    delMessage(async () => {
-        const ids = arrToId(tableCheckedKeys.value)
-        const { error, code, msg } = await mainApi.remove(ids)
-        if (!error && code === 200) {
-            window?.$message?.success(msg)
-            getTableData().then()
-        } else {
-            window?.$message?.error(msg)
-        }
+
+    delMessageV2(async (action, instance, done) => {
+            if (action === 'confirm') {
+                instance.confirmButtonLoading = true
+                const ids = arrToId(tableCheckedKeys.value)
+                const { error, code, msg } = await mainApi.remove(ids)
+                if (!error && code === 200) {
+                    window?.$message?.success(msg)
+                    getTableData().then()
+                } else {
+                    window?.$message?.error(msg)
+                }
+                done()
+            } else {
+                done()
+            }
     })
 }
 </script>