2023-4-17-设备

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:{},

ant-design-vue-jeecg/src/components/jeecgbiz/JSelectUserByDep.vue

@@ -1,14 +1,28 @@
 <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>
 
@@ -22,32 +36,32 @@
             modalWidth: {
                 type: Number,
                 default: 1250,
-        required: false
+                required: false,
             },
             value: {
                 type: String,
-        required: false
+                required: false,
             },
             disabled: {
                 type: Boolean,
                 required: false,
-        default: false
+                default: false,
             },
             multi: {
                 type: Boolean,
-        default: true,
-        required: false
+                default: false,
+                required: false,
             },
             backUser: {
                 type: Boolean,
                 default: false,
-        required: false
-      }
+                required: false,
+            },
         },
         data() {
             return {
-        userIds: "",
-        userNames: ""
+                userIds: '',
+                userNames: '',
             }
         },
         mounted() {
@@ -56,12 +70,12 @@
         watch: {
             value(val) {
                 this.userIds = val
-      }
             },
-    model: {
-      prop: 'value',
-      event: 'change'
         },
+        // model: {
+        //   prop: 'value',
+        //   event: 'change',
+        // },
         methods: {
             initComp(userNames) {
                 this.userNames = userNames
@@ -76,7 +90,7 @@
                         for (let i = 0; i < arr1.length; i++) {
                             info.push({
                                 value: arr1[i],
-                text: arr2[i]
+                                text: arr2[i],
                             })
                         }
                         this.$emit('back', info)
@@ -87,25 +101,45 @@
                 this.$refs.selectModal.showModal()
             },
             selectOK(rows, idstr) {
-        console.log("当前选中用户", rows)
-        console.log("当前选中用户ID", idstr)
-        if (!rows) {
+                //修改
+                let temp = ''
+                console.log('当前选中用户', rows)
+                console.log('当前选中用户ID', idstr)
+                //修改if(!rows)
+                if (!rows && rows.length <= 0) {
                     this.userNames = ''
                     this.userIds = ''
                 } else {
-          let temp = ''
+                    // let temp = ''
+                    //修改
+
                     for (let item of rows) {
-            temp += ',' + item.realname
+                        //
+                        console.log(item)
+                        // temp += item.realname
+                        console.log(temp)
+                        //修改
+                        temp += ' ' + item.realname
                     }
-          this.userNames = temp.substring(1)
+                    // 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.userIds)
+                //修改
+                // this.$emit('change', this.userNames)
+                this.backDeparInfo()
+            },
+        },
+        model: {
+            prop: 'userNames',
+            event: 'change',
+        },
     }
 </script>
 
-<style scoped>
+<style scoped></style>
 
-</style>

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) {