From 58cf679b3d8bf63bba865d7ca069544a180fdad9 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 26 Jun 2024 15:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=80=9A=E8=AE=AF=E5=BD=95?=
 =?UTF-8?q?=E8=81=8C=E8=B4=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 74 +++++--------------
 1 file changed, 20 insertions(+), 54 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 62c117226..dcbee211b 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -452,7 +452,7 @@
             </el-select>
           </el-form-item>
           <!-- 职责下拉框 -->
-          <el-form-item label="职责"
+          <!-- <el-form-item label="职责"
                         prop="duty">
             <el-select v-model.trim="peoForm.duty"
                        multiple
@@ -464,7 +464,7 @@
                          :disabled="item.disabled">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="角色"
                         prop="newRoles">
@@ -578,7 +578,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="职责"
+        <!-- <el-form-item label="职责"
                       prop="duty">
           <el-select v-model.trim="peoForm.duty"
                      multiple
@@ -590,7 +590,7 @@
                        :disabled="item.disabled">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="角色"
                       prop="newRoles">
           <el-select v-model.trim="peoForm.newRoles"
@@ -668,10 +668,22 @@
                     placeholder="激活时间"
                     :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="职位">
+        <!-- <el-form-item label="职位">
           <el-input v-model.trim="peoForm.duty"
                     placeholder="职位"
                     :disabled="true"></el-input>
+        </el-form-item> -->
+        <el-form-item label="角色"
+                      prop="szsqRoles">
+          <el-select v-model.trim="peoForm.szsqRoles"
+                     multiple
+                     placeholder="请选择"  :disabled="true">
+            <el-option v-for="item in szsqRoles"
+                       :key="item"
+                       :label="item"
+                       :value="item">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="是否禁用">
           <el-input v-model.trim="peoForm.disableFlag"
@@ -1209,7 +1221,6 @@ export default {
         idCard: "",
         gender: "",
         post: "",
-        duty: [],
         orgType: "",
         activeTime: "",
         zuzhi: "",
@@ -1282,8 +1293,6 @@ export default {
         { value: "fulltime", label: "专职" },
         { value: "parttime", label: "兼职" },
       ],
-      // 职责字典
-      dutyList: [],
       // 修改操作是否展示
       modifyPeo: false,
 
@@ -1317,7 +1326,6 @@ export default {
         idCard: [{ required: true, message: "证件号必填", trigger: "blur" }],
         gender: [{ required: true, message: "性别必填", trigger: "blur" }],
         post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
-        duty: [{ required: true, message: "职责必填", trigger: "blur" }],
         newRoles: [{ required: true, message: "角色必填", trigger: "blur" }],
       },
       rulesAddAgency:{
@@ -1356,7 +1364,6 @@ export default {
     this.getDepartmentList();
     this.getGridList();
     this.getAgencyStaffListData();
-    this.getDutyList();
     this.getRoleList();
     this.getOrgTreeList()
     // this.getNavigation()
@@ -1460,19 +1467,6 @@ export default {
       this.transferForm.orgType = item.type;
     },
     /** 查询系统工作人员角色（职责） */
-    async getDutyList () {
-      const url = "/gov/org/staff/rolelist";
-      let params = {
-        agencyId: this.currentAgencyId,
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.dutyList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    /** 查询系统工作人员角色（职责） */
     async getRoleList () {
       this.tableLoading = true;
 
@@ -1698,7 +1692,6 @@ export default {
         idCard: this.peoForm.idCard,
         gender: this.peoForm.gender,
         workType: this.peoForm.post,
-        roles: this.peoForm.duty,
         newRoles: this.peoForm.newRoles,
         orgId:
           orgType == "agency"
@@ -1759,7 +1752,6 @@ export default {
         // gender: this.peoForm.gender === '男' ? 1 : 0,
         gender: this.peoForm.gender,
         workType: this.peoForm.post,
-        roles: this.peoForm.duty,
         newRoles: this.peoForm.newRoles,
         agencyId: this.currentAgencyId,
         idCard: this.peoForm.idCard,
@@ -1859,7 +1851,6 @@ export default {
         gender: "",
         idCard: "",
         post: "",
-        duty: [],
         orgType: "",
         activeTime: "",
         zuzhi: "",
@@ -1891,7 +1882,6 @@ export default {
         (this.peoForm.idCard = ""),
         (this.peoForm.gender = ""),
         (this.peoForm.post = ""),
-        (this.peoForm.duty = "");
       this.peoForm.newRoles = [];
     },
     // 人员调动
@@ -2118,15 +2108,6 @@ export default {
         this.peoForm.gender = data.gender;
         this.peoForm.post = data.workType;
         this.peoForm.idCard = data.idCard;
-        this.peoForm.duty = data.roleList.filter(item => item.selected).map(item => item.roleId);
-        // 已有的权限（职责）
-        let existedDutyArr = [];
-        data.roleList.forEach(function (sysDuty) {
-          if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId);
-          }
-        });
-        this.peoForm.dutyList = existedDutyArr;
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -2161,14 +2142,6 @@ export default {
         // this.peoForm.gender = data.gender === 1 ? '男' : '女'
         this.peoForm.gender = data.gender;
         this.peoForm.idCard = data.idCard;
-        // 已有的权限（职责）
-        let existedDutyArr = [];
-        data.roleList.forEach(function (sysDuty) {
-          if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId);
-          }
-        });
-        this.peoForm.duty = existedDutyArr;
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -2234,14 +2207,6 @@ export default {
         this.peoForm.gender = data.gender;
         this.peoForm.post = data.workType;
         this.peoForm.idCard = data.idCard;
-        // 已有的权限（职责）
-        let existedDutyArr = [];
-        data.roleList.forEach(function (sysDuty) {
-          if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId);
-          }
-        });
-        this.peoForm.duty = existedDutyArr;
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -2295,15 +2260,16 @@ export default {
       };
 
       const { data, code, msg } = await requestPost(url, params);
-      debugger
       if (code === 0) {
         this.peoForm.name = data.name;
         this.peoForm.mobile =
           data.mobile.substr(0, 3) + "****" + data.mobile.substr(7);
         this.peoForm.activeTime = data.activeTime;
-        this.peoForm.duty = data.roles;
         this.peoForm.idCard = data.idCard;
         this.peoForm.zuzhi = data.orgName;
+        let existedRoleArr = [];
+        this.peoForm.szsqRoles = data.szsqRoles;
+        this.peoForm.newRoles = existedRoleArr;
         if (data.enableFlag === "enable") {
           this.peoForm.disableFlag = "已启用";
         } else {