Browse Source

修改组织

zhaoke 3 năm trước cách đây
mục cha
commit
988fa609a2

+ 26 - 13
src/utils/validate.js

@@ -13,7 +13,7 @@
  * @param {string} path
  * @returns {Boolean}
  */
-export function isExternal(path) {
+export function isExternal (path) {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 
@@ -21,7 +21,7 @@ export function isExternal(path) {
  * @param {string} str
  * @returns {Boolean}
  */
-export function validUsername(str) {
+export function validUsername (str) {
   const valid_map = ['admin', 'editor']
   return valid_map.indexOf(str.trim()) >= 0
 }
@@ -30,13 +30,13 @@ export function validUsername(str) {
  * @param {string} str
  * @returns {Object}
  */
-export function orgTree(str) {
+export function orgTree (str) {
   const valid_map = ['admin', 'editor']
   return valid_map.indexOf(str.trim()) >= 0
 }
 
 //  岗位树构造
-export function translateDataToTreeAll(data, parentKey, parentIDKey) {
+export function translateDataToTreeAll (data, parentKey, parentIDKey) {
   let parent = data.filter((value) => Number(value[parentKey]) <= 0);// 父数据
   let children = data.filter((value) => Number(value[parentKey]) > 0);// 子数据
   //console.log('--parent', parent)
@@ -71,7 +71,7 @@ export function translateDataToTreeAll(data, parentKey, parentIDKey) {
   return parent;
 }
 
-export function deteleObject(obj) {
+export function deteleObject (obj) {
   var uniques = [];
   var stringify = {};
   for (var i = 0; i < obj.length; i++) {
@@ -94,12 +94,12 @@ export function deteleObject(obj) {
 }
 
 // 随机长度
-function randomNum(start, end) {
+function randomNum (start, end) {
   return Math.floor(Math.random() * (Number(end) - Number(start)) + start)
 }
 
 //字母随机
-function randomAlp(arr, count) {
+function randomAlp (arr, count) {
 
   let shuffled = arr.slice(0)
   let i = arr.length
@@ -128,13 +128,13 @@ function randomAlp(arr, count) {
  * @returns {Object}
  * 4位密码规则 1111 = 大写 小写 特殊字符 数字 都开启
  */
-export function pwdProduce(minLen, maxLen, struc) {
+export function pwdProduce (minLen, maxLen, struc) {
   // 密码规则转化
   const pwdStruc = typeof (struc) === 'string' ? struc.split('') : `${struc}`.split('')
   // 字母
   const alphabet = 'abcdefghijklmnopqrstuvwxyz'
   // 特殊字符
-  const special = ['`', '~', '!',  '@', '#', '$', '%', '^', '&', '*', '(', ')', '-', '_', '+', '=', '[', '{', ']', '}', '\\', '|', ';', ':', "'", '"', ',', '<', '.', '>', '/', '?']
+  const special = ['`', '~', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '-', '_', '+', '=', '[', '{', ']', '}', '\\', '|', ';', ':', "'", '"', ',', '<', '.', '>', '/', '?']
   //数字
   const numbers = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
   // 密码随机长度
@@ -236,7 +236,7 @@ export function pwdProduce(minLen, maxLen, struc) {
 }
 
 //模糊查询
-export function findarrays(ar, feature, v) {
+export function findarrays (ar, feature, v) {
   var arr = [];
   for (var i = 0; i < ar.length; i++) {
     var atxt = ar[i][feature];
@@ -285,7 +285,7 @@ export function findarrays(ar, feature, v) {
 }
 
 // 表单输入长度验证
-function getRealLength(string) {
+function getRealLength (string) {
   let realLength = 0,
     len = string.length,
     charCode = -1
@@ -300,7 +300,7 @@ function getRealLength(string) {
   return realLength
 }
 
-export function lengthValidator(rule, value, callback) {
+export function lengthValidator (rule, value, callback) {
   value = value ?? ''
   const realLength = getRealLength(value)
   if (realLength === 0) {
@@ -316,8 +316,21 @@ export function lengthValidator(rule, value, callback) {
   }
 }
 
+// 表单大写字母验证
+export function checkDx (rule, value, callback) {
+  value = value ?? ''
+  const realLength = getRealLength(value)
+  if (realLength === 0) {
+    callback()
+  } else if (!(/^[A-Z]*$/).test(value)) {
+    callback(new Error('请输入大写字母'));
+  } else {
+    callback()
+  }
+}
+
 // 表单正整数验证
-export function positiveIntegerValidator(rule, value, callback) {
+export function positiveIntegerValidator (rule, value, callback) {
   const min = rule.min ?? 1
   const max = rule.max ?? 2147483647
   value = value ?? ''

+ 14 - 6
src/views/organizationManagement/components/organizationAdd.vue

@@ -30,7 +30,7 @@
           <el-form-item prop="desc" label="描述">
             <el-input style="width: 835px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
           </el-form-item>
-          <div class="top24">
+          <div class="top24 codeMores">
             <el-form-item class="oneCode" prop="oneCode" label="1级编码">
               <el-input placeholder="请输入编码" v-model.trim="form.oneCode"></el-input>
             </el-form-item>
@@ -46,6 +46,9 @@
             <el-form-item prop="fiveCode" label="5级编码">
               <el-input placeholder="请输入编码" v-model.trim="form.fiveCode"></el-input>
             </el-form-item>
+            <el-form-item prop="bmCode" label="编码类型">
+              <el-input placeholder="请输入编码类型" v-model.trim="form.bmCode"></el-input>
+            </el-form-item>
           </div>
         </el-form>
       </div>
@@ -69,7 +72,7 @@ import roleData from "../minixs/roleData";
 import { mapGetters } from "vuex";
 import { RoleAuths } from "@/api/apiAuthority";
 import { newOrgan } from "@/api/postInterface";
-import { lengthValidator } from '@/utils/validate'
+import { lengthValidator, checkDx } from '@/utils/validate'
 export default {
   name: "AuthorityPower",
   mixins: [treeData, roleData],
@@ -93,7 +96,8 @@ export default {
         twoCode: "",
         threeCode: "",
         fourCode: "",
-        fiveCode: ""
+        fiveCode: "",
+        bmCode: ""
       },
       title: "角色",
       rules: {
@@ -102,7 +106,7 @@ export default {
           { required: true, message: "请输入组织名称", trigger: "blur" },
           { validator: lengthValidator, max: 128, message: '长度在 1 到 128 个字符', trigger: ['change', 'blur'] }
         ],
-        id: [{ required: true, message: "请输入标识符", trigger: "blur" }],
+        id: [{ required: true, message: "请输入标识符", trigger: ['change', 'blur'] }],
         desc: [{ validator: lengthValidator, max: 256, message: '长度在 1 到 256 个字符', trigger: ['change', 'blur'] }],
         oneCode: [
           { required: true, message: "请输入组织名称", trigger: "blur" },
@@ -111,6 +115,10 @@ export default {
         threeCode: [{ validator: lengthValidator, max: 8, message: '长度在 1 到 8 个字符', trigger: ['change', 'blur'] }],
         fourCode: [{ validator: lengthValidator, max: 2, message: '长度在 1 到 2 个字符', trigger: ['change', 'blur'] }],
         fiveCode: [{ validator: lengthValidator, max: 2, message: '长度在 1 到 2 个字符', trigger: ['change', 'blur'] }],
+        bmCode: [
+          { validator: lengthValidator, max: 1, message: '长度在 1 个字符', trigger: ['change', 'blur'] },
+          { validator: checkDx, trigger: ['change', 'blur'] }
+        ],
       },
       defaultProps: {
         children: "children",
@@ -257,7 +265,8 @@ export default {
           L2: this.form.twoCode,
           L3: this.form.threeCode,
           L4: this.form.fourCode,
-          L5: this.form.fiveCode
+          L5: this.form.fiveCode,
+          Type: this.form.bmCode
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -302,7 +311,6 @@ export default {
     ::v-deep .form {
       .el-form-item {
         margin-bottom: 0;
-        margin-right: 40px;
       }
       .el-input__inner {
         height: 32px;

+ 15 - 5
src/views/organizationManagement/components/organizationEdit.vue

@@ -46,6 +46,9 @@
             <el-form-item prop="fiveCode" label="5级编码">
               <el-input placeholder="请输入编码" v-model.trim="form.fiveCode"></el-input>
             </el-form-item>
+            <el-form-item prop="bmCode" label="编码类型">
+              <el-input placeholder="请输入编码类型" v-model.trim="form.bmCode"></el-input>
+            </el-form-item>
           </div>
         </el-form>
       </div>
@@ -69,7 +72,7 @@ import roleData from "../minixs/roleData";
 import { mapGetters } from "vuex";
 import { RoleAuths } from "@/api/apiAuthority";
 import { newOrganmod, newOrganall } from "@/api/postInterface";
-import { lengthValidator } from '@/utils/validate'
+import { lengthValidator, checkDx } from '@/utils/validate'
 export default {
   name: "AuthorityPower",
   mixins: [treeData, roleData],
@@ -93,7 +96,8 @@ export default {
         twoCode: "",
         threeCode: "",
         fourCode: "",
-        fiveCode: ""
+        fiveCode: "",
+        bmCode: ""
       },
       title: "角色",
       rules: {
@@ -111,6 +115,10 @@ export default {
         threeCode: [{ validator: lengthValidator, max: 8, message: '长度在 1 到 8 个字符', trigger: ['change', 'blur'] }],
         fourCode: [{ validator: lengthValidator, max: 2, message: '长度在 1 到 2 个字符', trigger: ['change', 'blur'] }],
         fiveCode: [{ validator: lengthValidator, max: 2, message: '长度在 1 到 2 个字符', trigger: ['change', 'blur'] }],
+        bmCode: [
+          { validator: lengthValidator, max: 1, message: '长度在 1 个字符', trigger: ['change', 'blur'] },
+          { validator: checkDx, trigger: ['change', 'blur'] }
+        ],
       },
       defaultProps: {
         children: "children",
@@ -265,7 +273,8 @@ export default {
             L2,
             L3,
             L4,
-            L5
+            L5,
+            Type
           } = res.returnData;
           this.form.name = OrganName;
           this.form.id = Number(OrganType);
@@ -275,6 +284,7 @@ export default {
           this.form.threeCode = L3;
           this.form.fourCode = L4;
           this.form.fiveCode = L5;
+          this.form.bmCode = Type;
           this.Status = Status;
           if (AuthList && AuthList.length) {
             AuthList.forEach((item) => {
@@ -374,7 +384,8 @@ export default {
           L2: this.form.twoCode,
           L3: this.form.threeCode,
           L4: this.form.fourCode,
-          L5: this.form.fiveCode
+          L5: this.form.fiveCode,
+          Type: this.form.bmCode
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -419,7 +430,6 @@ export default {
     ::v-deep .form {
       .el-form-item {
         margin-bottom: 0;
-        margin-right: 40px;
       }
       .el-input__inner {
         height: 32px;