Merge branch 'bug_mk' into feature

src/views/modules/base/organization/organization.vue

@@ -512,7 +512,7 @@
       </el-dialog>
     </div>
     <div v-if="dialogVisiblePeoAgency">
-      <el-dialog title="新增人员ccccc"
+      <el-dialog title="新增人员"
                  :visible.sync="dialogVisiblePeoAgency"
                  width="850"
                 >
@@ -1344,7 +1344,8 @@ export default {
        
       },
       orgDeptOptionProps: {
-                multiple: false,
+                multiple: true,
+                emitPath:true,
                 value: 'agencyId',
                 label: 'agencyName',
                 children: 'subAgencyList',
@@ -2143,9 +2144,9 @@ export default {
         this.peoForm.gender = data.gender;
         this.peoForm.post = data.workType;
         this.peoForm.idCard = data.idCard;
-        this.peoForm.manageOrgIds = data.manageOrgIds?data.manageOrgIds.split(','):[];
+        this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[];
         this.peoForm.orgLevels = data.orgLevels;
-        this.manageOrgIds = data.manageOrgIds;
+        this.manageOrgIds = data.manageOrgIdStr;
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -2180,9 +2181,9 @@ export default {
         this.peoForm.gender = data.gender;
         this.peoForm.idCard = data.idCard;
         this.peoForm.agencyName=data.agencyName;
-        this.peoForm.manageOrgIds = data.manageOrgIds?data.manageOrgIds.split(','):[];
+        this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[];
         this.peoForm.orgLevels = data.orgLevels;
-        this.manageOrgIds = data.manageOrgIds;
+        this.manageOrgIds = data.manageOrgIdStr;
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -2193,6 +2194,8 @@ export default {
         this.peoForm.newRoles = existedRoleArr;
         var paths = this.findParentPath(this.orgOptions[0], data.manageScopes);
         this.peoForm.manageScopes = paths;
+        var paths1 = this.findParentPath(this.orgDeptOptions[0],this.peoForm.manageOrgIds);
+        this.peoForm.manageOrgIds = paths1;
       } else {
         this.$message.error(msg);
       }
@@ -2245,9 +2248,9 @@ export default {
         this.peoForm.gender = data.gender;
         this.peoForm.post = data.workType;
         this.peoForm.idCard = data.idCard;
-        this.peoForm.manageOrgIds = data.manageOrgIds?data.manageOrgIds.split(','):[];
+        this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[];
         this.peoForm.orgLevels = data.orgLevels;
-        this.manageOrgIds = data.manageOrgIds;
+        this.manageOrgIds = data.manageOrgIdStr;
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -3019,9 +3022,11 @@ export default {
    handleChangeAgency(val) {
             this.$nextTick(() => {
                 let obj = this.$refs["agencyIdArray"].getCheckedNodes()
+                let orgIdList = obj.map(item=>item.value)
+                let orgLevelList = obj.map(item=>item.data.level)
                 if (obj) {
-                    this.peoForm.orgLevels =obj[0].pathNodes.map(item=>item.data.level).join(',')
-                    this.manageOrgIds =obj[0].pathNodes.map(item=>item.data.agencyId).join(',')
+                    this.peoForm.orgLevels = orgLevelList.join(',')
+                    this.manageOrgIds = orgIdList.join(',')
                 } else {
                     this.manageOrgIds = ''
                     this.peoForm.orgLevels = ''

src/views/modules/shequzhili/eventHandling/index.vue

@@ -646,7 +646,7 @@ export default {
             }
         },
         async getTableData() {
-            const url = "/governance/icEvent/list";
+            const url = "/governance/icEvent/manageList";
             if (this.eventTypeCheck) {
                 this.formData.secondIdList = this.eventTypeCheck
             }