调整组织架构

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

@@ -17,7 +17,14 @@
                 <el-tree :data="data" :props="defaultProps" :expand-on-click-node="false" accordion @node-click="handleNodeClick" :default-expanded-keys="jDarr" @node-expand="jieDian" @node-collapse="shutDown" @current-change="chufa">
                     <span class="custom-tree-node" style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node }" @mouseleave= mouseleave(data,$event) @mouseover= mouseover(data,$event)>
 
-                        <span style="padding-right: 50px;box-sizing: border-box;overflow:hidden;text-overflow:ellipsis;line-height: 36px; display: inline-block;">{{ node.label }}</span>
+                        <span style="padding-right: 50px;box-sizing: border-box;overflow:hidden;text-overflow:ellipsis;line-height: 36px; display: inline-block;">
+                          <span v-if="user.userNameNeedTranslate == '1'">
+                            <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                          </span>
+                          <span v-else>
+                            {{ node.label }}
+                          </span>
+                        </span>
 
                         <!-- <span v-if="node.label != '全部人员'" class="node none"> -->
                         <span v-if="node.label != $t('lable.allStaff') && node.label != $t('lable.unassigned')" class="node none poAub">
@@ -73,7 +80,7 @@
                     <el-form-item style="float:right;" v-if="permissions.structureExport">
                         <el-link type="primary" :underline="false" @click="showExportDialog">{{ $t('exportpersonnel') }}</el-link>
                     </el-form-item>
-                    <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureAdd">
+                    <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureAdd && user.userNameNeedTranslate != '1'">
                         <el-link type="primary" :underline="false" @click="openInsertDialog(null)">{{ $t('addpersonnel') }}</el-link>
                     </el-form-item>
                     
@@ -84,7 +91,8 @@
                         <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" :underline="false" @click="syncWithCorpWx">{{ $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-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>
@@ -157,18 +165,18 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="jobNumber" :label="$t('Worknumber')" >
+                <el-table-column prop="jobNumber" :label="$t('Worknumber')" ></el-table-column>
+                <el-table-column prop="phone" :label="$t('shou-ji')" width="120"></el-table-column>
+                <el-table-column prop="departmentName" :label="$t('lable.department')" width="220">
                   <template slot-scope="scope">
                     <div>
                       <div v-if="user.userNameNeedTranslate == 1">
-                        <ww-open-data type='userName' :openid='scope.row.jobNumber'></ww-open-data>
+                        <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
                       </div>
-                      <div v-else>{{scope.row.jobNumber}}</div>
+                      <div v-else>{{scope.row.name}}</div>
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="phone" :label="$t('shou-ji')" width="120"></el-table-column>
-                <el-table-column prop="departmentName" :label="$t('lable.department')" width="220"></el-table-column>
                 <el-table-column :label="$t('jiao-se')" width="100">
                     <template slot-scope="scope">{{scope.row.roleName}}</template>
                 </el-table-column>
@@ -295,7 +303,7 @@
         <el-dialog :title="title" :visible.sync="dialogVisible" width="550px" >
             <el-form ref="form12" :model="insertForm" :rules="rules" label-width="80px">
                 <el-form-item :label="$t('lable.name')" prop="name">
-                    <el-input v-model="insertForm.name" :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    <el-input v-model="insertForm.name" :placeholder="$t('peaseenterthe')" clearable :disabled="user.userNameNeedTranslate == '1'"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('phone')" prop="phone">
                     <el-input v-model="insertForm.phone" :placeholder="$t('peaseenterthe')" clearable></el-input>
@@ -381,9 +389,8 @@
         <!-- 编辑超级管理员的Dialog -->
         <el-dialog :title="$t('editorialstaff')" :visible.sync="dialogVisible1" width="550px" >
             <el-form ref="form1" :model="insertForm" :rules="rules" label-width="80px">
-                
                 <el-form-item :label="$t('lable.name')" prop="name">
-                    <el-input v-model="insertForm.name" :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    <el-input v-model="insertForm.name" :placeholder="$t('peaseenterthe')" clearable :disabled="user.userNameNeedTranslate == '1'"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('phone')" prop="phone">
                     <el-input v-model="insertForm.phone" :placeholder="$t('peaseenterthe')" clearable></el-input>
@@ -696,6 +703,7 @@ export default {
   },
   data() {
     return {
+      fullscreenLoading: false,
       syncMembByCardTimeResultGialog:false,
       syncMembByCardTimeMsg:null,
       editSecret: false,
@@ -1060,6 +1068,43 @@ export default {
         }
       );
     },
+    // 从企业微信同步通讯录 (待测试)
+    newSyncWithCorpWx() {
+      const loading = this.$loading({
+          lock: true,
+          text: '同步中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+      this.http.post(
+        "/wxcorp/getCorpMembsFromPlatform",
+        {
+          companyId: this.user.companyId,
+        },
+        (res) => {
+          loading.close();
+          if (res.code == "ok") {
+            this.$message({
+              message: '同步成功',
+              type: "success",
+            });
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error",
+            });
+          }
+        },
+        (err) => {
+          loading.close();
+          this.tableLoading = false;
+          this.$message({
+            message: err,
+            type: "error",
+          });
+        }
+      );
+    },
     // 从钉钉同步通讯录
     syncWithCorpDingding() {
       this.$confirm(
@@ -3057,9 +3102,9 @@ export default {
     this.getProfessional();
     this.getStaffCountMax();
     // 获取企业微信的参数
-    if(this.user.companyId == '1081' || this.user.companyId == '7') {
-      this.agentConfig()
-    }
+    // if(this.user.companyId == '1081' || this.user.companyId == '7') {
+    //   this.agentConfig()
+    // }
   },
 };
 </script>