bug

project/hlj/app/AppFormAudit/components/List.vue

@@ -52,7 +52,7 @@
             </ai-user-selecter>
           </el-form-item>
           <el-form-item label="审批人员" style="width: 100%" prop="fillingUserNames" :rules="[{required: true, message: '请选择审批人员', trigger: 'change'}]">
-            <ai-user-selecter :instance="instance" v-model="form.fillingUserIds" @change="e => onUserChange(e, 'fillingUserNames')">
+            <ai-user-selecter :instance="instance" :props="{label: 'name', id: 'sysUserId'}" v-model="form.fillingUserIds" @change="e => onUserChange(e, 'fillingUserNames')">
               <div class="AppAnnounceDetail-select">
                 <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.fillingUserNames"></el-input>
                 <div class="select-left" v-if="form.fillingUserIds.length">
@@ -132,6 +132,7 @@
       },
 
       edit (e) {
+        console.log(e)
         this.id = e.id
         this.form.name = e.name
         this.form.examineUserIds = e.examineUserIds.split(',').map((v, index) => {

project/hlj/app/AppMicrodiskManage/components/List.vue

@@ -354,8 +354,9 @@
       },
 
       filterNode(value, data) {
+        console.log(data)
         if (!value) return true
-        return data.name.indexOf(value) !== -1
+        return data.fileName.indexOf(value) !== -1
       },
 
       settingAadmin (id) {

ui/packages/common/AiUserSelecter.vue

@@ -83,7 +83,7 @@
           <el-scrollbar class="AiWechatSelecter-list">
             <div class="user-wrapper">
               <el-checkbox-group  v-model="userIds" @change="onCheckboxChange">
-                <el-checkbox v-for="item in list" :label="item.id" :key="item.id" @change="e => onboxChange(item.id, e)">{{ item.name }}</el-checkbox>
+                <el-checkbox v-for="item in list" :label="item[props.id]" :key="item[props.id]" @change="e => onboxChange(item[props.id], e)">{{ item.name }}</el-checkbox>
               </el-checkbox-group>
             </div>
             <AiEmpty v-if="!list.length"></AiEmpty>
@@ -235,7 +235,9 @@
           return {
             ...item,
             id: item[this.props.id],
-            name: item[this.props.label]
+            name: item[this.props.label],
+            [this.props.id]: item[this.props.id],
+            [this.props.label]: item[this.props.label]
           }
         })))
 
@@ -254,7 +256,9 @@
             return {
               ...item,
               id: item[this.props.id],
-              name: item[this.props.label]
+              name: item[this.props.label],
+              [this.props.id]: item[this.props.id],
+              [this.props.label]: item[this.props.label]
             }
           })))
           this.userIds = this.chooseUser.map(v => v[this.props.id])
@@ -278,14 +282,18 @@
           return {
             ...item,
             id: item[this.props.id],
-            name: item[this.props.label]
+            name: item[this.props.label],
+              [this.props.id]: item[this.props.id],
+              [this.props.label]: item[this.props.label]
           }
         })))
         this.chooseUser = JSON.parse(JSON.stringify(this.value.map(item => {
           return {
             ...item,
             id: item[this.props.id],
-            name: item[this.props.label]
+            name: item[this.props.label],
+              [this.props.id]: item[this.props.id],
+              [this.props.label]: item[this.props.label]
           }
         })))
 
@@ -307,18 +315,18 @@
             ]
           } else {
             this.list.forEach(v => {
-              if (!this.chooseUser.map(e => e.id).includes(v.id)) {
+              if (!this.chooseUser.map(e => e[this.props.id]).includes(v[this.props.id])) {
                 this.chooseUser.push(v)
               }
             })
           }
         } else {
           this.chooseUser = this.chooseUser.filter(v => {
-            return !this.list.map(v => v.id).includes(v.id)
+            return !this.list.map(v => v[this.props.id]).includes(v[this.props.id])
           })
         }
 
-        this.userIds = this.chooseUser.map(v => v.id)
+        this.userIds = this.chooseUser.map(v => v[this.props.id])
       },
 
       showSelecter () {
@@ -328,7 +336,7 @@
       },
 
       onTreeChange (e) {
-        this.search.departmentId = e.id || ''
+        this.search.departmentId = e[this.props.id] || ''
         this.search.current = 1
 
         this.$nextTick(() => {
@@ -346,7 +354,7 @@
 
       onboxChange (id, v) {
         if (!this.isMultiple) {
-          const checked = this.list.filter(v => v.id === id)
+          const checked = this.list.filter(v => v[this.props.id] === id)
           if (v) {
             const v = checked[checked.length - 1]
             this.chooseUser = [v]
@@ -354,7 +362,7 @@
           }
 
           if (!v) {
-            if (this.chooseUser.findIndex(v => v.id === id) > -1) {
+            if (this.chooseUser.findIndex(v => v[this.props.id] === id) > -1) {
               this.chooseUser = []
             }
           }
@@ -363,21 +371,21 @@
 
       onCheckboxChange (ids) {
         this.$nextTick(() => {
-          const checked = this.list.filter(v => ids.includes(v.id))
+          const checked = this.list.filter(v => ids.includes(v[this.props.id]))
-          const unChecked =  this.list.filter(v => !ids.includes(v.id))
+          const unChecked =  this.list.filter(v => !ids.includes(v[this.props.id]))
           if (!this.isMultiple) {
 
             return false
           }
 
           this.chooseUser.forEach((v, index) => {
-            if (unChecked.findIndex(e => e.id === v.id) > -1) {
+            if (unChecked.findIndex(e => e[this.props.id] === v[this.props.id]) > -1) {
               this.chooseUser.splice(index, 1)
             }
           })
 
           checked.forEach(v => {
-            if (this.chooseUser.findIndex(e => e.id === v.id) < 0) {
+            if (this.chooseUser.findIndex(e => e[this.props.id] === v[this.props.id]) < 0) {
               this.chooseUser.push(v)
             }
           })
@@ -505,16 +513,12 @@
 
         this.$emit('change', JSON.parse(JSON.stringify(this.chooseUser.map(item => {
           return {
-            ...item,
+            ...item
-            [this.props.id]: item.id,
-            [this.props.label]: item.name
           }
         }))))
         this.showUserList = JSON.parse(JSON.stringify(this.chooseUser.map(item => {
           return {
-            ...item,
+            ...item
-            [this.props.id]: item.id,
-            [this.props.label]: item.name
           }
         })))
         this.isShow = false