提交dayily文件

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -41,7 +41,19 @@
                                     <span class="custom-tree-node"  style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node, data}">
                                         <!-- <span>{{ node.label }}</span> -->
                                         <span style="padding-right: 50px;box-sizing: border-box;overflow:hidden;text-overflow:ellipsis;line-height: 36px; display: inline-block;">
-                                            {{ node.label }}<span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
+                                            <span v-if="user.userNameNeedTranslate == '1'">
+                                                <span v-if="node.data.children">
+                                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                                </span>
+                                                <span v-else>
+                                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                                </span>
+                                            </span>
+                                            <span v-if="user.userNameNeedTranslate != '1'">
+                                                {{ node.label }}
+                                            </span>
+                                            
+                                            <span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
                                         </span>
                                         
                                         <div style="position: absolute;right: 15px;">
@@ -91,7 +103,12 @@
                             <div class="report_title" style="display:flex;justify-content: space-between;">
                                 <span>
                                     <span>{{$t('other.dailyWork')}} ({{curDate}})</span>
-                                    <span v-if="permissions.reportsCompany||user.manageDeptId != 0 || permissions.reportsDept">| {{depData != null ?depData.label:""}}
+                                    <span v-if="permissions.reportsCompany||user.manageDeptId != 0 || permissions.reportsDept"> | 
+                                        <!-- {{depData != null ?depData.label:""}} -->
+                                        <span v-if="translation == '1' && user.userNameNeedTranslate == '1'">{{depData != null ?depData.label:""}}</span>
+                                        <span v-if="translation == '2' && user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='depData.label'></ww-open-data></span>
+                                        <span v-if="translation == '3' && user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='depData.label'></ww-open-data></span>
+                                        <span v-if="user.userNameNeedTranslate != '1'">{{depData != null ?depData.label:""}}</span>
                                     <span v-if="targetUid == null">
                                     <!-- - 已提交 -->
                                     -{{$t('state.hasBeenSubmitted')}}
@@ -118,7 +135,14 @@
                             </div>
                             <div :style="'height:'+(tableHeight-50)+'px;overflow:scroll;padding-top:10px;'">
                                 <div class="one_daily" v-for="(item1,index1) in reportList" :key="index1">
-                                    <i class="fa fa-circle"></i>{{item1.name}}
+                                    <i class="fa fa-circle"></i>
+                                    <!-- {{item1.name}} -->
+                                    <span v-if="user.userNameNeedTranslate == '1'">
+                                        <ww-open-data type='userName' :openid='item1.name'></ww-open-data>
+                                    </span>
+                                    <span v-if="user.userNameNeedTranslate != '1'">
+                                        {{item1.name}}
+                                    </span>
                                     <span style="margin-left:30px;">
                                         <span style="margin-right:20px;">
                                             <!-- <i v-if="parseFloat(item1.reportTime)>parseFloat(item1.calculateTime)+0.5" style="color:red;margin-right:8px;" class="fa fa-exclamation-triangle"></i> -->
@@ -150,17 +174,29 @@
                                                         <span v-if="item2.isDeptAudit==0">
                                                             <span v-if="item2.projectAuditState==0">
                                                                 <!-- 待项目审核人 --> {{$t('other.waitForTheProjectReviewer')}}
-                                                                <span v-if="item2.projectAuditorName != null">({{item2.projectAuditorName}})</span> 
+                                                                <span v-if="item2.projectAuditorName != null">(
+                                                                    <!-- {{item2.projectAuditorName}} -->
+                                                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data></span>
+                                                                    <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
+                                                                    )</span> 
                                                                 <!-- 审核 --> {{$t('other.audit')}}
                                                             </span>
                                                             <span style="color:#32CD32;" v-else-if="item2.projectAuditState==1">
                                                                 <!-- 项目审核人 --> {{$t('other.projectAuditor')}}
-                                                                <span v-if="item2.projectAuditorName != null">({{item2.projectAuditorName}})</span>
+                                                                <span v-if="item2.projectAuditorName != null">(
+                                                                    <!-- {{item2.projectAuditorName}} -->
+                                                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data></span>
+                                                                    <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
+                                                                    )</span>
                                                                 <!-- 审核通过 --> {{$t('state.approved')}}
                                                             </span>
                                                         </span>
                                                         <span v-else-if="item2.isDeptAudit==1">
