Jelajahi Sumber

新建任务选择执行人加搜索,调整项目报表服务的样式

Lijy 1 tahun lalu
induk
melakukan
7ae7a606cc

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -82,9 +82,9 @@
         <!-- 时间段筛选 ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12 || ins == 5 || ins == 16 || ins == 17 || ins == 18 || ins == 20 || ins == 21 || ins == 22 -->
         <template v-if="screeningCondition.timePeriod.includes(ins)">
           <span>
-            <span class="demonstration" style="color:#999;padding:0 10px">
+            <!-- <span class="demonstration" style="color:#999;padding:0 10px">
               {{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
-            </span>
+            </span> -->
             <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" :placeholder="$t('selectstartdate')" @change="picks()" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" style="width:300px" :clearable="ins == 15" size="small"> </el-date-picker>
           </span>
         </template>

+ 6 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -151,6 +151,9 @@
                         <div class="popupSearch" v-if="user.userNameNeedTranslate != '1'">
                             <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @search="onSearch" shape="round" background="#F4F4F4"></van-search>
                         </div>
+                        <div class="popupSearch" v-if="user.userNameNeedTranslate == '1'">
+                            <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @search="getOnSearch(executor.searchText)" shape="round" background="#F4F4F4"></van-search>
+                        </div>
 
                         <div class="popupCon conBorder">
                             <van-radio-group v-model="executor.item" class="popupItem marginNone borderNone">
@@ -421,7 +424,9 @@ export default {
             this.finishDateShow = false
         },
         
-        executorChange(item,index){           // 选择执行人
+        executorChange(item,index){  // 选择执行人
+            this.executor.searchText = ''
+            this.getOnSearch('')
             this.executor.show = true
             this.executor.index = index
             this.executor.searchList.forEach(u=>{if (u.id == item.executorId) {