修改文件

src/views/system/dict.vue

@@ -16,9 +16,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 #isSealed="{ row }">
                 {{ row.isSealed === 1 ? '是' : '否' }}
@@ -34,26 +33,38 @@
         </template>
 
         <!-- 新增/修改 -->
-        <hc-dialog v-model="isDialogShow" widths="400px" is-footer-center :title="dialogTitle" @close="dialogClose">
-            <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto">
-                <el-form-item label="字典编号：" prop="code">
-                    <el-input v-model="formModel.code" clearable placeholder="请输入字典编号" />
-                </el-form-item>
-                <el-form-item label="字典名称：" prop="dictValue">
-                    <el-input v-model="formModel.dictValue" clearable placeholder="请输入字典名称" />
-                </el-form-item>
-                <el-form-item label="字典备注：">
-                    <el-input v-model="formModel.remark" clearable placeholder="请输入字典备注" />
-                </el-form-item>
-                <el-form-item label="字典排序：" prop="sort">
-                    <el-input-number v-model="formModel.sort" :min="1" block controls-position="right" />
-                </el-form-item>
-                <el-form-item label="字典封存：" prop="isSealed">
-                    <el-radio-group v-model="formModel.isSealed">
-                        <el-radio :value="1">是</el-radio>
-                        <el-radio :value="0">否</el-radio>
-                    </el-radio-group>
-                </el-form-item>
+        <hc-dialog v-model="isDialogShow" widths="34rem" is-footer-center :title="dialogTitle" @close="dialogClose">
+            <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto" size="large">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="字典编号：" prop="code">
+                            <el-input v-model="formModel.code" clearable placeholder="请输入字典编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="字典名称：" prop="dictValue">
+                            <el-input v-model="formModel.dictValue" clearable placeholder="请输入字典名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="字典备注：">
+                            <el-input v-model="formModel.remark" clearable placeholder="请输入字典备注" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="字典排序：" prop="sort">
+                            <el-input-number v-model="formModel.sort" :min="1" block controls-position="right" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="字典封存：" prop="isSealed">
+                            <el-radio-group v-model="formModel.isSealed">
+                                <el-radio :value="1">是</el-radio>
+                                <el-radio :value="0" class="ml-20px">否</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-form>
             <template #footer>
                 <el-button hc-btn @click="dialogClose">取消</el-button>
@@ -120,15 +131,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
 }
 
 //表格被选择
@@ -190,15 +196,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()
 }
 
 //批量删除
@@ -210,18 +212,12 @@ 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()
     })
 }
 
@@ -232,15 +228,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/dictbiz.vue

@@ -34,26 +34,38 @@
         </template>
 
         <!-- 新增/修改 -->
-        <hc-dialog v-model="isDialogShow" widths="400px" is-footer-center :title="dialogTitle" @close="dialogClose">
+        <hc-dialog v-model="isDialogShow" widths="34rem" is-footer-center :title="dialogTitle" @close="dialogClose">
             <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto">
-                <el-form-item label="字典编号：" prop="code">
-                    <el-input v-model="formModel.code" clearable placeholder="请输入字典编号" />
-                </el-form-item>
-                <el-form-item label="字典名称：" prop="dictValue">
-                    <el-input v-model="formModel.dictValue" clearable placeholder="请输入字典名称" />
-                </el-form-item>
-                <el-form-item label="字典备注：">
-                    <el-input v-model="formModel.remark" clearable placeholder="请输入字典备注" />
-                </el-form-item>
-                <el-form-item label="字典排序：" prop="sort">
-                    <el-input-number v-model="formModel.sort" :min="1" block controls-position="right" />
-                </el-form-item>
-                <el-form-item label="字典封存：" prop="isSealed">
-                    <el-radio-group v-model="formModel.isSealed">
-                        <el-radio :value="1">是</el-radio>
-                        <el-radio :value="0">否</el-radio>
-                    </el-radio-group>
-                </el-form-item>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="字典编号：" prop="code">
+                            <el-input v-model="formModel.code" clearable placeholder="请输入字典编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="字典名称：" prop="dictValue">
+                            <el-input v-model="formModel.dictValue" clearable placeholder="请输入字典名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="字典备注：">
+                            <el-input v-model="formModel.remark" clearable placeholder="请输入字典备注" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="字典排序：" prop="sort">
+                            <el-input-number v-model="formModel.sort" :min="1" block controls-position="right" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="字典封存：" prop="isSealed">
+                            <el-radio-group v-model="formModel.isSealed">
+                                <el-radio :value="1">是</el-radio>
+                                <el-radio :value="0" class="ml-20px">否</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-form>
             <template #footer>
                 <el-button hc-btn @click="dialogClose">取消</el-button>
@@ -120,15 +132,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
 }
 
 //表格被选择
@@ -190,15 +197,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()
 }
 
 //批量删除
@@ -212,16 +215,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()
     })
 }
 
@@ -232,15 +230,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/param.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-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 #action="{ row }">
                 <el-link type="warning" @click="editRowClick(row)">修改</el-link>
@@ -24,8 +23,8 @@
         </template>
 
         <!-- 新增/修改 -->
-        <hc-dialog v-model="isDialogShow" widths="800px" is-footer-center :title="dialogTitle" @close="dialogClose">
-            <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto">
+        <hc-dialog v-model="isDialogShow" widths="30rem" is-footer-center :title="dialogTitle" @close="dialogClose">
+            <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto" size="large">
                 <el-form-item label="参数名称：" prop="paramName">
                     <el-input v-model="formModel.paramName" clearable placeholder="请输入参数名称" />
                 </el-form-item>
@@ -33,7 +32,7 @@
                     <el-input v-model="formModel.paramKey" clearable placeholder="请输入参数键名" />
                 </el-form-item>
                 <el-form-item label="参数键值：" prop="paramValue">
-                    <el-input v-model="formModel.paramValue" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="请输入参数键值" />
+                    <el-input v-model="formModel.paramValue" :autosize="{ minRows: 4, maxRows: 8 }" type="textarea" placeholder="请输入参数键值" />
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -88,18 +87,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
 }
 
 //表格被选择
@@ -156,15 +150,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()
 }
 
 //批量删除
@@ -178,16 +168,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()
     })
 }
 
@@ -198,14 +183,11 @@ 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) {
-        window?.$message?.success('操作成功')
-        reloadPage()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    window?.$message?.success('操作成功')
+    reloadPage()
 }
 
 //关闭弹窗