From 16cd8ca4d7bd38911386730a57e291ced025d95d Mon Sep 17 00:00:00 2001
From: YTD <1158283261@qq.com>
Date: Mon, 17 Apr 2023 16:39:55 +0800
Subject: [PATCH] =?UTF-8?q?2023-4-17-=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modal/JPopupOnlReport.vue           |   2 +-
 .../components/jeecgbiz/JSelectUserByDep.vue  | 222 ++++++++++--------
 .../jeecgbiz/modal/JSelectUserByDepModal.vue  |   2 +-
 .../src/views/device/modules/ZyDeviceForm.vue |   2 +-
 4 files changed, 131 insertions(+), 97 deletions(-)

diff --git a/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue b/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
index 0d5736ed..0066edc1 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
@@ -119,7 +119,7 @@
             total: 0
           }
         },
-        cgRpConfigId:"",
+        cgRpConfigId:"1610839316058812417",
         modalWidth:MODAL_WIDTH,
         tableScroll:{x:true},
         dynamicParam:{},
diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectUserByDep.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectUserByDep.vue
index 705e96da..b70f4256 100644
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectUserByDep.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectUserByDep.vue
@@ -1,111 +1,145 @@
 <template>
   <div>
-    <a-input-search
+    <!-- <a-input
       v-model="userNames"
-      placeholder="请先选择用户"
+      placeholder="请点击选择用户"
       readOnly
       unselectable="on"
-      @search="onSearchDepUser">
+      @search="onSearchDepUser"
+      :disabled="disabled"
+      @click="onSearchDepUser"
+    >
+      <a-icon slot="enterButton" type="cluster" title="部门选择控件" />
+    </a-input> -->
+    <a-input-search v-model="userNames" placeholder="请先选择用户" readOnly unselectable="on" @search="onSearchDepUser">
       <a-button slot="enterButton" :disabled="disabled">选择用户</a-button>
     </a-input-search>
-    <j-select-user-by-dep-modal ref="selectModal" :modal-width="modalWidth" :multi="multi" @ok="selectOK" :user-ids="value" @initComp="initComp"/>
+    <j-select-user-by-dep-modal
+      ref="selectModal"
+      :modal-width="modalWidth"
+      :multi="multi"
+      @ok="selectOK"
+      :user-ids="value"
+      @initComp="initComp"
+    />
+    <!-- :user-ids="value" -->
   </div>
 </template>
 
 <script>
-  import JSelectUserByDepModal from './modal/JSelectUserByDepModal'
+    import JSelectUserByDepModal from './modal/JSelectUserByDepModal'
 
