修改文件

src/views/authority/modules/api/auth.vue

@@ -12,9 +12,8 @@
                     <el-button hc-btn type="danger" @click="delClick">删除</el-button>
                 </template>
                 <hc-table
-                    :column="tableColumn" :datas="tableData" :loading="tableLoading"
-                    :is-index="false" is-check :check-style="{ width: 29 }"
-                    @selection-change="tableCheckChange"
+                    :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+                    :is-index="false" :check-style="{ width: 29 }" @selection-change="tableCheckChange"
                 >
                     <template #scopeType="{ row }">{{ getScopeTypeName(row) }}</template>
                     <template #action="{ row }">
@@ -27,6 +26,7 @@
                 </template>
             </hc-card>
         </hc-dialog>
+
         <!-- 新增/修改 -->
         <hc-dialog v-model="isDialogShow" widths="50rem" is-footer-center :title="dialogTitle" @close="dialogFormClose">
             <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto">
@@ -164,18 +164,13 @@ const tableLoading = ref(true)
 const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
-    const { error, code, data } = await mainApi.page({
+    const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
     })
     tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data['records'])
-        searchForm.value.total = data['total']
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    tableData.value = getArrValue(data?.records)
+    searchForm.value.total = data?.total ?? 0
 }
 
 //表格被选择
@@ -244,15 +239,12 @@ const dialogSubmit = async () => {
     if (!formRes) return false
     submitLoading.value = true
     //发起请求
-    const { error, code, msg } = await mainApi.submit(formModel.value)
+    const { isRes } = await mainApi.submit(formModel.value)
     submitLoading.value = false
-    if (!error && code === 200) {
-        dialogFormClose()
-        window?.$message?.success('操作成功')
-        getTableData().then()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogFormClose()
+    window?.$message?.success('操作成功')
+    getTableData().then()
 }
 
 //关闭弹窗
@@ -264,15 +256,11 @@ const dialogFormClose = () => {
 
 //删除
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getTableData().then()
 }
 
 //批量删除
@@ -285,14 +273,11 @@ const delClick = () => {
     //确认删除菜单
     HcDelMsg(async (resolve) => {
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        resolve() //关闭弹窗的回调
-        if (code === 200) {
-            window.$message.success('删除成功')
-            getTableData().then()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        getTableData().then()
     })
 }
 

src/views/authority/modules/data/auth.vue

@@ -27,6 +27,7 @@
                 </template>
             </hc-card>
         </hc-dialog>
+
         <!-- 新增/修改 -->
         <hc-dialog v-model="isDialogShow" widths="50rem" is-footer-center :title="dialogTitle" @close="dialogFormClose">
             <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto">
@@ -182,18 +183,13 @@ const tableLoading = ref(true)
 const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
-    const { error, code, data } = await mainApi.page({
+    const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
     })
     tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data['records'])
-        searchForm.value.total = data['total']
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    tableData.value = getArrValue(data?.records)
+    searchForm.value.total = data?.total ?? 0
 }
 
 //表格被选择
@@ -273,15 +269,12 @@ const dialogSubmit = async () => {
     if (!formRes) return false
     submitLoading.value = true
     //发起请求
-    const { error, code, msg } = await mainApi.submit(formModel.value)
+    const { isRes } = await mainApi.submit(formModel.value)
     submitLoading.value = false
-    if (!error && code === 200) {
-        dialogFormClose()
-        window?.$message?.success('操作成功')
-        getTableData().then()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogFormClose()
+    window?.$message?.success('操作成功')
+    getTableData().then()
 }
 
 //关闭弹窗
@@ -293,15 +286,11 @@ const dialogFormClose = () => {
 
 //删除
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getTableData().then()
 }
 
 //批量删除
@@ -315,16 +304,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            getTableData().then()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        getTableData().then()
     })
 }
 

src/views/authority/modules/role/auth.vue

@@ -142,15 +142,12 @@ const dialogSubmit = async () => {
         }
     }
     //发起请求
-    const { error, code, msg } = await mainApi.grant(newObjData)
+    const { isRes } = await mainApi.grant(newObjData)
     submitLoading.value = false
-    if (!error && code === 200) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        getDataApi()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    getDataApi()
 }
 
 //关闭弹窗

src/views/authority/role.vue

@@ -15,9 +15,8 @@
             <el-button hc-btn type="danger" @click="delClick">删除</el-button>
         </template>
         <hc-table
-            :column="tableColumn" :datas="tableData" :loading="tableLoading"
-            :is-index="false" is-check :check-style="{ width: 29 }" is-children
-            @selection-change="tableCheckChange"
+            :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+            :is-index="false" :check-style="{ width: 29 }" is-children @selection-change="tableCheckChange"
         >
             <template #tenantId="{ row }">{{ getTenantName(row) }}</template>
             <template #action="{ row }">
