提交

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -333,7 +333,7 @@
                     <el-input style="float:left;" v-if="user.userNameNeedTranslate != 1" v-model="searchWord" class="input-with-select" :placeholder="$t('pleaseenterstaffsearch')" clearable="true" size="small">
                         <el-button slot="append" @click="statistical()" icon="el-icon-search"></el-button>
                     </el-input>
-                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :widthStr="'240'" :subject="users" :subjectId="addForm.ownerId" :distinction="'11'" :disabled="false" @selectCal="selectCal" :clearable="true"></selectCat>
+                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :widthStr="'240'" :subject="users" :distinction="'11'" :disabled="false" @selectCal="selectCal" :clearable="true"></selectCat>
                 </div>
                 <div style="display: inline-block;width: 700px;margin-left: 100px">
                     <span style="display: inline-block;margin: 0 15px 0 20px;color: rgb(96, 98, 102);">{{ $t('message.period') }}</span>
@@ -929,9 +929,9 @@ export default {
                 this.ownerIdsId = obj.id
             } else if(obj.distinction == '11') {
                 if(obj.name != this.$t('defaultText.pleaseChoose')) {
-                this.keyword = obj.name
+                this.searchWord = obj.name
                 } else {
-                this.keyword = ''
+                this.searchWord = ''
                 }
                 this.statistical()
             }

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -330,7 +330,7 @@
               <el-input style="float:left;" v-if="user.userNameNeedTranslate != 1" v-model="keyword" class="input-with-select" :placeholder="$t('pleaseenterstaffsearch')" clearable="true" size="small">
                   <el-button slot="append" @click="statistical()" icon="el-icon-search"></el-button>
               </el-input>
-              <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :widthStr="'240'" :subject="users" :subjectId="addForm.ownerId" :distinction="'11'" :disabled="false" @selectCal="selectCal" :clearable="true"></selectCat>
+              <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :widthStr="'240'" :subject="users" :distinction="'11'" :disabled="false" @selectCal="selectCal" :clearable="true"></selectCat>
             </div>
             <div style="display: inline-block;width: 340px">
               <span style="display: inline-block;margin: 0 15px 0 20px;color: rgb(96, 98, 102);">{{ $t('time.startDate') }}</span>

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -151,6 +151,8 @@
                         <el-option :label="item.name" :value="item.id"></el-option>
                         </span> 
                     </el-select>
+
+                    <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :distinction="'4'" :widthStr="'350'" :subject="users" :clearable="true" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <el-form-item prop="type" :label="$t('choosethestyle')" v-if="radio == $t('other.project') || radio == $t('projectclassification')">
                     <el-select v-model="exportParam.type" :placeholder="$t('choosethestyle')" style="width:350px;" >
@@ -1297,6 +1299,8 @@
                 } else if(obj.distinction == 2) {
                     this.personnelValue = obj.name
                     this.personnel()
+                } else if(obj.distinction == 4) {
+                    this.exportParam.userId =  obj.id
                 }
             },
             vueCasader(obj) {

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -725,7 +725,7 @@
               <el-col :span="18">{{recordMsg.msg}}</el-col>
             </el-row>
         </el-dialog>
-        <el-dialog :title="$t('synchronizetheenterprisemicrodirectory')" :visible.sync="dialogVisible" width="400px" :before-close="handleClose">
+        <el-dialog :title="$t('synchronizetheenterprisemicrodirectory')" :visible.sync="newSyncWithCorpWxDayload" width="400px" :before-close="handleClose">
         <span>
           同步前请联系企业微信管理员检查应用授权的可见范围 <br/>
           路径：管理企业-应用管理-工时管家-可见范围
@@ -1222,6 +1222,7 @@ export default {
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         });
+        this.newSyncWithCorpWxDayload = false
       this.http.post(
         "/wxcorp/getCorpMembsFromPlatform",
         {