Merge remote-tracking branch 'origin/main'

src/utils/configure.js

@@ -46,10 +46,12 @@ const CONFIG = {
   IS_CODE_LOGIN: LOGIN_CONFIG.CODE_EMAIL_LOGIN || LOGIN_CONFIG.CODE_PHONE_LOGIN, // 是否开启短信登录
   // 数据设置
   dataSettings: {
-    integrityCheck: DATA_SETTINGS.OPEN, // 数据完整性校验（true：开启，false：关闭）
+    integrityCheck: DATA_SETTINGS.CLOSE, // 数据完整性校验（true：开启，false：关闭）
-    encryptRequest: DATA_SETTINGS.OPEN,     // 数据传输加密（true：开启，false：关闭）
+    encryptRequest: DATA_SETTINGS.CLOSE,     // 数据传输加密（true：开启，false：关闭）
-    encryptResponse: DATA_SETTINGS.OPEN      // 数据返回解密（true：开启，false：关闭）
+    encryptResponse: DATA_SETTINGS.CLOSE,      // 数据返回解密（true：开启，false：关闭）
-  }
+  },
+  // 增加配置以支持增加根节点公司的添加和删除功能，added by weiweiwang，2024/9/12
+  IS_ADD_ROOT_COMPANY: DATA_SETTINGS.OPEN,
 }
 
 // 获取占位符文本的函数

src/utils/request.js

@@ -79,7 +79,7 @@ service.interceptors.request.use(config => {
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     let data = typeof config.data === 'object' ? JSON.stringify(config.data) : config.data
     let contentType = config.headers['Content-Type']
-    if (contentType.includes('application/json')) {
+    if (contentType.includes('application/json') && typeof data !== 'undefined') {
       // 数据完整性校验
       if (CONFIG.dataSettings.integrityCheck && checkIntegrity) {
         config.headers['Params-Hash'] = hashWithSM3AndSalt(data)

src/views/system/dept/index.vue

@@ -85,7 +85,7 @@
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+              v-if="CONFIG.IS_ADD_ROOT_COMPANY ? true : scope.row.parentId != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -102,7 +102,12 @@
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+              <treeselect
+                  v-model="form.parentId"
+                  :options="deptOptions"
+                  :normalizer="normalizer"
+                  :placeholder="CONFIG.IS_ADD_ROOT_COMPANY ? '选择上级部门，如果不选择则创建顶级部门' : '选择上级部门'"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -161,9 +166,15 @@
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {CONFIG} from "@/utils/configure";
 
 export default {
   name: "Dept",
+  computed: {
+    CONFIG() {
+      return CONFIG
+    }
+  },
   dicts: ['sys_normal_disable'],
   components: { Treeselect },
   data() {
@@ -193,9 +204,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        parentId: [
+        parentId: CONFIG.IS_ADD_ROOT_COMPANY ? [] : [{ required: true, message: "上级部门不能为空", trigger: "blur" } ] ,
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
-        ],
         deptName: [
           { required: true, message: "部门名称不能为空", trigger: "blur" }
         ],