@@ -214,15 +213,12 @@ const dialogSubmit = async () => {
     form.parentId = form.parentId ?? '0'
     form.tenantId = form.tenantId ?? ''
     //发起请求
-    const { error, code, msg } = await mainApi.submit(form)
+    const { isRes } = await mainApi.submit(form)
     submitLoading.value = false
-    if (!error && code === 200) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        getTableData()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    getTableData()
 }
 
 //关闭弹窗
@@ -235,15 +231,11 @@ const dialogClose = () => {
 
 //删除
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getTableData().then()
 }
 
 
@@ -258,16 +250,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            getTableData().then()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        getTableData().then()
     })
 }
 

src/views/certificate/admin.vue

@@ -75,18 +75,13 @@ const tableLoading = ref(true)
 const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
-    const { error, code, data } = await mainApi.page({
+    const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
     })
     tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data['records'])
-        searchForm.value.total = data['total']
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    tableData.value = getArrValue(data?.records)
+    searchForm.value.total = data?.total ?? 0
 }
 
 //点击查看

src/views/certificate/list.vue

@@ -91,18 +91,13 @@ const tableLoading = ref(true)
 const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
-    const { error, code, data } = await mainApi.page({
+    const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
     })
     tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data['records'])
-        searchForm.value.total = data['total']
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    tableData.value = getArrValue(data?.records)
+    searchForm.value.total = data?.total ?? 0
 }
 
 const isRowDrawer = ref(false)