-                                                            {{($t('other.await') +' '+ item2.auditDeptName +' '+ $t('other.audit'))}}
+                                                            <!-- {{($t('other.await') +' '+ item2.auditDeptName +' '+ $t('other.audit'))}} -->
+                                                            ({{$t('other.await')}}
+                                                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item2.auditDeptName'></ww-open-data></span>
+                                                            <span v-if="user.userNameNeedTranslate != '1'">{{item2.auditDeptName}}</span>
+                                                            {{$t('other.audit')}})
                                                         </span>
                                                         ]</span> 
                                                     <span style="margin-left:15px;color:#DAA520;" v-else-if="item2.state == -1">[ {{$t('other.importWaitingForReview')}} ]</span>
@@ -403,7 +439,11 @@
                     </el-form-item>
                     <el-form-item :label="user.companyId==781? $t('other.reviewer') : $t('other.projectAuditor')">
                         <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()">
-                            <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id"></el-option>
+                            <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id">
+                                <!-- <span style="float: left">{{ item.auditorName }}</span> -->
+                                <span style="float: left" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
+                                <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.auditorName}}</span>
+                            </el-option>
                         </el-select>
                     </el-form-item>
                     <!-- 相关维度/自定义维度 -->
@@ -516,7 +556,11 @@
                         </el-form-item>
                         <el-form-item :label="$t('other.projectAuditor')" >
                             <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()">
-                                <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id"></el-option>
+                                <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id">
+                                    <!-- <span style="float: left">{{ item.auditorName }}</span> -->
+                                    <span style="float: left" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
+                                    <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.auditorName}}</span>
+                                </el-option>
                             </el-select>
                         </el-form-item>
                         <!--工程专业版本模式下， 各个专业的进度填报 -->
@@ -1005,11 +1049,18 @@
 
             <el-table-column width="105" prop="name" fixed="left" :label="$t('lable.name')">
                 <template slot-scope="scope">
-                    <span :style="scope.row.worktimeList.length==0?'color:red':''">{{scope.row.name}}</span>
+                    <span :style="scope.row.worktimeList.length==0?'color:red':''">
+                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='scope.row.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate != 1">{{scope.row.name}}</span>
+                        <!-- {{scope.row.name}} -->
+                    </span>
                 </template>
             </el-table-column>
             <el-table-column prop="departmentName" fixed="left" :label="$t('lable.department')">
-                
+                <template slot-scope="scope">
+                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate != 1">{{scope.row.departmentName}}</span>
+                </template>
             </el-table-column>
             <el-table-column
               min-width="105"
@@ -1161,8 +1212,16 @@
             lazy
           >
             <el-table-column min-width="150" :label="$t('lable.department')" prop="department">
+                <template slot-scope="scope">
+                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='scope.row.department'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate != 1">{{scope.row.department}}</span>
+                </template>
             </el-table-column>
             <el-table-column min-width="150" prop="name" :label="$t('lable.name')" >
+                <template slot-scope="scope">
+                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='scope.row.name'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate != 1">{{scope.row.name}}</span>
+                </template>
             </el-table-column>
             <el-table-column
               min-width="200"
@@ -1319,7 +1378,7 @@
                 type="primary" @click="downloadCheckInExcel">{{$t('template.DownloadEmployeeHourStatisticsTemplate')}}.xlsx</el-link>
             <el-button @click="pre" v-if="active!=0">{{$t('btn.previousstep')}}</el-button>
             
-            <el-button @click="next" :disabled="importWxParam.date==null" v-if="active<2">{{$t('btn.nextstep')}}</el-button>
+            <el-button @click="next" :disabled="importWxParam.date==null" v-if="active<2">{{$t('btn.nextStep')}}</el-button>
             
             </span>
         </el-dialog>
@@ -1395,6 +1454,7 @@
         mixins: [dragMixin],
         data() {
             return {
+                translation: '1', // 1、文字, 2、部门, 3、人员
                 exportLoad: false,
                 getPickerOptions: {
                      disabledDate: (time) => {
@@ -3304,6 +3364,15 @@
                 for(var i in item) {
                     if(item[i].id == id) {
                         this.depData = item[i]
+                        if(id == '-1') {
+                            this.translation = '1'
+                        } else {
+                            if(item[i].children) {
+                                this.translation = '2'
+                            } else {
+                                this.translation = '3'
+                            }
+                        }
                         return
                     } else {
                         if(item[i].children) {