Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/api/postInterface.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 //岗位列表查询
-export function postList(params) {
+export function postList (params) {
   return request({
     url: '/api/fs4a/GetJobList/v1',
     method: 'post',
@@ -10,7 +10,7 @@ export function postList(params) {
 }
 
 //组织树查询
-export function tissueTreeList(params) {
+export function tissueTreeList (params) {
   return request({
     url: '/api/fs4a/GetOrganTree/v1',
     method: 'post',
@@ -19,7 +19,7 @@ export function tissueTreeList(params) {
 }
 
 //新增组织
-export function newOrgan(params) {
+export function newOrgan (params) {
   return request({
     url: '/api/fs4a/SaveOrgan/v1',
     method: 'post',
@@ -30,7 +30,7 @@ export function newOrgan(params) {
 }
 
 //编辑组织
-export function newOrganmod(params) {
+export function newOrganmod (params) {
   return request({
     url: '/api/fs4a/EditOrgan/v1',
     method: 'post',
@@ -41,7 +41,7 @@ export function newOrganmod(params) {
 }
 
 //组织删除
-export function organele(params) {
+export function organele (params) {
   return request({
     url: '/api/fs4a/DeleteOrgan/v1',
     method: 'post',
@@ -52,7 +52,7 @@ export function organele(params) {
 }
 
 //组织树状态
-export function tissueTreeStart(params) {
+export function tissueTreeStart (params) {
   return request({
     url: '/api/fs4a/ChangeOrganStatus/v1',
     method: 'post',
@@ -63,7 +63,7 @@ export function tissueTreeStart(params) {
 }
 
 //组织详情
-export function newOrganall(params) {
+export function newOrganall (params) {
   return request({
     url: '/api/fs4a/GetOrganDetails/v1',
     method: 'post',
@@ -72,7 +72,7 @@ export function newOrganall(params) {
 }
 
 //职员查询
-export function staffList(params) {
+export function staffList (params) {
   return request({
     url: '/api/fs4a/GetOfficerList/v1',
     method: 'post',
@@ -81,7 +81,7 @@ export function staffList(params) {
 }
 
 //新增职员
-export function newstaff(params) {
+export function newstaff (params) {
   return request({
     url: '/api/fs4a/SaveOfficer/v1',
     method: 'post',
@@ -92,7 +92,7 @@ export function newstaff(params) {
 }
 
 //编辑职员
-export function newstaffmod(params) {
+export function newstaffmod (params) {
   return request({
     url: '/api/fs4a/EditOfficer/v1',
     method: 'post',
@@ -103,7 +103,7 @@ export function newstaffmod(params) {
 }
 
 //删除职员
-export function staffListele(params) {
+export function staffListele (params) {
   return request({
     url: '/api/fs4a/DeleteOfficer/v1',
     method: 'post',
@@ -114,7 +114,7 @@ export function staffListele(params) {
 }
 
 //职员状态
-export function staffStart(params) {
+export function staffStart (params) {
   return request({
     url: '/api/fs4a/ChangeOfficerStatus/v1',
     method: 'post',
@@ -125,7 +125,7 @@ export function staffStart(params) {
 }
 
 //职员详情
-export function Staffdetails(params) {
+export function Staffdetails (params) {
   return request({
     url: '/api/fs4a/GetOfficerDetails/v1',
     method: 'post',
@@ -134,7 +134,7 @@ export function Staffdetails(params) {
 }
 
 //根据组织获取权限
-export function organizationUptree(params) {
+export function organizationUptree (params) {
   return request({
     url: '/api/fs4a/GetAuthTreeByOrgan/v1',
     method: 'post',
@@ -142,7 +142,7 @@ export function organizationUptree(params) {
   })
 }
 //根据岗位获取权限
-export function postUptree(params) {
+export function postUptree (params) {
   return request({
     url: '/api/fs4a/GetAuthTreeByJob/v1',
     method: 'post',
@@ -151,7 +151,7 @@ export function postUptree(params) {
 }
 
 //岗位详情
-export function jbdetails(params) {
+export function jbdetails (params) {
   return request({
     url: '/api/fs4a/GetJobDetails/v1',
     method: 'post',
@@ -160,7 +160,7 @@ export function jbdetails(params) {
 }
 
 //根据岗位获取角色
-export function jbdetpop(params) {
+export function jbdetpop (params) {
   return request({
     url: '/api/fs4a/GetRoleByJob/v1',
     method: 'post',
@@ -169,7 +169,7 @@ export function jbdetpop(params) {
 }
 
 //组织获取角色
-export function organpop(params) {
+export function organpop (params) {
   return request({
     url: '/api/fs4a/GetRoleByOrgan/v1',
     method: 'post',
@@ -178,10 +178,19 @@ export function organpop(params) {
 }
 
 //根据组织查询岗位列表
-export function organgitpost(params) {
+export function organgitpost (params) {
   return request({
     url: '/api/fs4a/GetJobListByOrgan/v1',
     method: 'post',
     data: params
   })
 }
+
+//获取下发系统信息
+export function sendSystem (params) {
+  return request({
+    url: '/api/fs4a/getSendSystem/v1',
+    method: 'post',
+    data: params
+  })
+}

src/views/authorityManagement/components/authorityRoleAdd.vue

@@ -22,9 +22,19 @@
             <el-input placeholder="请输入角色名称" v-model.trim="form.name"></el-input>
           </el-form-item>
           <el-form-item prop="desc" label="描述">
-            <el-input style="width: 640px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
+            <el-input style="width: 1270px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
           </el-form-item>
         </el-form>
+        <div class="orgXf flex-wrap">
+          <div class="orgXf_title">选择下发应用</div>
+          <div class="orgXf_content">
+            <el-checkbox-group v-model="checkList">
+              <el-col v-for="(item,index) in checkArr" :key="index" class="orgXf_content_list" :span="3">
+                <el-checkbox :label="item.appId">{{item.appName}}</el-checkbox>
+              </el-col>
+            </el-checkbox-group>
+          </div>
+        </div>
       </div>
     </div>
     <div class="power-content flex-wrap">
@@ -48,6 +58,7 @@ import Rulesofcompetency from "@/components/rulesofcompetency";
 import Permissiontree from "@/components/permissiontree";
 import Rolelist from "@/components/rolelist";
 import roleData from "../minixs/roleData";
+import capData from "../../organizationManagement/minixs/roleData";
 import { SaveRole, RoleAuths } from "@/api/apiAuthority";
 import { checkPermission } from '@/utils/add-is-class';
 
@@ -56,7 +67,7 @@ import { lengthValidator } from '@/utils/validate'
 export default {
   name: "AuthorityRoleAdd",
   components: { Permissionlist, Rulesofcompetency, Permissiontree, Rolelist },
-  mixins: [roleData],
+  mixins: [roleData, capData],
   data () {
     return {
       radio: 1,
@@ -105,6 +116,9 @@ export default {
       return le;
     }
   },
+  created () {
+    this.getSendSystem();
+  },
   mounted () {
     this.roleType = 'onlyRole';
   },
@@ -184,6 +198,7 @@ export default {
           DefRoleList: this.checkedBoxs,
           AuthList: datas,
           RoleStatus: this.radio,
+          Apps: this.checkList
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -202,4 +217,19 @@ export default {
 
 <style lang="scss" scoped>
 @import "../css/role.scss";
+.orgXf {
+  margin-top: 20px;
+  &_title {
+    margin-right: 40px;
+    font-size: 14px;
+    color: #606266;
+    font-weight: 600;
+  }
+  &_content {
+    flex: 1;
+    &_list {
+      margin-bottom: 20px;
+    }
+  }
+}
 </style>

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -30,9 +30,19 @@
             <el-input placeholder="请输入角色名称" v-model.trim="form.name"></el-input>
           </el-form-item>
           <el-form-item prop="desc" label="描述">
-            <el-input style="width: 640px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
+            <el-input style="width: 1270px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
           </el-form-item>
         </el-form>
+        <div class="orgXf flex-wrap">
+          <div class="orgXf_title">选择下发应用</div>
+          <div class="orgXf_content">
+            <el-checkbox-group v-model="checkList">
+              <el-col v-for="(item,index) in checkArr" :key="index" class="orgXf_content_list" :span="3">
+                <el-checkbox :label="item.appId">{{item.appName}}</el-checkbox>
+              </el-col>
+            </el-checkbox-group>
+          </div>
+        </div>
       </div>
     </div>
     <div class="power-content flex-wrap">
@@ -58,12 +68,13 @@ import Permissiontree from "@/components/permissiontree";
 import Rolelist from "@/components/rolelist";
 import { RoleDetails, EditRole, RoleAuths } from "@/api/apiAuthority";
 import roleData from "../minixs/roleData";
+import capData from "../../organizationManagement/minixs/roleData";
 import { checkPermission } from '@/utils/add-is-class';
 import { lengthValidator } from '@/utils/validate'
 export default {
   name: "AuthorityRoleEdit",
   components: { Permissionlist, Rulesofcompetency, Permissiontree, Rolelist },
-  mixins: [roleData],
+  mixins: [roleData, capData],
   data () {
     return {
       radio: 1,
@@ -99,7 +110,7 @@ export default {
       authList: [],
       authId: [],
       type: null, //参数类型
-      roleType: ''
+      roleType: '',
     };
   },
   created () {
@@ -107,6 +118,7 @@ export default {
     const { RoleId, Status } = this.$route.query;
     this.roleId = RoleId;
     this.Status = Status;
+    this.getSendSystem();
     this.roleDetails(RoleId);
   },
   mounted () {
@@ -127,11 +139,12 @@ export default {
           RoleId: id,
         });
         if (res.code === 0) {
-          const { RoleName, RoleDesc, AuthList, RoleStatus, DefRoleList, RelationUsers } =
+          const { RoleName, RoleDesc, AuthList, RoleStatus, DefRoleList, RelationUsers, Apps } =
             res.returnData;
           this.form.name = RoleName;
           this.form.desc = RoleDesc;
           this.radio = RoleStatus;
+          this.checkList = Apps ?? [];
           if (AuthList && AuthList.length) {
             AuthList.forEach((item) => {
               this.authId.push(item.AuthId);
@@ -232,7 +245,8 @@ export default {
           AuthList: datas,
           RoleStatus: this.radio,
           RoleId: this.roleId,
-          RelationUsers: this.RelationUsers
+          RelationUsers: this.RelationUsers,
+          Apps: this.checkList
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -251,4 +265,19 @@ export default {
 
 <style lang="scss" scoped>
 @import "../css/role.scss";
+.orgXf {
+  margin-top: 20px;
+  &_title {
+    margin-right: 40px;
+    font-size: 14px;
+    color: #606266;
+    font-weight: 600;
+  }
+  &_content {
+    flex: 1;
+    &_list {
+      margin-bottom: 20px;
+    }
+  }
+}
 </style>

src/views/authorityManagement/css/role.scss

@@ -7,7 +7,7 @@
   background: #ffffff;
   box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
   border-radius: 16px;
-  padding: 32px 32px 40px 32px;
+  padding: 32px 32px 20px 32px;
   .title {
     font-size: 24px;
     font-family: Microsoft YaHei;

src/views/organizationManagement/components/organizationAdd.vue

@@ -18,39 +18,81 @@
       </div>
       <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="请输入组织名称" v-model.trim="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="desc" label="描述">
-            <el-input style="width: 1050px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
-          </el-form-item>
-          <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>
-            <el-form-item prop="twoCode" class="twoCode" label="2级编码">
-              <el-input placeholder="请输入编码" style="width: 202px" v-model.trim="form.twoCode"></el-input>
-            </el-form-item>
-            <el-form-item prop="threeCode" label="3级编码">
-              <el-input placeholder="请输入编码" v-model.trim="form.threeCode"></el-input>
-            </el-form-item>
-            <el-form-item prop="fourCode" label="4级编码">
-              <el-input placeholder="请输入编码" v-model.trim="form.fourCode"></el-input>
-            </el-form-item>
-            <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-autocomplete class="inline-input" v-model="form.bmCode" :fetch-suggestions="querySearch" placeholder="请输入内容"></el-autocomplete>
-            </el-form-item>
-          </div>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item prop="name" label="组织名称">
+                <el-input placeholder="请输入组织名称" v-model.trim="form.name"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <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-col>
+            <el-col :span="12">
+              <el-form-item class="mr20" prop="desc" label="描述">
+                <el-input style="width:735px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="capTr" :gutter="20">
+            <el-col :span="6">
+              <el-form-item prop="bmCode" label="编码类型">
+                <el-autocomplete class="inline-input" v-model="form.bmCode" :fetch-suggestions="querySearch" placeholder="请输入内容"></el-autocomplete>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="oneCode" label="1级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.oneCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="twoCode" class="twoCode" label="2级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.twoCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="threeCode" label="3级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.threeCode"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="capTr" :gutter="20">
+            <el-col :span="6">
+              <el-form-item class="mr15" prop="fourCode" label="4级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.fourCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="mr10" prop="fiveCode" label="5级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.fiveCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="sixCode" label="6级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.sixCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="sevenCode" label="7级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.sevenCode"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
+        <div class="orgXf flex-wrap">
+          <div class="orgXf_title">选择下发应用</div>
+          <div class="orgXf_content">
+            <el-checkbox-group v-model="checkList">
+              <el-col v-for="(item,index) in checkArr" :key="index" class="orgXf_content_list" :span="3">
+                <el-checkbox :label="item.appId">{{item.appName}}</el-checkbox>
+              </el-col>
+            </el-checkbox-group>
+          </div>
+        </div>
       </div>
     </div>
     <div class="power-content flex-wrap">
@@ -97,7 +139,9 @@ export default {
         threeCode: "",
         fourCode: "",
         fiveCode: "",
-        bmCode: ""
+        bmCode: "",
+        sixCode: "",
+        sevenCode: ""
       },
       title: "角色",
       rules: {
@@ -110,12 +154,15 @@ export default {
         desc: [{ validator: lengthValidator, max: 256, message: '长度在 1 到 256 个字符', trigger: ['change', 'blur'] }],
         oneCode: [
           { required: true, message: "请输入组织名称", trigger: "blur" },
-          { validator: lengthValidator, max: 2, message: '长度在 1 到 2 个字符', trigger: ['change', 'blur'] }],
-        twoCode: [{ validator: lengthValidator, max: 3, message: '长度在 1 到 3 个字符', trigger: ['change', 'blur'] }],
-        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'] }],
+          { validator: lengthValidator, min: 2, max: 2, message: '长度在 2 个字符', trigger: ['change', 'blur'] }],
+        twoCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        threeCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        fourCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        fiveCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        sixCode: [{ validator: lengthValidator, min: 2, max: 2, message: '长度在 2 个字符', trigger: ['change', 'blur'] }],
+        sevenCode: [{ validator: lengthValidator, min: 2, max: 2, message: '长度在 2 个字符', trigger: ['change', 'blur'] }],
         bmCode: [
+          { required: true, message: "请输入编码类型", trigger: ['change', 'blur'] },
           { validator: lengthValidator, max: 1, message: '长度在 1 个字符', trigger: ['change', 'blur'] },
           { validator: checkDx, trigger: ['change', 'blur'] }
         ],
@@ -203,6 +250,7 @@ export default {
     this.AppId = OrganId;
     this.openRole = OpenRole;
     this.OpenGroup = OpenGroup;
+    this.getSendSystem();
     this.getOrganTree();
   },
   methods: {
@@ -304,7 +352,10 @@ export default {
           L3: this.form.threeCode,
           L4: this.form.fourCode,
           L5: this.form.fiveCode,
-          Type: this.form.bmCode
+          L6: this.form.sixCode,
+          L7: this.form.sevenCode,
+          Type: this.form.bmCode,
+          Apps: this.checkList
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -341,7 +392,7 @@ export default {
   background: #ffffff;
   box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
   border-radius: 16px;
-  padding: 32px 32px 40px 32px;
+  padding: 32px 32px 20px 32px;
   .title {
     font-size: 24px;
     font-family: Microsoft YaHei;
@@ -361,10 +412,22 @@ export default {
       .el-form-item {
         margin-bottom: 0;
       }
+      .capTr {
+        margin-top: 20px;
+      }
+      .mr15 {
+        margin-left: 15px;
+      }
+      .mr10 {
+        margin-left: 10px;
+      }
+      .mr20 {
+        margin-left: 20px;
+      }
       .el-input__inner {
         height: 32px;
         line-height: 32px;
-        min-width: 184px;
+        min-width: 300px;
       }
       .content {
         .el-form-item__content {
@@ -395,4 +458,19 @@ export default {
     height: 704px;
   }
 }
+.orgXf {
+  margin-top: 20px;
+  &_title {
+    margin-right: 40px;
+    font-size: 14px;
+    color: #606266;
+    font-weight: 600;
+  }
+  &_content {
+    flex: 1;
+    &_list {
+      margin-bottom: 20px;
+    }
+  }
+}
 </style>

src/views/organizationManagement/components/organizationEdit.vue

@@ -11,46 +11,88 @@
     <!--新增组织-->
     <div class="addApp-form">
       <div class="addApp-form-title flex">
-        <div class="title">编辑组织</div>
-        <div v-is="['organ_btn_edit']" class="btn">
+        <div class="title">新增组织</div>
+        <div v-is="['organ_btn_save']" class="btn">
           <el-button @click="saveBtn('form')" type="primary">保存</el-button>
         </div>
       </div>
       <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="请输入组织名称" v-model.trim="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="desc" label="描述">
-            <el-input style="width: 1050px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
-          </el-form-item>
-          <div class="top24">
-            <el-form-item class="oneCode" prop="oneCode" label="1级编码">
-              <el-input placeholder="请输入编码" v-model.trim="form.oneCode"></el-input>
-            </el-form-item>
-            <el-form-item prop="twoCode" class="twoCode" label="2级编码">
-              <el-input placeholder="请输入编码" style="width: 202px" v-model.trim="form.twoCode"></el-input>
-            </el-form-item>
-            <el-form-item prop="threeCode" label="3级编码">
-              <el-input placeholder="请输入编码" v-model.trim="form.threeCode"></el-input>
-            </el-form-item>
-            <el-form-item prop="fourCode" label="4级编码">
-              <el-input placeholder="请输入编码" v-model.trim="form.fourCode"></el-input>
-            </el-form-item>
-            <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-autocomplete class="inline-input" v-model="form.bmCode" :fetch-suggestions="querySearch" placeholder="请输入内容"></el-autocomplete>
-            </el-form-item>
-          </div>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item prop="name" label="组织名称">
+                <el-input placeholder="请输入组织名称" v-model.trim="form.name"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <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-col>
+            <el-col :span="12">
+              <el-form-item class="mr20" prop="desc" label="描述">
+                <el-input style="width:735px" placeholder="请输入描述" v-model.trim="form.desc"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="capTr" :gutter="20">
+            <el-col :span="6">
+              <el-form-item prop="bmCode" label="编码类型">
+                <el-autocomplete class="inline-input" v-model="form.bmCode" :fetch-suggestions="querySearch" placeholder="请输入内容"></el-autocomplete>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="oneCode" label="1级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.oneCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="twoCode" class="twoCode" label="2级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.twoCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="threeCode" label="3级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.threeCode"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="capTr" :gutter="20">
+            <el-col :span="6">
+              <el-form-item class="mr15" prop="fourCode" label="4级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.fourCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="mr10" prop="fiveCode" label="5级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.fiveCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="sixCode" label="6级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.sixCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="sevenCode" label="7级编码">
+                <el-input placeholder="请输入编码" v-model.trim="form.sevenCode"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
+        <div class="orgXf flex-wrap">
+          <div class="orgXf_title">选择下发应用</div>
+          <div class="orgXf_content">
+            <el-checkbox-group v-model="checkList">
+              <el-col v-for="(item,index) in checkArr" :key="index" class="orgXf_content_list" :span="3">
+                <el-checkbox :label="item.appId">{{item.appName}}</el-checkbox>
+              </el-col>
+            </el-checkbox-group>
+          </div>
+        </div>
       </div>
     </div>
     <div class="power-content flex-wrap">
@@ -97,7 +139,9 @@ export default {
         threeCode: "",
         fourCode: "",
         fiveCode: "",
-        bmCode: ""
+        bmCode: "",
+        sixCode: "",
+        sevenCode: ""
       },
       title: "角色",
       rules: {
@@ -110,12 +154,15 @@ export default {
         desc: [{ validator: lengthValidator, max: 256, message: '长度在 1 到 256 个字符', trigger: ['change', 'blur'] }],
         oneCode: [
           { required: true, message: "请输入组织名称", trigger: "blur" },
-          { validator: lengthValidator, max: 2, message: '长度在 1 到 2 个字符', trigger: ['change', 'blur'] }],
-        twoCode: [{ validator: lengthValidator, max: 3, message: '长度在 1 到 3 个字符', trigger: ['change', 'blur'] }],
-        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'] }],
+          { validator: lengthValidator, min: 2, max: 2, message: '长度在 2 个字符', trigger: ['change', 'blur'] }],
+        twoCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        threeCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        fourCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        fiveCode: [{ validator: lengthValidator, min: 4, max: 4, message: '长度在 4 个字符', trigger: ['change', 'blur'] }],
+        sixCode: [{ validator: lengthValidator, min: 2, max: 2, message: '长度在 2 个字符', trigger: ['change', 'blur'] }],
+        sevenCode: [{ validator: lengthValidator, min: 2, max: 2, message: '长度在 2 个字符', trigger: ['change', 'blur'] }],
         bmCode: [
+          { required: true, message: "请输入编码类型", trigger: ['change', 'blur'] },
           { validator: lengthValidator, max: 1, message: '长度在 1 个字符', trigger: ['change', 'blur'] },
           { validator: checkDx, trigger: ['change', 'blur'] }
         ],
@@ -221,6 +268,7 @@ export default {
     this.AppId = OrganId;
     this.openRole = OpenRole;
     this.OpenGroup = OpenGroup;
+    this.getSendSystem();
     this.getOrganTree();
     this.getOrganDetails(this.AppId);
   },
@@ -312,6 +360,9 @@ export default {
             L3,
             L4,
             L5,
+            L6,
+            L7,
+            apps,
             Type
           } = res.returnData;
           this.form.name = OrganName;
@@ -322,7 +373,10 @@ export default {
           this.form.threeCode = L3;
           this.form.fourCode = L4;
           this.form.fiveCode = L5;
+          this.form.sixCode = L6;
+          this.form.sevenCode = L7;
           this.form.bmCode = Type;
+          this.checkList = Array.from(new Set(apps));
           this.Status = Status;
           if (AuthList && AuthList.length) {
             AuthList.forEach((item) => {
@@ -423,7 +477,10 @@ export default {
           L3: this.form.threeCode,
           L4: this.form.fourCode,
           L5: this.form.fiveCode,
-          Type: this.form.bmCode
+          L6: this.form.sixCode,
+          L7: this.form.sevenCode,
+          Type: this.form.bmCode,
+          Apps: this.checkList
         });
         if (res.code === 0) {
           this.$message.success(res.message);
@@ -480,10 +537,22 @@ export default {
       .el-form-item {
         margin-bottom: 0;
       }
+      .capTr {
+        margin-top: 20px;
+      }
+      .mr15 {
+        margin-left: 15px;
+      }
+      .mr10 {
+        margin-left: 10px;
+      }
+      .mr20 {
+        margin-left: 20px;
+      }
       .el-input__inner {
         height: 32px;
         line-height: 32px;
-        min-width: 184px;
+        min-width: 300px;
       }
       .content {
         .el-form-item__content {
@@ -514,4 +583,19 @@ export default {
     height: 704px;
   }
 }
+.orgXf {
+  margin-top: 20px;
+  &_title {
+    margin-right: 40px;
+    font-size: 14px;
+    color: #606266;
+    font-weight: 600;
+  }
+  &_content {
+    flex: 1;
+    &_list {
+      margin-bottom: 20px;
+    }
+  }
+}
 </style>

src/views/organizationManagement/minixs/roleData.js

@@ -10,10 +10,13 @@ import { organpop } from '@/api/postInterface'
 import { GetGroupByOrgan, GroupAuths } from '@/api/authGroupApi'
 import { GetGroupTree } from '@/api/AccountGroup'
 import { QueryRole } from '@/api/apiAuthority'
+import { sendSystem } from "@/api/postInterface"
 export default {
   data () {
     return {
-      arrs: []
+      arrs: [],
+      checkArr: [],
+      checkList: [],
     }
   },
   methods: {
@@ -122,5 +125,17 @@ export default {
         console.log('出错了', error)
       }
     },
+    //获取下发系统信息
+    async getSendSystem () {
+      const { code, message, returnData } = await sendSystem({
+        userId: sessionStorage.getItem('User_Id'),
+        userType: sessionStorage.getItem('UserType')
+      })
+      if (code == 0) {
+        this.checkArr = returnData
+      } else {
+        this.$message.error(message)
+      }
+    },
   }
 }