@@ -126,27 +121,20 @@ const editRowClick = (row) => {
 
 //注册
 const registerRowClick = async (row) => {
-    const { error, code, msg } = await mainApi.goRegister({
+    const { isRes } = await mainApi.goRegister({
         key: row.id,
     })
-    if (!error && code === 200) {
-        window.$message.success('操作成功')
-        getTableData()
-    } else {
-        window.$message.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    window.$message.success('操作成功')
+    getTableData().then()
 }
 
 //删除
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getTableData().then()
 }
 </script>

src/views/certificate/modules/admin/see.vue

@@ -113,16 +113,12 @@ const signPfxClick = ({ signPfxFileList }) => {
 //删除签名配置
 const delRowClick = async ({ item }, resolve) => {
     const { row, index } = getObjValue(item)
-    const { code, msg } = await mainApi.del(row.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getRoleList().then()
-        tableData.value.splice(index, 1)
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(row.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getRoleList().then()
+    tableData.value.splice(index, 1)
 }
 </script>
 

src/views/certificate/modules/list/form.vue

@@ -312,14 +312,11 @@ const submitClick = async () => {
     } else {
         res = await mainApi.update(form)
     }
-    const { error, code, msg } = res
+    const { isRes } = res
     submitLoading.value = false
-    if (!error && code === 200) {
-        cancelClick()
-        window?.$message?.success('操作成功')
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    cancelClick()
+    window?.$message?.success('操作成功')
 }
 
 //取消关闭

src/views/project/modules/list/info-dialog.vue

@@ -120,27 +120,21 @@ const dialogClose = () => {
 //删除项目
 const delProject = async (_, resolve) => {
     if (isNullES(projectId.value)) return
-    const { error, code, msg } = await mainApi.del(projectId.value)
-    if (!error && code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        dialogClose()
-        emit('change')
-    } else {
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(projectId.value)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    dialogClose()
+    emit('change')
 }
 
 //删除合同段
 const delContract = async ({ item }, resolve) => {
-    const { error, code, msg } = await contractApi.del(item.id)
-    resolve()
-    if (!error && code === 200) {
-        window.$message.success('删除成功')
-        getContractList(projectId.value).then()
-    } else {
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await contractApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getContractList(projectId.value).then()
 }
 
 //功能事件回调

src/views/project/modules/list/tree-node-edit.vue

@@ -218,16 +218,13 @@ const aliasSubmit = async () => {
     submitAliasLoading.value = true
     const { pKeyId } = formModel.value
     const fullName = aliasArr.value.join(',')
-    const { error, code, msg } = await privateApi.privateSubmitFullName({
+    const { isRes } = await privateApi.privateSubmitFullName({
         pKeyId, fullNames: fullName,
     })
     submitAliasLoading.value = false
-    if (!error && code === 200) {
-        aliasDialogClose()
-        window?.$message?.success('操作成功')
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    aliasDialogClose()
+    window?.$message?.success('操作成功')
 }
 
 //关闭节点别名弹窗
@@ -292,15 +289,12 @@ const dialogSubmit = async () => {
     if (!formRes) return false
     submitLoading.value = true
     //发起请求
-    const { error, code, msg } = await privateApi.submit(formModel.value)
+    const { isRes } = await privateApi.submit(formModel.value)
     submitLoading.value = false
-    if (!error && code === 200) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        emit('change')
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    emit('change')
 }
 
 //关闭弹窗

src/views/project/modules/list/wbs-tree.vue

@@ -316,14 +316,11 @@ const treeMenuClick = async ({ key, node, data }) => {
             text: `是否同步节点【${data.title}】？`,
             loadingText: '数据同步中...',
         }, (resolve) => {
-            const { error, code, msg } = mainApi.syncNodeTable(pid)
-            resolve()
-            if (!error && code === 200) {
-                window.$message.success('同步成功')
-                getInfoTableData()
-            } else {
-                window.$message.error(msg ?? '同步失败')
-            }
+            const { isRes } = mainApi.syncNodeTable(pid)
+            resolve() //关闭弹窗
+            if (!isRes) return
+            window.$message.success('同步成功')
+            getInfoTableData()
         })
     } else if (key === 'sync3') {
         const { id } = projectInfo.value
@@ -336,14 +333,11 @@ const treeMenuClick = async ({ key, node, data }) => {
             text: '同步元素表单排序到合同段？',
             loadingText: '数据同步中...',
         }, (resolve) => {
-            const { error, code, msg } = mainApi.syncContractTabSort(id)
-            resolve()
-            if (!error && code === 200) {
-                window.$message.success('同步成功')
-                getInfoTableData()
-            } else {
-                window.$message.error(msg ?? '同步失败')
-            }
+            const { isRes } = mainApi.syncContractTabSort(id)
+            resolve() //关闭弹窗
+            if (!isRes) return
+            window.$message.success('同步成功')
+            getInfoTableData()
         })
     } else if (key === 'sync2') {
         const { primaryKeyId, pKeyId } = data
@@ -357,14 +351,11 @@ const treeMenuClick = async ({ key, node, data }) => {
             text: `是否同步节点【${data.title}】到合同段？`,
             loadingText: '数据同步中...',
         }, (resolve) => {
-            const { error, code, msg } = mainApi.syncNodeinfo(pid)
-            resolve()
-            if (!error && code === 200) {
-                window.$message.success('同步成功')
-                getInfoTableData()
-            } else {
-                window.$message.error(msg ?? '同步失败')
-            }
+            const { isRes } = mainApi.syncNodeinfo(pid)
+            resolve() //关闭弹窗
+            if (!isRes) return
+            window.$message.success('同步成功')
+            getInfoTableData()
         })
     } else if (key === 'sort') {
         const { parentId } = data
@@ -399,14 +390,11 @@ const treeMenuClick = async ({ key, node, data }) => {
             text: `此操作将删除节点【${data.title}】，是否继续？`,
             loadingText: '删除节点中...',
         }, (resolve) => {
-            const { error, code, msg } = mainApi.del(pid)
-            resolve()
-            if (!error && code === 200) {
-                window.$message.success('删除成功')
-                reloadPage()
-            } else {
-                window.$message.error(msg ?? '删除失败')
-            }
+            const { isRes } = mainApi.del(pid)
+            resolve() //关闭弹窗
+            if (!isRes) return
+            window.$message.success('删除成功')
+            reloadPage()
         })
     }
 }
@@ -464,14 +452,11 @@ const nodeSortModalSave = async () => {
         arr[i].sort = i + 1
     }
     //发起请求
-    const { error, code, msg } = await wbsTreeApi.wbsTreePrivateSort(arr)
-    if (!error && code === 200) {
-        window.$message.success('排序完成')
-        nodeSortModalShow.value = false
-        reloadPage()
-    } else {
-        window.$message.error(msg ?? '排序失败')
-    }
+    const { isRes } = await wbsTreeApi.wbsTreePrivateSort(arr)
+    if (!isRes) return
+    window.$message.success('排序完成')
+    nodeSortModalShow.value = false
+    reloadPage()
 }
 
 //编辑节点
@@ -567,18 +552,15 @@ const getInfoTableData = async () => {
 
 //当前项目信息表删除
 const delInfoTableRow = async ({ item }, resolve) => {
-    const { error, code, msg } = await mainApi.removeTableByCondition({
+    const { isRes } = await mainApi.removeTableByCondition({
         id: item.id,
         wbsId: wbsId.value,
         projectId: projectInfo.value.id,
     })
-    resolve()
-    if (!error && code === 200) {
-        window.$message.success('删除成功')
-        getInfoTableData().then()
-    } else {
-        window.$message.error(msg ?? '删除失败')
-    }
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getInfoTableData().then()
 }
 
 //表单设置