提交日报页面工时情况的人员搜索换成下拉

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1202,9 +1202,10 @@
               <!-- 222 -->
             </div>
             <div>
-                <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
+                <el-input style="float:left;width:22%" v-if="user.userNameNeedTranslate != '1'" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(0)" icon="el-icon-search"></el-button>
                 </el-input>
+                <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'12'" :clearable="true" @selectCal="selectCal"></selectCat>
             </div>
             <el-link
               type="primary"
@@ -1372,9 +1373,10 @@
               
             </div>
             <div>
-                <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
+                <el-input style="float:left;width:22%" v-if="user.userNameNeedTranslate != '1'" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(1)" icon="el-icon-search"></el-button>
                 </el-input>
+                <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'13'" :clearable="true" @selectCal="selectCal"></selectCat>
             </div>
             <el-link
               type="primary"
@@ -1779,6 +1781,8 @@
                 selCon:[],  //筛选条件
                 selProjectList:[],  //筛选后项目列表
                 selConShow: true,
+                usersList: [], // 全部人员列表
+                usersListId: '', // 选中的人员id
 
                 dialogVisible: false, //项目弹窗
                 report: '',
@@ -5034,6 +5038,26 @@
                     zhi.he = he + 'h'
                 }
             },
+            // 获取全部人员
+            getUsers() {
+                this.http.post('/user/getSimpleActiveUserList', {},
+                res => {
+                    if (res.code == "ok") {
+                        this.usersList = res.data;
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             // 按时间比例
             addBli(item, i) {
                 var iss = i
@@ -6308,10 +6332,27 @@
                     this.zhoBao.auditorThird = obj.id
                 } else if(obj.distinction == '5') {
                     this.zhoBao.ccUserid = obj.id
+                } else if(obj.distinction == '12') {
+                    this.usersListId = obj.id
+                    if(obj.name != this.$t('defaultText.pleaseChoose')) {
+                        this.searchKeyword = obj.name
+                    } else {
+                        this.searchKeyword = ''
+                    }
+                    this.searchScreen(0)
+                } else if(obj.distinction == '13') {
+                    this.usersListId = obj.id
+                    if(obj.name != this.$t('defaultText.pleaseChoose')) {
+                        this.searchKeyword = obj.name
+                    } else {
+                        this.searchKeyword = ''
+                    }
+                    this.searchScreen(1)
                 }
             }
         },
         created() {
+            this.getUsers()
             let height = window.innerHeight;
             this.tableHeight = height - 178;
             const that = this;