-  export default {
-    name: 'JSelectUserByDep',
-    components: {JSelectUserByDepModal},
-    props: {
-      modalWidth: {
-        type: Number,
-        default: 1250,
-        required: false
-      },
-      value: {
-        type: String,
-        required: false
-      },
-      disabled: {
-        type: Boolean,
-        required: false,
-        default: false
-      },
-      multi: {
-        type: Boolean,
-        default: true,
-        required: false
-      },
-      backUser: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data() {
-      return {
-        userIds: "",
-        userNames: ""
-      }
-    },
-    mounted() {
-      this.userIds = this.value
-    },
-    watch: {
-      value(val) {
-        this.userIds = val
-      }
-    },
-    model: {
-      prop: 'value',
-      event: 'change'
-    },
-    methods: {
-      initComp(userNames) {
-        this.userNames = userNames
-      },
-      //返回选中的用户信息
-      backDeparInfo(){
-        if(this.backUser===true){
-          if(this.userIds && this.userIds.length>0){
-            let arr1 = this.userIds.split(',')
-            let arr2 = this.userNames.split(',')
-            let info = []
-            for(let i=0;i<arr1.length;i++){
-              info.push({
-                value: arr1[i],
-                text: arr2[i]
-              })
+    export default {
+        name: 'JSelectUserByDep',
+        components: { JSelectUserByDepModal },
+        props: {
+            modalWidth: {
+                type: Number,
+                default: 1250,
+                required: false,
+            },
+            value: {
+                type: String,
+                required: false,
+            },
+            disabled: {
+                type: Boolean,
+                required: false,
+                default: false,
+            },
+            multi: {
+                type: Boolean,
+                default: false,
+                required: false,
+            },
+            backUser: {
+                type: Boolean,
+                default: false,
+                required: false,
+            },
+        },
+        data() {
+            return {
+                userIds: '',
+                userNames: '',
             }
-            this.$emit('back', info)
-          }
-        }
-      },
-      onSearchDepUser() {
-        this.$refs.selectModal.showModal()
-      },
-      selectOK(rows, idstr) {
-        console.log("当前选中用户", rows)
-        console.log("当前选中用户ID", idstr)
-        if (!rows) {
-          this.userNames = ''
-          this.userIds = ''
-        } else {
-          let temp = ''
-          for (let item of rows) {
-            temp += ',' + item.realname
-          }
-          this.userNames = temp.substring(1)
-          this.userIds = idstr
-        }
-        this.$emit("change", this.userIds)
-      }
+        },
+        mounted() {
+            this.userIds = this.value
+        },
+        watch: {
+            value(val) {
+                this.userIds = val
+            },
+        },
+        // model: {
+        //   prop: 'value',
+        //   event: 'change',
+        // },
+        methods: {
+            initComp(userNames) {
+                this.userNames = userNames
+            },
+            //返回选中的用户信息
+            backDeparInfo() {
+                if (this.backUser === true) {
+                    if (this.userIds && this.userIds.length > 0) {
+                        let arr1 = this.userIds.split(',')
+                        let arr2 = this.userNames.split(',')
+                        let info = []
+                        for (let i = 0; i < arr1.length; i++) {
+                            info.push({
+                                value: arr1[i],
+                                text: arr2[i],
+                            })
+                        }
+                        this.$emit('back', info)
+                    }
+                }
+            },
+            onSearchDepUser() {
+                this.$refs.selectModal.showModal()
+            },
+            selectOK(rows, idstr) {
+                //修改
+                let temp = ''
+                console.log('当前选中用户', rows)
+                console.log('当前选中用户ID', idstr)
+                //修改if(!rows)
+                if (!rows && rows.length <= 0) {
+                    this.userNames = ''
+                    this.userIds = ''
+                } else {
+                    // let temp = ''
+                    //修改
+
+                    for (let item of rows) {
+                        //
+                        console.log(item)
+                        // temp += item.realname
+                        console.log(temp)
+                        //修改
+                        temp += ' ' + item.realname
+                    }
+                    // this.userNames = temp.substring(1)
+
+                    this.userNames = temp
+                    console.log(this.userNames)
+                    this.userIds = idstr
+                    console.log(rows)
+                }
+                this.$emit('change', this.userIds)
+                //修改
+                // this.$emit('change', this.userNames)
+                this.backDeparInfo()
+            },
+        },
+        model: {
+            prop: 'userNames',
+            event: 'change',
+        },
     }
-  }
 </script>
 
-<style scoped>
+<style scoped></style>
 
-</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
index d3cbd9d6..b2ea69f5 100644
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
@@ -275,7 +275,7 @@
             this.selectUserRows.push(row)
           }
         }
-        this.selectUserIds = this.selectUserRows.map(row => row.username).join(',')
+        this.selectUserIds = this.selectUserRows.map(row => row.id).join(',')
       },
       // 点击树节点,筛选出对应的用户
       onDepSelect(selectedDepIds) {
diff --git a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
index 1584eb5a..0136c93a 100644
--- a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
+++ b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
@@ -61,7 +61,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="管理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="administrator">
-              <j-select-user-by-dep v-model="model.administrator" />
+              <j-select-user-by-dep v-model="model.administrator"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">