Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -1747,5 +1747,14 @@
   "tiJiaoRen": "submitter",
   "tiJiaoShiJian": "Submission time",
   "xiangMu": "project",
-  "yuGuGongShiBianGeng": "Estimated working hours change"
+  "yuGuGongShiBianGeng": "Estimated working hours change",
+  "chenBenTongJi": "Cost statistics",
+  "daoChuNeiRon": "Export Content",
+  "gongHhiZhanbiXmu": "Including the proportion of project working hours",
+  "gongShiHeChengBen": "Working hours and costs",
+  "hanZhuXiangMu": "Including the main project",
+  "jingChenBen": "Cost only",
+  "jingGongShi": "Only working hours",
+  "liMian": "inside",
+  "waiMian": "outside"
 }

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

@@ -1747,5 +1747,14 @@
   "bianGengLiYou": "变更理由",
   "boHuiLiYou": "驳回理由",
   "qingShuRuBoHuiLiYou": "请输入驳回理由",
-  "quXiaoBoHui": "取消驳回"
+  "quXiaoBoHui": "取消驳回",
+  "daoChuNeiRon": "导出内容",
+  "gongShiHeChengBen": "工时和成本",
+  "jingGongShi": "仅工时",
+  "jingChenBen": "仅成本",
+  "gongHhiZhanbiXmu": "含项目工时占比",
+  "hanZhuXiangMu": "含主项目",
+  "chenBenTongJi": "成本统计",
+  "liMian": "里面",
+  "waiMian": "外面"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -66,13 +66,13 @@
             <div id="container" ref="container" :style="'height:'+(containerHeight - 20)+'px;width:100%'"></div>
             <div class="poss" :style="`width:${possWidth}px;`">
                 <div class="poss-btn">
-                    <el-radio-group v-model="possradio" size="small" @change="onYAxisChange" v-if="radio == '项目'">
-                        <el-radio-button label="1">项目名称</el-radio-button>
-                        <el-radio-button label="2">项目编号</el-radio-button>
+                    <el-radio-group v-model="possradio" size="small" @change="onYAxisChange" v-if="radio == $t('other.project')">
+                        <el-radio-button label="1">{{ $t('headerTop.projectName') }}</el-radio-button>
+                        <el-radio-button label="2">{{ $t('Itemno') }}</el-radio-button>
                     </el-radio-group>
-                    <el-radio-group v-model="departmentadio" size="small" @change="departmentPersonnelSwitch" v-if="radio == '部门' && this.parentDeptId">
-                        <el-radio-button label="1">部门</el-radio-button>
-                        <el-radio-button label="2">人员</el-radio-button>
+                    <el-radio-group v-model="departmentadio" size="small" @change="departmentPersonnelSwitch" v-if="radio == $t('lable.department') && this.parentDeptId">
+                        <el-radio-button label="1">{{ $t('lable.department') }}</el-radio-button>
+                        <el-radio-button label="2">{{ $t('ren-yuan') }}</el-radio-button>
                     </el-radio-group>
                 </div>
                 <el-pagination
@@ -107,11 +107,11 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="exportContent" label="导出内容" v-if="permissions.countCost && permissions.countHours && (radio == $t('other.project') || radio == $t('projectclassification'))">
+                <el-form-item prop="exportContent" :label="$t('daoChuNeiRon')" v-if="permissions.countCost && permissions.countHours && (radio == $t('other.project') || radio == $t('projectclassification'))">
                     <el-select v-model="exportParam.exportContent" style="width:350px;" filterable="true" popper-class="projectSelectPopperClass">
-                        <el-option label="工时和成本" value="hoursAndCost"></el-option>
-                        <el-option label="仅工时" value="hours"></el-option>
-                        <el-option label="仅成本" value="cost"></el-option>
+                        <el-option :label="$t('gongShiHeChengBen')" value="hoursAndCost"></el-option>
+                        <el-option :label="$t('jingGongShi')" value="hours"></el-option>
+                        <el-option :label="$t('jingChenBen')" value="cost"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item :label="$t('departmentchoice')" v-if="radio == $t('other.project')">
@@ -181,13 +181,13 @@
                     </div>
                 </el-form-item>
                 <el-form-item v-if="exportParam.type == 1 && permissions.countHours && (radio == $t('other.project'))">
-                    <el-checkbox v-model="exportParam.withPercent" >含项目工时占比</el-checkbox>
+                    <el-checkbox v-model="exportParam.withPercent" >{{ $t('gongHhiZhanbiXmu') }}</el-checkbox>
                 </el-form-item>
                 <el-form-item v-if="radio == $t('zhu-xiang-mu') || ((radio == $t('other.project') || radio == $t('projectclassification')) && exportParam.type == '0')">
                     <el-checkbox v-model="exportParam.projectSum" >{{ $t('individualprojectdata') }}</el-checkbox>
                 </el-form-item>
                 <el-form-item v-if="radio == $t('ren-yuan') && user.timeType.mainProjectState == 1">
-                    <el-checkbox v-model="exportParam.mainProjectColumn" >含主项目</el-checkbox>
+                    <el-checkbox v-model="exportParam.mainProjectColumn" >{{ $t('hanZhuXiangMu') }}</el-checkbox>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -470,7 +470,7 @@
                         endDate: this.exportParam.dateRange[1],
                         projectId: this.exportParam.projectId,
                     }
-                    fileName = this.radio + '成本统计' + '.xlsx'
+                    fileName = this.radio + this.$t('chenBenTongJi') + '.xlsx'
                 }
                 this.exporting = true;
                 this.http.post(url, param,
@@ -590,7 +590,7 @@
                         }
                     } else { 
                         this.$message({
-                        message: res.msg + '里面',
+                        message: res.msg + this.$t('liMian'),
                         type: "error"
                         });
                     }
@@ -598,7 +598,7 @@
                 error => {
                     this.radioLoading = false
                     this.$message({
-                        message: error + '外面',
+                        message: error + this.$t('waiMian'),
                         type: "error"
                     });
                 });
@@ -716,7 +716,7 @@
                                         if(!name) {
                                             return ''
                                         }
-                                        const unit = yAxisValue == 0 ? '元' : '小时';
+                                        const unit = yAxisValue == 0 ? this.$t('yuan') : this.$t('time.hour');
                                         console.log(nameObj, name, nameObj[name], params)
                                         const totalValue = yAxisValue == 0 ? nameObj[name].moneyTol : nameObj[name].timeTol;
                                         return seriesName === cerName ? `${totalValue ? totalValue.toFixed(0) : 0} ${unit}` : '';