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

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4300,7 +4300,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             u.setTotalResult(String.format("%.2f",bigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", cost) + "元");
             u.setTotalPlanResult(String.format("%.2f",planBigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", planCost) + "元");
             u.setTotalSurplusResult(String.format("%.2f",surplusBigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", surplusCost) + "元");
-            u.setTotalTempResult(String.format("%.2f",tempBigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", tempCost) + "元");
+            u.setTotalTempResult(String.format("%.2f",tempBigDecimal.doubleValue()) + "小时 " + String.format("%.2f", tempCost) + "元");
         }
         resultMap.put("total",userIPage.getTotal());
         resultMap.put("records",userList);

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -94,7 +94,7 @@
                               <!-- <div @click.stop="showReportDetail(scope.row,item,0)" v-if="items.workTime>0">已填 {{items.workTime}}分钟  {{items.cost}}元 </div>{{items.leave}}
                               <div style="color: green;" @click.stop="showTempReportDetail(scope.row,item,0)" v-if="items.tempWorkTime>0||items.tempCost>0">临时报工 {{items.tempWorkTime}}分钟  {{items.tempCost}}元</div> -->
                               <div  v-if="items.workTime>0">已填 {{items.workTime}}分钟  {{items.cost}}元 </div>{{items.leave}}
-                              <div style="color: green;" v-if="items.tempWorkTime>0||items.tempCost>0">临时报工 {{items.tempWorkTime}}分钟  {{items.tempCost}}元</div>
+                              <div style="color: green;" v-if="items.tempWorkTime>0||items.tempCost>0">临时报工 {{items.tempWorkTime}}小时  {{items.tempCost}}元</div>
                               <div style="color: red;" v-if="items.surplusTime">剩余 {{items.surplusTime}}分钟  {{items.surplusCost}}元</div>
                             </div>
                         </div>
@@ -393,7 +393,7 @@
               <el-table-column prop="checkerName" label="质检人" width="180"></el-table-column>
               <el-table-column prop="working_time" label="工作时长" width="180">
                 <template slot-scope="scope" v-if="scope.row.working_time">
-                  {{scope.row.working_time}}分钟
+                  {{scope.row.working_time}}{{scope.row.planType==0?'分钟':'小时'}}
                 </template>
               </el-table-column>
             </el-table>

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

@@ -1748,5 +1748,19 @@
   "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",
+  "baoXiaoHeJi": "Total reimbursement",
+  "feiYongBaoXiaoChengBen": "Expense reimbursement cost",
+  "gongShiChengBen": "Labor cost",
+  "gongShiHeJi": "Total working hours",
+  "riQiQuJian": "Date range:"
 }

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

@@ -1748,5 +1748,19 @@
   "bianGengLiYou": "变更理由",
   "boHuiLiYou": "驳回理由",
   "qingShuRuBoHuiLiYou": "请输入驳回理由",
-  "quXiaoBoHui": "取消驳回"
+  "quXiaoBoHui": "取消驳回",
+  "daoChuNeiRon": "导出内容",
+  "gongShiHeChengBen": "工时和成本",
+  "jingGongShi": "仅工时",
+  "jingChenBen": "仅成本",
+  "gongHhiZhanbiXmu": "含项目工时占比",
+  "hanZhuXiangMu": "含主项目",
+  "chenBenTongJi": "成本统计",
+  "liMian": "里面",
+  "waiMian": "外面",
+  "riQiQuJian": "日期区间：",
+  "gongShiChengBen": "工时成本",
+  "gongShiHeJi": "工时合计",
+  "feiYongBaoXiaoChengBen": "费用报销成本",
+  "baoXiaoHeJi": "报销合计"
 }

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

@@ -77,7 +77,7 @@
                 <el-col :span="24">
                     <div class="box">
                         <div class="box_head">
-                            日期区间：
+                            {{ $t('riQiQuJian') }} 
                             <el-date-picker
                             v-model="dateSelect"
                             type="daterange"
@@ -95,23 +95,23 @@
                             <div class="boxBoxMax_con">
                                 <el-card class="box-card">
                                     <div slot="header" class="clearfix">
-                                        工时成本
+                                        {{ $t('gongShiChengBen') }} 
                                     </div>
                                     <div class="text item boxBoxMax_con_one">
-                                        <span>工时合计</span> {{ chengbenData.workingTime }} h 
+                                        <span>{{ $t('gongShiHeJi') }}</span> {{ chengbenData.workingTime }} h 
                                     </div>
                                     <div class="text item">
-                                        <span style="letter-spacing: 26px;">成本</span>￥ {{ chengbenData.cost }} 
+                                        <span style="letter-spacing: 26px;">{{ $t('costof') }}</span>￥ {{ chengbenData.cost }} 
                                     </div>
                                 </el-card>
                             </div>
                             <div class="boxBoxMax_con" v-if="user.company.packageExpense">
                                 <el-card class="box-card">
                                     <div slot="header" class="clearfix">
-                                        费用报销成本
+                                        {{ $t('feiYongBaoXiaoChengBen') }} 
                                     </div>
                                     <div class="text item boxBoxMax_con_two">
-                                       <span>报销合计 </span>￥ {{ chengbenData.expense }} 
+                                       <span>{{ $t('baoXiaoHeJi') }} </span>￥ {{ chengbenData.expense }} 
                                     </div>
                                 </el-card>
                             </div>

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}` : '';

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

@@ -21,7 +21,7 @@
                 <!-- <el-radio-button :label="部门"></el-radio-button> -->
                 <el-radio-button :label="$t('ren-yuan')"></el-radio-button>
                 <el-radio-button :label="$t('lable.department')"></el-radio-button>
-                <el-radio-button :label="'日期'"></el-radio-button>
+                <el-radio-button :label="$t('weekDay.date')"></el-radio-button>
                 <!-- <el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1"></el-radio-button> -->
             </el-radio-group>
         </el-col>
@@ -226,7 +226,7 @@
             //获取人员成本统计列表
             getUserCostList() {
                 this.listLoading = true;
-                let url = this.radio == this.$t('ren-yuan') ? '/department/getUserCustomDataStatistic' :this.radio == '日期'?'/report/getCustomDataWithDate': '/department/getDeptCustomDataStatistic'
+                let url = this.radio == this.$t('ren-yuan') ? '/department/getUserCustomDataStatistic' :this.radio == $t('weekDay.date')?'/report/getCustomDataWithDate': '/department/getDeptCustomDataStatistic'
                 this.http.post(url, {
                     startDate:this.user.timeType.fixMonthcost==0?this.dateRange[0]:this.dateRange, 
                     endDate: this.user.timeType.fixMonthcost==0?this.dateRange[1]:this.dateRange
@@ -473,7 +473,7 @@
                     url = '/project/getCustomDataSum';
                 // } else if (this.radio=='部门') {
                 //     url = '/department/getDeptCustomDataStatistic';
-                } else if (this.radio==this.$t('ren-yuan') || this.radio == this.$t('lable.department')||this.radio == '日期') {
+                } else if (this.radio==this.$t('ren-yuan') || this.radio == this.$t('lable.department')||this.radio == $t('weekDay.date')) {
                     this.getUserCostList();
                     return;
                 } else if (this.radio == this.namess) {
@@ -520,7 +520,7 @@
                                     totalHours += parseFloat(list[i].costTime);
                                 }
                             }
-                        } else if(this.radio == this.$t('ren-yuan') || this.radio=='日期') {
+                        } else if(this.radio == this.$t('ren-yuan') || this.radio==$t('weekDay.date')) {
                             list = res.data
                             var totalMoneyCost = 0;
                             for(var i in list) {
@@ -548,7 +548,7 @@
                         if(totalMoneyCost) {
                             this.zhishin = totalMoneyCost.toFixed(2)
                         } 
-                        if(this.radio == this.$t('other.project') || this.radio == this.$t('ren-yuan') || this.radio==this.$t('lable.department')|| this.radio=='日期') {
+                        if(this.radio == this.$t('other.project') || this.radio == this.$t('ren-yuan') || this.radio==this.$t('lable.department')|| this.radio==$t('weekDay.date')) {
                             var option = {
                                 title: {
                                     text: _this.user.timeType.customDataName+_this.$t('zong-ji')+'：' + totalHours,