From f39e83047893486e31b8d8ed385c274948033f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Fri, 17 Feb 2023 18:07:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?dengjie=20:=20=E8=A7=A3=E5=86=B3=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E9=80=89=E6=8B=A9=E5=99=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/DeptPicker.vue      | 119 ++++++++++--------
 1 file changed, 64 insertions(+), 55 deletions(-)

diff --git a/flowable-engine-web/src/components/common/DeptPicker.vue b/flowable-engine-web/src/components/common/DeptPicker.vue
index c02c9fd..bee8062 100644
--- a/flowable-engine-web/src/components/common/DeptPicker.vue
+++ b/flowable-engine-web/src/components/common/DeptPicker.vue
@@ -7,11 +7,11 @@
             <el-input v-model="filterText" style="width: 100%;" size="small"
                       clearable placeholder="输入关键字进行过滤" prefix-icon="el-icon-search"/>
           </div>
-          <!-- 部门 -->
+          <!-- 部门 check-strictly-->
           <el-empty :image-size="100" description="似乎没有数据" v-show="deptList.length === 0"/>
           <el-scrollbar style="height:350px">
-            <el-tree :data="deptList" ref="tree" :props="deptProps" empty-text="" node-key="deptId" default-expand-all
-                     :show-checkbox="showCheckbox" check-strictly highlight-current
+            <el-tree :data="deptList" ref="tree" :props="deptProps" empty-text="" node-key="value" default-expand-all
+                     :show-checkbox="showCheckbox" highlight-current :check-strictly="multiple===false"
                      @check-change="handleCheckChange" @node-click="(node,check)=>handle(node,check)"
                      :filter-node-method="filterNode">
               <div class="custom-tree-node" slot-scope="{ node }" style="width: 100%">
@@ -20,7 +20,6 @@
             </el-tree>
           </el-scrollbar>
         </div>
-
         <div class="selected">
           <div class="count">
             <span>已选 {{ selectList.length }} 项</span>
