冲突

src/components/organization/index.vue

@@ -111,7 +111,6 @@ export default {
   watch: {
     checkedKeys: {
       handler (val) {
-        console.log(val)
         this.checkedList = val;
         this.$refs.tree.setCheckedKeys(val)
         this.getExpandedKeysStep.splice(0, 1, true)

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -190,10 +190,10 @@ export default {
         // 表单验证
         name: [
           { required: true, message: `请输入${this.accountGroupType}名称`, trigger: 'blur' },
-          { validator: lengthValidator, max: 32, message: '长度在 1到 32 个字符', trigger: ['change', 'blur'] }
+          { validator: lengthValidator, max: 32, message: '最多输入32个字符', trigger: ['change', 'blur'] }
         ],
         desc: [
-          { validator: lengthValidator, max: 200, message: '长度在 1到 200 个字符', trigger: ['change', 'blur'] }
+          { validator: lengthValidator, max: 200, message: '最多输入200个字符', trigger: ['change', 'blur'] }
         ]
       },
       defaultProps: {

src/views/authorityManagement/components/authorityRoleAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 16:31:31
- * @LastEditTime: 2022-03-14 18:23:01
+ * @LastEditTime: 2022-03-15 09:45:54
  * @LastEditors: your name
  * @Description: 新增/编辑角色
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRoleStatus.vue
@@ -70,7 +70,7 @@ export default {
         //表单验证
         name: [
           { required: true, message: "请输入角色名称", trigger: "blur" },
-          { validator: lengthValidator, max: 32, message: '长度在 1到 32 个字符', trigger: ['change', 'blur'] }
+          { validator: lengthValidator, max: 32, message: '最多输入32个字符', trigger: ['change', 'blur'] }
         ],
         app: [
           { required: true, message: "请输入描述", trigger: "blur" },

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 16:31:31
- * @LastEditTime: 2022-03-14 18:22:53
+ * @LastEditTime: 2022-03-15 09:45:31
  * @LastEditors: your name
  * @Description: 新增/编辑角色
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRoleStatus.vue
@@ -77,7 +77,7 @@ export default {
         //表单验证
         name: [
           { required: true, message: "请输入角色名称", trigger: "blur" },
-          { validator: lengthValidator, max: 32, message: '长度在 1到 32 个字符', trigger: ['change', 'blur'] }
+          { validator: lengthValidator, max: 32, message: '最多输入32个字符', trigger: ['change', 'blur'] }
         ],
         app: [
           { required: true, message: "请输入描述", trigger: "blur" },

src/views/organizationManagement/components/organizationAdd.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-02-28 17:08:57
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-03-15 09:32:44
+ * @LastEditors: your name
  * @Description:新增组织
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
 -->
@@ -19,7 +19,7 @@
       <div class="addApp-form-content dialog-public-background">
         <el-form :inline="true" ref="form" :rules="rules" class="form" :model="form">
           <el-form-item prop="name" label="组织名称">
-            <el-input placeholder="请输入组织名称" maxlength="32" v-model="form.name"></el-input>
+            <el-input placeholder="请输入组织名称" v-model="form.name"></el-input>
           </el-form-item>
           <el-form-item prop="id" label="组织类型">
             <el-select v-model="form.id" placeholder="请选择">
@@ -27,24 +27,24 @@
               <el-option label="集团外" :value="0"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="描述">
-            <el-input style="width: 835px" maxlength="200" placeholder="请输入描述" v-model="form.app"></el-input>
+          <el-form-item prop="app" label="描述">
+            <el-input style="width: 835px" placeholder="请输入描述" v-model="form.app"></el-input>
           </el-form-item>
           <div class="top24">
-            <el-form-item label="1级编码">
-              <el-input placeholder="最多输入2个字符" maxlength="2" v-model="form.oneCode"></el-input>
+            <el-form-item prop="oneCode" label="1级编码">
+              <el-input placeholder="最多输入2个字符" v-model="form.oneCode"></el-input>
             </el-form-item>
-            <el-form-item class="twoCode" label="2级编码">
-              <el-input placeholder="最多输入3个字符" style="width: 202px" maxlength="3" v-model="form.twoCode"></el-input>
+            <el-form-item prop="twoCode" class="twoCode" label="2级编码">
+              <el-input placeholder="最多输入3个字符" style="width: 202px" v-model="form.twoCode"></el-input>
             </el-form-item>
-            <el-form-item label="3级编码">
-              <el-input placeholder="最多输入8个字符" maxlength="8" v-model="form.threeCode"></el-input>
+            <el-form-item prop="threeCode" label="3级编码">
+              <el-input placeholder="最多输入8个字符" v-model="form.threeCode"></el-input>
             </el-form-item>
-            <el-form-item label="4级编码">
-              <el-input placeholder="最多输入2个字符" maxlength="2" v-model="form.fourCode"></el-input>
+            <el-form-item prop="fourCode" label="4级编码">
+              <el-input placeholder="最多输入2个字符" v-model="form.fourCode"></el-input>
             </el-form-item>
-            <el-form-item label="5级编码">
-              <el-input placeholder="最多输入2个字符" maxlength="2" v-model="form.fiveCode"></el-input>
+            <el-form-item prop="fiveCode" label="5级编码">
+              <el-input placeholder="最多输入2个字符" v-model="form.fiveCode"></el-input>
             </el-form-item>
           </div>
         </el-form>
@@ -69,6 +69,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'
 export default {
   name: "AuthorityPower",
   mixins: [treeData, roleData],
@@ -97,8 +98,17 @@ export default {
       title: "角色",
       rules: {
         //表单验证
-        name: [{ required: true, message: "请输入组织名称", trigger: "blur" }],
+        name: [
+          { required: true, message: "请输入组织名称", trigger: "blur" },
+          { validator: lengthValidator, max: 32, message: '最多输入32个字符', trigger: ['change', 'blur'] }
+        ],
         id: [{ required: true, message: "请输入标识符", trigger: "blur" }],
+        app: [{ validator: lengthValidator, max: 200, message: '最多输入200个字符', trigger: ['change', 'blur'] }],
+        oneCode: [{ validator: lengthValidator, max: 2, message: '最多输入2个字符', trigger: ['change', 'blur'] }],
+        twoCode: [{ validator: lengthValidator, max: 3, message: '最多输入3个字符', trigger: ['change', 'blur'] }],
+        threeCode: [{ validator: lengthValidator, max: 8, message: '最多输入8个字符', trigger: ['change', 'blur'] }],
+        fourCode: [{ validator: lengthValidator, max: 2, message: '最多输入2个字符', trigger: ['change', 'blur'] }],
+        fiveCode: [{ validator: lengthValidator, max: 2, message: '最多输入2个字符', trigger: ['change', 'blur'] }],
       },
       defaultProps: {
         children: "children",
@@ -147,10 +157,6 @@ export default {
     this.getOrganTree();
   },
   methods: {
-    //获取选中的树数据
-    getTreeData (arr) {
-      this.checkTrees = arr;
-    },
     //获取指定数据
     decompose (data, id) {
       for (let i = 0; i < data.length; i++) {

src/views/organizationManagement/components/organizationEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-03-14 17:19:19
+ * @LastEditTime: 2022-03-15 09:41:12
  * @LastEditors: your name
  * @Description:新增组织
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -18,37 +18,35 @@
       </div>
       <div class="addApp-form-content dialog-public-background">
         <el-form :inline="true" ref="form" :rules="rules" class="form" :model="form">
-          <el-form :inline="true" ref="form" :rules="rules" class="form" :model="form">
-            <el-form-item prop="name" label="组织名称">
-              <el-input placeholder="请输入组织名称" maxlength="32" v-model="form.name"></el-input>
+          <el-form-item prop="name" label="组织名称">
+            <el-input placeholder="请输入组织名称" v-model="form.name"></el-input>
+          </el-form-item>
+          <el-form-item prop="id" label="组织类型">
+            <el-select v-model="form.id" placeholder="请选择">
+              <el-option label="集团内" :value="1"></el-option>
+              <el-option label="集团外" :value="0"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="app" label="描述">
+            <el-input style="width: 835px" placeholder="请输入描述" v-model="form.app"></el-input>
+          </el-form-item>
+          <div class="top24">
+            <el-form-item prop="oneCode" label="1级编码">
+              <el-input placeholder="最多输入2个字符" v-model="form.oneCode"></el-input>
             </el-form-item>
-            <el-form-item prop="id" label="组织类型">
-              <el-select v-model="form.id" placeholder="请选择">
-                <el-option label="集团内" value="1"></el-option>
-                <el-option label="集团外" value="0"></el-option>
-              </el-select>
+            <el-form-item prop="twoCode" class="twoCode" label="2级编码">
+              <el-input placeholder="最多输入3个字符" style="width: 202px" v-model="form.twoCode"></el-input>
             </el-form-item>
-            <el-form-item label="描述">
-              <el-input style="width: 835px" maxlength="200" placeholder="请输入描述" v-model="form.app"></el-input>
+            <el-form-item prop="threeCode" label="3级编码">
+              <el-input placeholder="最多输入8个字符" v-model="form.threeCode"></el-input>
             </el-form-item>
-            <div class="top24">
-              <el-form-item label="1级编码">
-                <el-input placeholder="最多输入2个字符" maxlength="2" v-model="form.oneCode"></el-input>
-              </el-form-item>
-              <el-form-item class="twoCode" label="2级编码">
-                <el-input placeholder="最多输入3个字符" style="width: 202px" maxlength="3" v-model="form.twoCode"></el-input>
-              </el-form-item>
-              <el-form-item label="3级编码">
-                <el-input placeholder="最多输入8个字符" maxlength="8" v-model="form.threeCode"></el-input>
-              </el-form-item>
-              <el-form-item label="4级编码">
-                <el-input placeholder="最多输入2个字符" maxlength="2" v-model="form.fourCode"></el-input>
-              </el-form-item>
-              <el-form-item label="5级编码">
-                <el-input placeholder="最多输入2个字符" maxlength="2" v-model="form.fiveCode"></el-input>
-              </el-form-item>
-            </div>
-          </el-form>
+            <el-form-item prop="fourCode" label="4级编码">
+              <el-input placeholder="最多输入2个字符" v-model="form.fourCode"></el-input>
+            </el-form-item>
+            <el-form-item prop="fiveCode" label="5级编码">
+              <el-input placeholder="最多输入2个字符" v-model="form.fiveCode"></el-input>
+            </el-form-item>
+          </div>
         </el-form>
       </div>
     </div>
@@ -71,6 +69,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'
 export default {
   name: "AuthorityPower",
   mixins: [treeData, roleData],
@@ -98,9 +97,18 @@ export default {
       },
       title: "角色",
       rules: {
-        //表单验证
-        name: [{ required: true, message: "请输入组织名称", trigger: "blur" }],
+         //表单验证
+        name: [
+          { required: true, message: "请输入组织名称", trigger: "blur" },
+          { validator: lengthValidator, max: 32, message: '最多输入32个字符', trigger: ['change', 'blur'] }
+        ],
         id: [{ required: true, message: "请输入标识符", trigger: "blur" }],
+        app: [{ validator: lengthValidator, max: 200, message: '最多输入200个字符', trigger: ['change', 'blur'] }],
+        oneCode: [{ validator: lengthValidator, max: 2, message: '最多输入2个字符', trigger: ['change', 'blur'] }],
+        twoCode: [{ validator: lengthValidator, max: 3, message: '最多输入3个字符', trigger: ['change', 'blur'] }],
+        threeCode: [{ validator: lengthValidator, max: 8, message: '最多输入8个字符', trigger: ['change', 'blur'] }],
+        fourCode: [{ validator: lengthValidator, max: 2, message: '最多输入2个字符', trigger: ['change', 'blur'] }],
+        fiveCode: [{ validator: lengthValidator, max: 2, message: '最多输入2个字符', trigger: ['change', 'blur'] }],
       },
       defaultProps: {
         children: "children",
@@ -174,6 +182,8 @@ export default {
       if (arr.length === 1) {
         const { OrganId } = arr[0];
         this.OrganUpid = OrganId;
+      } else if (arr.length === 0) {
+        this.OrganUpid = -1
       }
     },
     //获取指定数据
@@ -255,14 +265,14 @@ export default {
             L4,
             L5
           } = res.returnData;
-          this.form.name = OrganName;
-          this.form.id = OrganType;
-          this.form.app = OrganDesc;
-          this.form.oneCode = L1;
-          this.form.twoCode = L2;
-          this.form.threeCode = L3;
-          this.form.fourCode = L4;
-          this.form.fiveCode = L5;
+          this.form.name = OrganName || '';
+          this.form.id = OrganType || '';
+          this.form.app = OrganDesc || '';
+          this.form.oneCode = L1 || '';
+          this.form.twoCode = L2 || '';
+          this.form.threeCode = L3 || '';
+          this.form.fourCode = L4 || '';
+          this.form.fiveCode = L5 || '';
           this.Status = Status;
           if (AuthList && AuthList.length) {
             AuthList.forEach((item) => {