Browse Source

提交工时管家项目编辑搜索参与人的问题

Lijy 1 year ago
parent
commit
8d9099788e
1 changed files with 28 additions and 13 deletions
  1. 28 13
      fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

+ 28 - 13
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -1239,7 +1239,7 @@
         <el-dialog :title="$t('selectingParticipants')"  :visible.sync="chooseParticipVisible" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <!-- <el-input style="width:100%" v-model="filterName" placeholder="请输入姓名搜索" @change="findUserInTree"></el-input> -->
             <div v-if="user.userNameNeedTranslate == '1'">
-                <el-input placeholder="请输入内容" v-model.trim="wxFilterText" class="input-with-select">
+                <el-input placeholder="请输入内容" v-model.trim="filterText" class="input-with-select">
                     <el-button slot="append" icon="el-icon-search" @click="echartDepartment()"></el-button>
                 </el-input>
             </div>
@@ -1265,6 +1265,7 @@
                             <span v-if="user.userNameNeedTranslate != '1'">
                                 {{ node.label }}
                             </span>
+                            <!-- {{ node.label }} -->
                         </span>
                     </el-tree>
                 </el-scrollbar>
@@ -1925,6 +1926,7 @@ a {
                 hasSetGroupInchargerId:null,
                 hasSetGroupList:[],
                 addTaskGroupInchargerDig:false,
+                filterNodePersonnel: []
             };
         },
         // 过滤器
@@ -1957,7 +1959,13 @@ a {
         },
         watch: {
             filterText(val) {
-                this.$refs.chooseMembTree.filter(val);
+                let { userNameNeedTranslate } = JSON.parse(sessionStorage.getItem("user"))
+                if(userNameNeedTranslate != 1) {
+                    this.$refs.chooseMembTree.filter(val);
+                }
+                if(!val) {
+                    this.$refs.chooseMembTree.filter(val);
+                }
             },
             filterText2(val) {
                 this.$refs.chooseMembTree2.filter(val);
@@ -2947,8 +2955,16 @@ a {
 
 
             filterNode(value, data) {
+                // if (!value) return true;
+                // return data.label.indexOf(value) !== -1;
+                let { userNameNeedTranslate } = this.user
+                console.log(value, data, '《=== 执行')
                 if (!value) return true;
-                return data.label.indexOf(value) !== -1;
+                if(userNameNeedTranslate != '1') {
+                    return data.label.indexOf(value) !== -1;
+                } else {
+                    return this.filterNodePersonnel.some(item => item.includes(data.label))
+                }
             },
             //重启项目
             restartPro(row) {
@@ -3590,19 +3606,18 @@ a {
             // 企业微信搜索
             echartDepartment() {
                 console.log('我点击了搜索')
-                if(this.wxFilterText != '') {
-                    this.http.post("/department/listAllMemb", {
-                        keyword: this.wxFilterText,
-                        cursor: ''
+                if(this.filterText != '') {
+                    this.http.post("/user/getEmployeeList", {
+                        keyword: this.filterText,
+                        cursor: '',
+                        departmentId: -1,
+                        pageIndex: 1,
+                        pageSize: 1000
                     },
                     res => {
                         if (res.code == "ok") {
-                            var list = res.data.data;
-                            this.setUserToDept(list);
-                            this.deptMembData = list;
-                            this.$forceUpdate()
-                            this.searchPersonnelFlgnum = +this.searchPersonnelFlgnum +1
-                            this.searchPersonnelFlg = true
+                            this.filterNodePersonnel = res.data.records.map(item => item.name)
+                            this.$refs.chooseMembTree.filter(this.filterText);
                         } else {
                             this.$message({
                                 message: res.msg,