@@ -120,40 +119,47 @@ export default {
      * @param checked 是否选中
      */
     handleCheckChange(data, checked) {
-      // 左侧有选择框
-      if (this.showCheckbox) {
-        // 左侧有选择框 + 多选
-        if (this.multiple) {
-          //不添加重复的数据到右边
-          for (let i = 0; i < this.selectList.length; i++) {
-            if (this.selectList[i].value === data.value) {
-              this.selectList.splice(i, 1);
-              break;
+      // if (data.children === undefined) {
+        // 左侧有选择框
+        if (this.showCheckbox) {
+          // 左侧有选择框 + 多选
+          if (this.multiple ) {
+            //不添加重复的数据到右边
+            for (let i = 0; i < this.selectList.length; i++) {
+              if (this.selectList[i].value === data.value) {
+                this.selectList.splice(i, 1);
+                break;
+              }
             }
-          }
-          if (checked) {
-            this.selectList.push(data);
-          } else if (data === '1') {
-            this.$refs.tree.setCheckedKeys([]);
-            this.selectList = [];
-          }
-        } else {// 左侧有选择框 + 单选
-          //不添加重复的数据到右边
-          for (let i = 0; i < this.selectList.length; i++) {
-            if (this.selectList[i].value === data.value) {
-              this.selectList.splice(i, 1);
-              break;
+            if (checked) {
+              if(data.children === undefined){
+                this.selectList.push(data);
+              }
+
+            } else if (data === '1') {
+              this.$refs.tree.setCheckedKeys([]);
+              this.selectList = [];
+            }
+          } else {// 左侧有选择框 + 单选
+            console.log('左侧有选择框 + 单选')
+            //不添加重复的数据到右边
+            for (let i = 0; i < this.selectList.length; i++) {
+              if (this.selectList[i].value === data.value) {
+                this.selectList.splice(i, 1);
+                break;
+              }
+            }
+            if (checked) {
+              this.$refs.tree.setCheckedNodes([data]);
+              // this.$refs.tree.setCheckedKeys([]);
+              this.selectList = [data];
+            } else if (data === '1') {
+              this.selectList = [];
+              this.$refs.tree.setCheckedKeys([]);
             }
-          }
-          if (checked) {
-            this.$refs.tree.setCheckedNodes([data]);
-            this.selectList = [data];
-          } else if (data === '1') {
-            this.$refs.tree.setCheckedKeys([]);
-            this.selectList = [];
           }
         }
-      }
+      // }
       this._value = this.selectList
     },
 
@@ -164,19 +170,21 @@ export default {
      * @param check checked(checkbox选择框)是否选中
      */
     handle(node, check) {
-      if (this.multiple) {
-        //不添加重复的数据到右边
-        for (let i = 0; i < this.selectList.length; i++) {
-          if (this.selectList[i].value === node.value) {
-            this.selectList.splice(i, 1);
-            break;
+      if (check.isLeaf !== false) {
+        if (this.multiple) {
+          //不添加重复的数据到右边
+          for (let i = 0; i < this.selectList.length; i++) {
+            if (this.selectList[i].value === node.value) {
+              this.selectList.splice(i, 1);
+              break;
+            }
           }
+          check.checked = true
+          this.selectList.push(node);
+        } else {
+          check.checked = true
+          this.selectList = [node];
         }
-        check.checked = true
-        this.selectList.push(node);
-      } else {
-        check.checked = true
-        this.selectList = [node];
       }
       this._value = this.selectList
     },
@@ -203,9 +211,10 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        this.handleCheckChange("1");
         if (!this.showCheckbox) {
           this.selectList = []
+        }else {
+          this.handleCheckChange("1");
         }
       });
     },
@@ -221,15 +230,15 @@ export default {
 <style lang="less" scoped>
 @containWidth: 278px;
 
-/deep/ .el-tree-node {
-  .is-leaf + .el-checkbox .el-checkbox__inner {
-    display: inline-block;
-  }
-
-  .el-checkbox .el-checkbox__inner {
-    display: none;
-  }
-}
+///deep/ .el-tree-node {
+//  .is-leaf + .el-checkbox .el-checkbox__inner {
+//    display: inline-block;
+//  }
+//
+//  .el-checkbox .el-checkbox__inner {
+//    display: none;
+//  }
+//}
 
 /deep/ .el-dialog__body {
   padding: 10px 20px;
-- 
2.40.1


From 4bc906d3506d67d73b5b6c81be786847f034f166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Fri, 17 Feb 2023 18:14:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?dengjie=20:=20=E8=A7=A3=E5=86=B3=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E9=80=89=E6=8B=A9=E5=99=A8=E9=A2=84=E8=A7=88=E6=97=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/src/components/common/DeptPicker.vue    | 6 +-----
 .../src/views/common/form/components/DeptPicker.vue         | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/flowable-engine-web/src/components/common/DeptPicker.vue b/flowable-engine-web/src/components/common/DeptPicker.vue
index bee8062..6cbf926 100644
--- a/flowable-engine-web/src/components/common/DeptPicker.vue
+++ b/flowable-engine-web/src/components/common/DeptPicker.vue
@@ -101,7 +101,7 @@ export default {
         // const jsonb = jsona.replace(/"value"/g, '"deptId"') // 修改成你要的字段
         // const jsonc = jsonb.replace(/"label"/g, '"deptName"')
         this.deptList = res.data
-        console.log("获取部门信息===========", this.deptList);
+        // console.log("获取部门信息===========", this.deptList);
       });
     },
     //通过关键字过滤树节点
@@ -119,7 +119,6 @@ export default {
      * @param checked 是否选中
      */
     handleCheckChange(data, checked) {
-      // if (data.children === undefined) {
         // 左侧有选择框
         if (this.showCheckbox) {
           // 左侧有选择框 + 多选
@@ -135,13 +134,11 @@ export default {
               if(data.children === undefined){
                 this.selectList.push(data);
               }
-
             } else if (data === '1') {
               this.$refs.tree.setCheckedKeys([]);
               this.selectList = [];
             }
           } else {// 左侧有选择框 + 单选
-            console.log('左侧有选择框 + 单选')
             //不添加重复的数据到右边
             for (let i = 0; i < this.selectList.length; i++) {
               if (this.selectList[i].value === data.value) {
@@ -159,7 +156,6 @@ export default {
             }
           }
         }
-      // }
       this._value = this.selectList
     },
 
diff --git a/flowable-engine-web/src/views/common/form/components/DeptPicker.vue b/flowable-engine-web/src/views/common/form/components/DeptPicker.vue
index 3671cc4..b695f26 100644
--- a/flowable-engine-web/src/views/common/form/components/DeptPicker.vue
+++ b/flowable-engine-web/src/views/common/form/components/DeptPicker.vue
@@ -10,12 +10,12 @@
         <org-picker type="dept" :multiple="multiple" ref="deptPicker" :v-model="select" :selected="_value" @ok="selected"/>
         <span class="placeholder"> {{placeholder}}</span>
         <div style="margin-top: 5px">
-          <el-tag size="mini" style="margin: 5px" closable v-for="(dept, i) in _value" :key="i" @close="delDept(i)">{{dept.deptName}}</el-tag>
+          <el-tag size="mini" style="margin: 5px" closable v-for="(dept, i) in _value" :key="i" @close="delDept(i)">{{dept.label}}</el-tag>
         </div>
       </template>
       <template v-else-if="perm === 'R'">
         <div v-for="(dept, i) in _value" :key="i">
-          {{dept.deptName}}
+          {{dept.label}}
         </div>
       </template>
     </template>
-- 
2.40.1