修改文件

src/views/system/dept.vue

@@ -281,15 +281,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('操作成功')
-        reloadPage()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    reloadPage()
 }
 
 //关闭弹窗
@@ -302,15 +299,11 @@ const dialogClose = () => {
 
 //删除
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        reloadPage()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    reloadPage()
 }
 
 //批量删除
@@ -324,16 +317,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            reloadPage()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        reloadPage()
     })
 }
 </script>

src/views/system/menu-top.vue

@@ -10,9 +10,8 @@
             <el-button hc-btn type="danger" @click="delClick">删除</el-button>
         </template>
         <hc-table
-            ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
-            :is-index="false" is-check :check-style="{ width: 29 }"
-            @selection-change="tableCheckChange"
+            ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+            :is-index="false" :check-style="{ width: 29 }" @selection-change="tableCheckChange"
         >
             <template #action="{ row }">
                 <el-link type="warning" @click="editRowClick(row)">修改</el-link>
@@ -90,7 +89,7 @@ const tableRef = ref(null)
 const tableColumn = ref([
     { key: 'name', name: '菜单名称' },
     { key: 'code', name: '跳转地址' },
-    { key: 'sort', name: '排序' },
+    { key: 'sort', name: '排序', width: 80, align: 'center' },
     { key: 'action', name: '操作', width: 200, align: 'center' },
 ])
 
@@ -100,18 +99,13 @@ const tableData = ref([])
 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
 }
 
 //表格被选择
@@ -168,15 +162,11 @@ const editRowClick = (row) => {
 
 //删除菜单
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        reloadPage()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    reloadPage()
 }
 
 //批量删除菜单
@@ -190,16 +180,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            reloadPage()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        reloadPage()
     })
 }
 
@@ -210,15 +195,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) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        reloadPage()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    reloadPage()
 }
 
 //关闭弹窗

src/views/system/menu.vue

@@ -392,15 +392,11 @@ const copyRowClick = (row) => {
 
 //删除菜单
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        reloadPage()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    reloadPage()
 }
 
 //批量删除菜单
@@ -414,16 +410,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            reloadPage()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        reloadPage()
     })
 }
 
@@ -454,15 +445,12 @@ const dialogSubmit = async () => {
     form.parentId = form.parentId ?? 0
     form.alias = form.alias ?? form.code
     //发起请求
-    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('操作成功')
-        reloadPage()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    reloadPage()
 }
 
 //关闭弹窗

src/views/system/modules/tenant/data-source.vue

@@ -72,15 +72,12 @@ const initFormData = async () => {
 const submitLoading = ref(false)
 const dialogSubmit = async () => {
     submitLoading.value = true
-    const { error, code, msg } = await mainApi.datasource(formModel.value)
+    const { isRes } = await mainApi.datasource(formModel.value)
     submitLoading.value = false
-    if (!error && code === 200) {
-        window?.$message?.success('操作成功')
-        emit('finish')
-        dialogClose()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    window?.$message?.success('操作成功')
+    emit('finish')
+    dialogClose()
 }
 
 //关闭弹窗

src/views/system/modules/tenant/package-data.vue

@@ -93,7 +93,7 @@ const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
     const { data } = await mainApi.page(searchForm.value)
-    tableData.value = getArrValue(data['records'])
+    tableData.value = getArrValue(data?.records)
     tableLoading.value = false
 }
 
@@ -158,15 +158,11 @@ const editRowClick = (row) => {
 
 //删除
 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()
 }
 
 //批量删除
@@ -180,16 +176,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()
     })
 }
 
@@ -203,15 +194,12 @@ const dialogSubmit = async () => {
     const form = formModel.value
     form.menuId = form.menuIds?.join(',') ?? ''
     //发起请求
-    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().then()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    getTableData().then()
 }
 
 //关闭弹窗

src/views/system/modules/tenant/package.vue

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

src/views/system/modules/tenant/setting.vue

@@ -67,15 +67,12 @@ const initFormData = () => {
 const submitLoading = ref(false)
 const dialogSubmit = async () => {
     submitLoading.value = true
-    const { error, code, msg } = await mainApi.setting(formModel.value)
+    const { isRes } = await mainApi.setting(formModel.value)
     submitLoading.value = false
-    if (!error && code === 200) {
-        window?.$message?.success('操作成功')
-        emit('finish')
-        dialogClose()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    window?.$message?.success('操作成功')
+    emit('finish')
+    dialogClose()
 }
 
 //关闭弹窗

src/views/system/post.vue

@@ -21,9 +21,8 @@
             <el-button hc-btn type="danger" @click="delClick">删除</el-button>
         </template>
         <hc-table
-            ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
-            is-check :check-style="{ width: 29 }" :index-style="{ width: 60 }"
-            @selection-change="tableCheckChange"
+            ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+            :check-style="{ width: 29 }" :index-style="{ width: 60 }" @selection-change="tableCheckChange"
         >
             <template #tenantId="{ row }">
                 {{ getTenantNmae(row.tenantId) }}
@@ -147,7 +146,7 @@ const tableColumn = ref([
     { key: 'category', name: '岗位类型' },
     { key: 'postCode', name: '岗位编号' },
     { key: 'postName', name: '岗位名称' },
-    { key: 'sort', name: '岗位排序' },
+    { key: 'sort', name: '岗位排序', width: 80, align: 'center' },
     { key: 'action', name: '操作', width: 100, align: 'center' },
 ])
 
@@ -164,15 +163,10 @@ const getTableData = async () => {
     if (searchName.value) {
         form[searchType.value] = searchName.value
     }
-    const { error, code, data } = await mainApi.page(form)
+    const { data } = await mainApi.page(form)
     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
 }
 
 //表格被选择
@@ -234,15 +228,11 @@ const editRowClick = (row) => {
 
 //删除
 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()
 }
 
 //批量删除
@@ -256,16 +246,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()
     })
 }
 
@@ -276,15 +261,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) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        getTableData().then()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    getTableData().then()
 }
 
 //关闭弹窗

src/views/system/tenant.vue

@@ -24,9 +24,8 @@
             </div>
         </template>
         <hc-table
-            ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
-            is-check :check-style="{ width: 29 }" :index-style="{ width: 60 }"
-            @selection-change="tableCheckChange"
+            ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+            :check-style="{ width: 29 }" :index-style="{ width: 60 }" @selection-change="tableCheckChange"
         >
             <template #accountNumber="{ row }">
                 {{ row.accountNumber > 0 ? row.accountNumber : '不限制' }}
@@ -171,15 +170,10 @@ const getTableData = async () => {
     if (searchName.value) {
         form[searchType.value] = searchName.value
     }
-    const { error, code, data } = await mainApi.page(form)
+    const { data } = await mainApi.page(form)
     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
 }
 
 //表格被选择
@@ -241,15 +235,11 @@ const editRowClick = (row) => {
 
 //删除
 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()
 }
 
 //批量删除
@@ -263,16 +253,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()
     })
 }
 
@@ -291,15 +276,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) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        getTableData().then()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    getTableData().then()
 }
 
 //关闭弹窗