From 55fa7ea3e46ce3481415356a921a5d2569b168ef Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Tue, 7 Mar 2023 15:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecgbiz/JSelectDepart.vue | 2 ++
 src/views/dashboard/HomePage.vue          | 6 ++----
 src/views/system/UserList.vue             | 2 +-
 src/views/system/modules/UserModal.vue    | 9 ++++-----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/jeecgbiz/JSelectDepart.vue b/src/components/jeecgbiz/JSelectDepart.vue
index 438cedd..9675ab1 100644
--- a/src/components/jeecgbiz/JSelectDepart.vue
+++ b/src/components/jeecgbiz/JSelectDepart.vue
@@ -42,6 +42,7 @@
       },
       value:{
         type:String,
+        default:'',
         required:false
       },
       disabled:{
@@ -64,6 +65,7 @@
       }
     },
     mounted(){
+      console.log("this.valueXX",this.value)
       this.departIds = this.value
     },
     watch:{
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 300ce4a..498b367 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -513,8 +513,8 @@ export default {
     },
     //去重
     deWeight(arr) {
-  for (var i = 0; i < arr.length - 1; i++) {
-    for (var j = i + 1; j < arr.length; j++) {
+  for (let i = 0; i < arr.length - 1; i++) {
+    for (let j = i + 1; j < arr.length; j++) {
       if (arr[i].id == arr[j].id) { // id为需要去重字段
         arr.splice(j, 1);
         //因为数组长度减小1，所以直接 j++ 会漏掉一个元素，所以要 j--
@@ -531,8 +531,6 @@ export default {
       return {
         on: {
           click: () => {
-            console.log(record)
-            console.log(record.id)
             this.$router.push({name:'activiti-todoManage',
               params:{
                 id: record.id
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index a2f5c94..f41ff53 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -29,7 +29,7 @@
           </a-col>
           <a-col :md="6" :sm="8">
           <a-form-item label="部门">
-            <j-select-depart v-model="queryParam.departIds" :trigger-change="true"  ></j-select-depart>
+            <j-select-depart v-model="queryParam.departIds" :multi="true" :trigger-change="true"  ></j-select-depart>
           </a-form-item>
           </a-col>
 <!--          <a-row :gutter="24">-->
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index f55da4e..693c989 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -81,6 +81,7 @@
             @search="onSearch">
             <a-button slot="enterButton" icon="search">选择</a-button>
           </a-input-search>
+<!--          <j-select-depart v-model="checkedDepartNameString" :multi="false" :value="checkedDepartNameString" :trigger-change="true"  ></j-select-depart>-->
         </a-form-item>
                   </a-col>
 
@@ -256,6 +257,7 @@
   import JImageUpload from '../../../components/jeecg/JImageUpload'
   import FileMangement from "@/extends/FileMangement/fileMangement";
   import signMd5Utils from '@/utils/encryption/signMd5Utils'
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
 
   export default {
     name: "UserModal",
@@ -263,6 +265,7 @@
       FileMangement,
       JImageUpload,
       departWindow,
+      JSelectDepart,
       JSelectPosition
     },
     data () {
@@ -516,9 +519,7 @@
         this.picUrl2 = record.autograph;//以这句为主,设置model中的图片字段
         this.model.img = record.avatar;
         this.model.img2 = record.autograph;
-        console.log("图片路径>>>>>>>>>",record.avatar)
-        console.log("图片路径>>>>>>>>>",this.picUrl)
-        console.log("签名>>>>>>>>>",this.picUrl2)
+
         let obj ={}
         obj.url=  record.avatar;
         //身份为上级显示负责部门，否则不显示
@@ -615,8 +616,6 @@
             }else{
               formData.autograph = null;
             }
-            console.log("that.fileList2>>>>>>>>>>>>>>>>>>>",that.fileList2)
-            console.log("that.fileList>>>>>>>>>>>>>>>>>>>",that.fileList)
             //update-begin-author:taoyan date:2020710 for:多租户配置
             formData.relTenantIds = this.currentTenant.length>0?this.currentTenant.join(','):''
             //update-end-author:taoyan date:2020710 for:多租户配置