From 1bb83257d3309983a4ab103db216ce3b2f63816c Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Sat, 12 Oct 2024 11:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3-=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=83=A8=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process/rolesExamine.js          |  1 -
 src/views/process/branchPro/index.vue    | 43 +++++++++++++++++-------
 src/views/process/roles/index.vue        |  4 ---
 src/views/process/rolesExamine/index.vue |  6 +---
 src/views/process/rolesRemind/index.vue  |  2 +-
 5 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/api/process/rolesExamine.js b/src/api/process/rolesExamine.js
index a4c04e3..f5af31f 100644
--- a/src/api/process/rolesExamine.js
+++ b/src/api/process/rolesExamine.js
@@ -11,7 +11,6 @@ export function getRoleCheckList(query) {
 
 // 审核角色列表
 export function userDistributionCheck(data) {
-  console.log("data,",data)
   return request({
     url: '/system/proDeptRole',
     method: 'post',
diff --git a/src/views/process/branchPro/index.vue b/src/views/process/branchPro/index.vue
index 2e98fbd..a81dbca 100644
--- a/src/views/process/branchPro/index.vue
+++ b/src/views/process/branchPro/index.vue
@@ -133,39 +133,56 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="上级部门" prop="menuName">
-              <el-input v-model="form.menuName" placeholder="请输入菜单名称"/>
+          <el-col :span="12" v-if="form.parentId !== 0">
+            <el-form-item label="上级部门" prop="parentId">
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="项目部名称" prop="dictName">
-              <el-input v-model="form.dictName" placeholder="请输入字典名称"/>
+            <el-form-item label="部门名称" prop="orgName">
+              <el-input v-model="form.orgName" placeholder="请输入部门名称" maxlength="30"/>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="项目部负责人" prop="menuName">
-              <el-input v-model="form.menuName" placeholder="请输入菜单名称"/>
+            <el-form-item label="部门负责人" prop="orgHeadUserId">
+              <treeselect v-model="form.orgHeadUserId" :flat="true" :options="personOptions" :normalizer="normalizer2" placeholder="选择部门负责人" @select="handleSelect1"/>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="省内外" prop="dictName">
-              <el-input v-model="form.dictName" placeholder="请输入字典名称"/>
+            <el-form-item label="省内外" prop="isProvince">
+              <el-radio-group v-model="form.isProvince">
+                <el-radio
+                  v-for="item in isProvinceList"
+                  :key="item.id"
+                  :label="item.id"
+                >{{item.name}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="位置" prop="menuName">
-              <el-input v-model="form.menuName" placeholder="请输入菜单名称"/>
+            <el-form-item label="位置" prop="address">
+              <el-input v-model="form.address" placeholder="请输入位置" maxlength="50"/>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="项目经理" prop="dictName">
-              <el-input v-model="form.dictName" placeholder="请输入字典名称"/>
+            <el-form-item label="项目经理" required>
+              <el-tree
+                class="tree-border"
+                :data="staffOptions"
+                show-checkbox
+                ref="staff"
+                node-key="uniqueId"
+                empty-text="加载中，请稍候"
+                :props="defaultProps"
+                default-expand-all
+                :default-checked-keys="defaultCheckedKeys"
+                @check-change="handleCheckChange"
+              ></el-tree>
             </el-form-item>
           </el-col>
 
diff --git a/src/views/process/roles/index.vue b/src/views/process/roles/index.vue
index 4ecb76e..54d60cd 100644
--- a/src/views/process/roles/index.vue
+++ b/src/views/process/roles/index.vue
@@ -276,7 +276,6 @@ export default {
       nodes.forEach(node => {
         node.uniqueId = `${parentId ? parentId + '-' : ''}${node.id}`; // 生成唯一标识符
         this.uniqueIdToIdMap[node.uniqueId] = node.id; // 建立 uniqueId 到 id 的映射
-        console.log(`Processing node: ${node.name} with uniqueId: ${node.uniqueId}`);
         if (node.children && node.children.length > 0) {
           this.processData(node.children, node.uniqueId); // 递归处理子节点
         }
@@ -286,7 +285,6 @@ export default {
     /** 设置默认选中的节点 */
     setDefaultCheckedKeys() {
       this.defaultCheckedKeys = this.getCheckedKeys(this.staffOptions);
-      console.log('Default checked keys:', this.defaultCheckedKeys);
     },
 
     /** 递归获取默认选中的节点 id */
@@ -294,7 +292,6 @@ export default {
       const keys = new Set();
       const recursiveCheck = (nodes) => {
         nodes.forEach(node => {
-          console.log(`Checking node: ${node.name} with uniqueId: ${node.uniqueId}`);
           if (node.isCheck === 1) {
             keys.add(node.uniqueId);
           }
@@ -341,7 +338,6 @@ export default {
             return;
           }
           this.form.userId = checkedKeys.join(",");
-          console.log("form", this.form)
           proDeptRole(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
diff --git a/src/views/process/rolesExamine/index.vue b/src/views/process/rolesExamine/index.vue
index 3f7b3ea..7cc608f 100644
--- a/src/views/process/rolesExamine/index.vue
+++ b/src/views/process/rolesExamine/index.vue
@@ -80,7 +80,7 @@
 
       <!-- 添加或修改参数配置对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="部门名称" prop="orgName">
             <el-input v-model="form.orgName" :disabled="true" />
           </el-form-item>
@@ -136,10 +136,6 @@
         },
         // 表单参数
         form: {},
-        // 表单校验
-        rules: {
-
-        }
       };
     },
     created() {
diff --git a/src/views/process/rolesRemind/index.vue b/src/views/process/rolesRemind/index.vue
index 4132dd4..a15316f 100644
--- a/src/views/process/rolesRemind/index.vue
+++ b/src/views/process/rolesRemind/index.vue
@@ -73,7 +73,7 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" label-width="80px">
         <el-form-item label="部门名称" prop="orgName">
           <el-input v-model="form.orgName" :disabled="true" />
         </el-form-item>