Преглед на файлове

调整组织架构企业微信同步的提示

Lijy преди 2 години
родител
ревизия
69948fc4ba

+ 8 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -333,6 +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>
                 </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>
@@ -926,6 +927,13 @@ export default {
                 this.billss(obj.other)
             } else if(obj.distinction == '2') {
                 this.ownerIdsId = obj.id
+            } else if(obj.distinction == '11') {
+                if(obj.name != this.$t('defaultText.pleaseChoose')) {
+                this.keyword = obj.name
+                } else {
+                this.keyword = ''
+                }
+                this.statistical()
             }
         },
         //获取添加出差单时的审批流

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

@@ -330,6 +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>
             </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>
@@ -2167,6 +2168,13 @@ export default {
       } else if(obj.distinction == '4') {
         this.addForm.ownerId = obj.id
         this.selts()
+      } else if(obj.distinction == '11') {
+        if(obj.name != this.$t('defaultText.pleaseChoose')) {
+          this.keyword = obj.name
+        } else {
+          this.keyword = ''
+        }
+        this.statistical()
       }
     },
     vueCasader(obj) {

+ 14 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -114,8 +114,10 @@
                         <el-link type="primary" :underline="false" @click="syncMembByCardTime">{{ $t('associateenterprisemicroidentity') }}</el-link>
                     </el-form-item>
                     <el-form-item style="float:right;" v-if="user.corpwxUserid != null && permissions.structureImport && user.companyId!=469">
+                        <!-- <el-link type="primary" v-if="user.userNameNeedTranslate != '1'" :underline="false" @click="syncWithCorpWxDayload">{{ $t('synchronizetheenterprisemicrodirectory') }}</el-link>
+                        <el-link type="primary" v-if="user.userNameNeedTranslate == '1'" :underline="false" @click="newSyncWithCorpWx">{{ $t('synchronizetheenterprisemicrodirectory') }}</el-link> -->
                         <el-link type="primary" v-if="user.userNameNeedTranslate != '1'" :underline="false" @click="syncWithCorpWx">{{ $t('synchronizetheenterprisemicrodirectory') }}</el-link>
-                        <el-link type="primary" v-if="user.userNameNeedTranslate == '1'" :underline="false" @click="newSyncWithCorpWx">{{ $t('synchronizetheenterprisemicrodirectory') }}</el-link>
+                        <el-link type="primary" v-if="user.userNameNeedTranslate == '1'" :underline="false" @click="newSyncWithCorpWxDayload = true">{{ $t('synchronizetheenterprisemicrodirectory') }}</el-link>
                     </el-form-item>
                     <el-form-item style="float:right;" v-if="user.dingdingUserid != null && permissions.structureImport">
                         <el-link type="primary" :underline="false" @click="syncWithCorpDingding">{{ $t('synchronizetheaddressbook') }}</el-link>
@@ -723,6 +725,15 @@
               <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">
+        <span>
+          同步前请联系企业微信管理员检查应用授权的可见范围 <br/>
+          路径:管理企业-应用管理-工时管家-可见范围
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="newSyncWithCorpWx">开始同步</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -1006,7 +1017,8 @@ export default {
       insertFormPlates: [],
       saveBtnLoading: false,
       onlyDirect: false,
-      nextCursor: ''
+      nextCursor: '',
+      newSyncWithCorpWxDayload: false
     };
   },
   filters: {