ggooalice 2 rokov pred
rodič
commit
5b6429ecbd

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -166,7 +166,7 @@
                             :value="item.id">
                             </el-option>
                         </el-select>
-                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :subject="users" :subjectId="ownerIds" :clearable="true" :filterable="true" :distinction="'1'" :other="'1'" @selectCal="selectCal"></selectCat>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :subject="users" :subjectId="ownerIds" :clearable="true" :filterable="false" :distinction="'1'" :other="'1'" @selectCal="selectCal"></selectCat>
                     </div>
                     <div><span style="color: #606266">{{ $t('traffictools') }}</span>
                         <el-select v-model="type" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="billss(1)" style="width: 140px;" size="small" filterable="true">
@@ -642,7 +642,7 @@
                     <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
                 </el-select>
-                <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :subject="users" :subjectId="ownerIdsId" :distinction="'2'" :filterable="true" @selectCal="selectCal"></selectCat>
+                <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :subject="users" :subjectId="ownerIdsId" :distinction="'2'" :filterable="false" @selectCal="selectCal"></selectCat>
             </div>
             <div class="dingdingtongbu" style="margin-top: 20px">
                 <span>{{ $t('message.period') }}</span>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -629,7 +629,7 @@
                 <el-option :label="item.name" :value="item.id"></el-option>
                 </span>
             </el-select> -->
-            <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="users" :subjectId="addForm.ownerId" :disabled="true" :distinction="'4'" :filterable="true" @selectCal="selectCal"></selectCat>
+            <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="users" :subjectId="addForm.ownerId" :disabled="true" :distinction="'4'" :filterable="false" @selectCal="selectCal"></selectCat>
         </el-form-item>
         <!-- 电话 -->
         <el-form-item :label="$t('phone')" prop="tel" style="width: 300px;display: inline-block;">

+ 11 - 10
fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -349,7 +349,7 @@
                 });
             },
             onDownRefresh() {
-                console.log(123)
+                // console.log(123)
                 this.dpp = true
                 this.pageIndex = 1
                 this.upFinished = false // 不写这句会导致你上拉到底过后在下拉刷新将不能触发下拉加载事件
@@ -366,12 +366,12 @@
                 this.getProject()
             },
 
-            onRefresh() {
-                this.finished = false;
-                this.loading = true;
-                this.page = 1;
-                this.getProject();
-            },
+            // onRefresh() {
+            //     this.finished = false;
+            //     this.loading = true;
+            //     this.page = 1;
+            //     this.getProject();
+            // },
 
             // 新增、编辑项目
             openDialog(i) {
@@ -459,9 +459,10 @@
                         if(res.code == "ok") {    
                             this.$toast.clear();
                             this.$toast.success(this.form.id==null?'新增成功':'修改成功');
-                            this.list = [];
-                            this.page = 1;
-                            this.getProject();
+                            // this.list = [];
+                            // this.page = 1;
+                            this.onDownRefresh();
+                            // this.getProject();
                             this.yanjiuzx()
                         } else {
                             this.$toast.clear();