直属审核人

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1024,7 +1024,7 @@
   "modifyworkinghours": "修改工作时长",
   "yuechengbenxiaoshi": "请输入成本 单位：元/小时",
   "effectivedate": "生效日期",
-  "immediatesuperior": "直属上级",
+  "immediatesuperior": "直属审核人",
   "entrytime": "入职时间",
   "postrank": "岗位职级",
   "joblevel": "请输入岗位职级别",

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

@@ -384,7 +384,7 @@
         <!-- 新增/编辑人员的Dialog -->
         <el-dialog :title="title" :visible.sync="dialogVisible" width="580px" :top="'7.5vh'">
             <div style="height: 62vh;overflow: auto;">
-              <el-form ref="form12" :model="insertForm" :rules="rules" label-width="80px">
+              <el-form ref="form12" :model="insertForm" :rules="rules" label-width="90px">
                   <el-form-item :label="$t('lable.name')" prop="name" v-if="user.userNameNeedTranslate != '1'">
                       <el-input v-model="insertForm.name" :placeholder="$t('peaseenterthe')" clearable :disabled="user.userNameNeedTranslate == '1'"></el-input>
                   </el-form-item>
@@ -423,14 +423,15 @@
                       <vueCascader :size="'medium'" :widthStr="'430'" :clearable="true && user.userNameNeedTranslate != 1" :subject="option" :subjectId="insertForm.departmentId" :radios="true" :distinction="'2'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" :disabled="user.userNameNeedTranslate == 1"></vueCascader>
 
                   </el-form-item>
-                  <!-- <el-form-item :label="$t('immediatesuperior')">
-                      <el-select v-model="insertForm.superiorId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" filterable clearable>
+                  <el-form-item :label="$t('immediatesuperior')" v-if="user.timeType.reportAuditType == 5">
+                      <el-select v-model="insertForm.superiorId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" filterable clearable v-if="user.userNameNeedTranslate != 1">
                           <el-option v-for="item in users" :label="item.name" :value="item.id" :key="item.id" :disabled="item.id == insertForm.id">
                               <span style="float: left">{{item.name}}</span>
                               <span style="float: right; color: #8492a6; font-size: 13px">{{item.departmentName}}</span>
                           </el-option>
                       </el-select>
-                  </el-form-item> -->
+                      <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.managerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
+                  </el-form-item>
                   <el-form-item :label="$t('jiao-se')" prop="roleId" v-if="roleNameFlg != $t('role.superAdministrator')">
                       <el-select v-model="insertForm.roleId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%">
                           <el-option v-for="item in acquireRoleList" :label="item.rolename" :value="item.id" :key="item.name">