Merge branch 'depart_change' into dev

src/views/system/dept/index.vue

@@ -63,6 +63,9 @@
         <el-table-column prop="deptName"
           label="部门名称"
           width="260"></el-table-column>
+        <el-table-column prop="deptCode"
+          label="部门编码"
+          width="200"></el-table-column>
         <el-table-column prop="orderNum"
           label="排序"
           width="200"></el-table-column>
@@ -110,7 +113,8 @@
       <el-dialog :title="title"
         v-model="open"
         append-to-body
-        draggable overflow>
+        draggable
+        overflow>
         <el-form ref="deptRef"
           :model="form"
           :rules="rules"
@@ -135,6 +139,14 @@
                   placeholder="请输入部门名称" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="部门编码"
+                prop="deptCode">
+                <el-input v-model="form.deptCode"
+                  placeholder="请输入 WB 字符开头后面 4 位数字格式"
+                  maxlength="20" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="显示排序"
                 prop="orderNum">
@@ -176,6 +188,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
         </el-form>
         <template #footer>
@@ -216,9 +229,20 @@
     rules: {
       parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
       deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+      deptCode: [{ required: true, message: "部门编码不能为空", trigger: "blur" }, {
+        validator: (rule, value, callback) => {
+          // 部门编码只能是 WB 字符开头，后面 4 位数字格式
+          if (!/^WB[0-9]{4}$/.test(value)) {
+            callback(new Error("部门编码只能是 6 位 WB 字符开头后面 4 位数字格式"));
+          } else {
+            callback();
+          }
+        }, trigger: "blur"
+      }],
       orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
       email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-      phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+      phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+
     },
   });