Lijy 2 rokov pred
rodič
commit
5bd4648fba

+ 26 - 6
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -848,7 +848,7 @@
         </el-dialog>
 
         <!-- 按周填报弹窗 -->
-        <el-dialog :title="$t('defaultText.pleaseFillOut')" :visible.sync="tianxieDialogVisible" width="30%" :before-close="handleClose">
+        <el-dialog :title="$t('defaultText.pleaseFillOut')" :visible.sync="tianxieDialogVisible" width="500px" :before-close="handleClose">
             <div>
                 <div class="zhoFel" v-if="zhoBao.subProjectList != null && zhoBao.subProjectList.length > 0 && user.timeType.mainProjectState != 1">
                     <p>{{$t('lable.subproject')}}</p>
@@ -879,36 +879,42 @@
                 </div>
                 <div class="zhoFel" v-if="user.timeType.reportAuditType != 3">
                     <p>{{$t('other.reviewer')}}</p>
-                    <el-select v-model="zhoBao.projectAuditorId" :placeholder="$t('defaultText.pleaseChoose')" clearable="true" style="width: 355px">
+                    <el-select v-model="zhoBao.projectAuditorId" v-if="user.userNameNeedTranslate != 1" :placeholder="$t('defaultText.pleaseChoose')" clearable="true" style="width: 355px">
                         <el-option v-for="item in zhoBao.auditUserList" :key="item.id" :label="item.auditorName" :value="item.auditorId"></el-option>
                     </el-select>
+
+                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :widthStr="'355'" :subject="zhoBao.auditUserList" :subjectId="zhoBao.projectAuditorId" :distinction="'1'" @selectCal="selectCal"></selectCat>
                 </div>
 
                 <template v-if="user.timeType.reportAuditType == 3">
                     <div class="zhoFel">
                         <p>{{ $t('di-yi-shen-he-ren') }}</p>
-                        <el-select v-model="zhoBao.auditorFirst" :placeholder="$t('di-yi-shen-he-ren')" style="width: 355px">
+                        <el-select v-model="zhoBao.auditorFirst" v-if="user.userNameNeedTranslate != 1" :placeholder="$t('di-yi-shen-he-ren')" style="width: 355px">
                             <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :widthStr="'355'" :subject="allUsersList" :subjectId="zhoBao.auditorFirst" :distinction="'2'" @selectCal="selectCal"></selectCat>
                     </div>
                     <div class="zhoFel">
                         <p>{{ $t('di-er-shen-he-ren') }}</p>
-                        <el-select v-model="zhoBao.auditorSec" :placeholder="$t('di-er-shen-he-ren')" style="width: 355px">
+                        <el-select v-model="zhoBao.auditorSec" v-if="user.userNameNeedTranslate != 1" :placeholder="$t('di-er-shen-he-ren')" style="width: 355px">
                             <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :widthStr="'355'" :subject="allUsersList" :subjectId="zhoBao.auditorSec" :distinction="'3'" @selectCal="selectCal"></selectCat>
                     </div>
                     <div class="zhoFel">
                         <p>{{ $t('di-san-shen-he-ren') }}</p>
-                        <el-select v-model="zhoBao.auditorThird" :placeholder="$t('di-san-shen-he-ren')" style="width: 355px">
+                        <el-select v-model="zhoBao.auditorThird" v-if="user.userNameNeedTranslate != 1" :placeholder="$t('di-san-shen-he-ren')" style="width: 355px">
                             <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :widthStr="'355'" :subject="allUsersList" :subjectId="zhoBao.auditorThird" :distinction="'4'" @selectCal="selectCal"></selectCat>
                     </div>
 
                     <div class="zhoFel">
                         <p>{{ $t('chao-song-ren') }}</p>
-                        <el-select v-model="zhoBao.ccUserid" :placeholder="$t('defaultText.pleaseChoose')" clearable="true" style="width: 355px">
+                        <el-select v-model="zhoBao.ccUserid" v-if="user.userNameNeedTranslate != 1" :placeholder="$t('defaultText.pleaseChoose')" clearable="true" style="width: 355px">
                             <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :widthStr="'355'" :subject="allUsersList" :subjectId="zhoBao.ccUserid" :distinction="'5'" @selectCal="selectCal"></selectCat>
                     </div>
                 </template>
 
@@ -6296,6 +6302,20 @@
             },
             ]);
         },
+        // 自定义事件
+        selectCal(obj) {
+            if(obj.distinction == '1') {
+                this.zhoBao.projectAuditorId = obj.id
+            } else if(obj.distinction == '2') {
+                this.zhoBao.auditorFirst = obj.id
+            } else if(obj.distinction == '3') {
+                this.zhoBao.auditorSec = obj.id
+            } else if(obj.distinction == '4') {
+                this.zhoBao.auditorThird = obj.id
+            } else if(obj.distinction == '5') {
+                this.zhoBao.ccUserid = obj.id
+            }
+        }
     };
 </script>