Explorar o código

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

QuYueTing hai 10 meses
pai
achega
1a992316a1

+ 6 - 0
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -567,6 +567,12 @@ public class SalesOrderController {
         unReceivedPayment=unReceivedPayment.add(oldMoney);
         salesOrder.setReceivedPayment(receivedPayment);
         salesOrder.setUnReceivedPayment(unReceivedPayment);
+        if(unReceivedPayment.doubleValue()>0){
+            salesOrder.setReceivedStatus(1);
+        }
+        if(receivedPayment.intValue()==0){
+            salesOrder.setReceivedStatus(0);
+        }
         if(!salesOrderService.updateById(salesOrder)){
             msg.setError("验证失败");
             return msg;

+ 7 - 2
fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -1127,7 +1127,12 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             return msg;
         }
         List<String> idList=new ArrayList<>(Arrays.asList(ids.split(",")));
-        List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().in("plan_procedure_id", idList));
+        List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().in("id", idList));
+        List<Report> reports = reportMapper.selectList(new LambdaQueryWrapper<Report>().in(Report::getUserProcedureTeamId, idList));
+        if(reports.size()>0){
+            msg.setError("存在以报工计划,请重新选择");
+            return msg;
+        }
         if(prodProcedureTeams.size()>0){
             List<ProdProcedureTeam> procedureTeams = prodProcedureTeams.stream().filter(ps -> ps.getUserId().equals(userId)).collect(Collectors.toList());
             if(procedureTeams.size()>0){
@@ -1146,7 +1151,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     public HttpRespMsg cancellationReceive(Integer id) {
         HttpRespMsg msg=new HttpRespMsg();
         String userId = request.getHeader("token");
-        List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("plan_procedure_id", id));
+        List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("id", id));
         if(prodProcedureTeams.size()>0){
             Optional<ProdProcedureTeam> first = prodProcedureTeams.stream().filter(ps -> ps.getUserId().equals(userId)).findFirst();
             if(first.isPresent()){

+ 3 - 3
fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -14,7 +14,7 @@
     <div class="distribution_con contentRoll">
       <div class="distribution_box" v-for="item,index in distributionList" :key="index">
         <div class="distribution_ItemBom">
-          <van-checkbox v-if="todayAndTomorrow" :disabled="item.checkboxDisabled  || item.teamNames.indexOf(user.name) == -1"  v-model="item.prodProcedure.isSelected"  @click="itemChecked" shape="square">
+          <van-checkbox v-if="todayAndTomorrow" :disabled="item.checkboxDisabled  || (item.teamNames&&item.teamNames.indexOf(user.name) == -1)"  v-model="item.prodProcedure.isSelected"  @click="itemChecked" shape="square">
           </van-checkbox>
           <div class="PlanItem">
             <span>{{item.prodProcedure.seq}}. {{ item.prodProcedure.name }}</span>
@@ -153,7 +153,7 @@ export default {
         let resArr=  this.distributionList.map(item=>{
           if(item.prodProcedure.isSelected){
             if(item.prodProcedureTeamList.filter(i=>i.userId==this.user.id).length>0){
-               return item.prodProcedureTeamList.filter(i=>i.userId==this.user.id)[0].planProcedureId
+               return item.prodProcedureTeamList.filter(i=>i.userId==this.user.id)[0].id
             }else{
               return "-1"
             }
@@ -357,7 +357,7 @@ export default {
           for(var i in arr) {
             arr[i].checkboxDisabled = true
             if(arr[i].prodProcedureTeamList&&arr[i].prodProcedureTeamList.length > 0) {
-              let arrList = arr[i].prodProcedureTeamList.filter(item => item.status == 0 && item.userId==this.user.id)
+              let arrList = arr[i].prodProcedureTeamList.filter(item => (item.status == 0||item.status == 1) && item.userId==this.user.id)
               console.log(arrList, 'arrList')
               if(arrList.length > 0) {
                 arr[i].checkboxDisabled = false

+ 34 - 1
fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -1715,5 +1715,38 @@
   "qingJiaShenHe": "Leave Review",
   "queDingYaoCheHuiGaiQingJiaShenQingMa": "Are you sure you want to withdraw the leave application",
   "shengYuJiaQi": "Remaining vacation",
-  "yiCheHui": "Withdrawn"
+  "yiCheHui": "Withdrawn",
+  "fanKuiJieGuo": "Feedback results",
+  "gongSiLieBiao": "Company List",
+  "gongSiMingCheng": "corporate name",
+  "keHuFanKui": "Customer feedback",
+  "lianXiFangShi": "contact information",
+  "qingShuRuKeHuFanKui": "Please enter customer feedback",
+  "shiFouLianXi": "Whether to contact",
+  "tiJiao": "Submit",
+  "tianXieChengGong": "Completed successfully",
+  "tianXieFanKui": "Fill in feedback",
+  "weiLianXi": "Not contacted",
+  "yiLianXi": "Contacted",
+  "zhuCeShiJian": "Registration time",
+  "gongChengZhuanYeLieBiao": "List of Engineering Majors",
+  "qingShuRuZhuanYeMingCheng": "Please enter the professional name",
+  "qingShuRuZhuanYeMingChengGuanJianZi": "Please enter the keyword of professional name",
+  "queDingYaoZhuanYe": "Make sure to be professional",
+  "shanChuZhuanYe": "Delete major",
+  "xinZengZhuanYe": "Newly added majors",
+  "xiuGaiZhuanYe": "Modify major",
+  "bianGengHouYuGuGongShi": "Estimated working hours after change",
+  "bianGengLiYou": "Reason for change",
+  "bianGengQianYuGuGongShi": "Estimated working hours before change",
+  "boHuiLiYou": "Reason for rejection",
+  "qingShuRuBoHuiLiYou": "Please enter the reason for rejection",
+  "qingXuanZeZhuangTai": "Please select a status",
+  "quXiaoBoHui": "Cancel rejection",
+  "renTian": "Human nature",
+  "shenHeRen": "Reviewed by:",
+  "tiJiaoRen": "submitter",
+  "tiJiaoShiJian": "Submission time",
+  "xiangMu": "project",
+  "yuGuGongShiBianGeng": "Estimated working hours change"
 }

+ 34 - 1
fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1715,5 +1715,38 @@
   "boHuiLeQingJiaShenQing": "驳回了请假申请",
   "qingJiaDan": "请假单",
   "shengYuJiaQi": "剩余假期",
-  "queDingYaoCheHuiGaiQingJiaShenQingMa": "确定要撤回该请假申请吗"
+  "queDingYaoCheHuiGaiQingJiaShenQingMa": "确定要撤回该请假申请吗",
+  "gongSiLieBiao": "公司列表",
+  "gongSiMingCheng": "公司名称",
+  "zhuCeShiJian": "注册时间",
+  "lianXiFangShi": "联系方式",
+  "shiFouLianXi": "是否联系",
+  "yiLianXi": "已联系",
+  "weiLianXi": "未联系",
+  "keHuFanKui": "客户反馈",
+  "tianXieFanKui": "填写反馈",
+  "fanKuiJieGuo": "反馈结果",
+  "tiJiao": "提 交",
+  "qingShuRuKeHuFanKui": "请输入客户反馈",
+  "tianXieChengGong": "填写成功",
+  "gongChengZhuanYeLieBiao": "工程专业列表",
+  "qingShuRuZhuanYeMingChengGuanJianZi": "请输入专业名称关键字",
+  "xinZengZhuanYe": "新增专业",
+  "qingShuRuZhuanYeMingCheng": "请输入专业名称",
+  "xiuGaiZhuanYe": "修改专业",
+  "queDingYaoZhuanYe": "确定要专业",
+  "shanChuZhuanYe": "删除专业",
+  "xiangMu": "项目:",
+  "shenHeRen": "审核人:",
+  "qingXuanZeZhuangTai": "请选择状态",
+  "tiJiaoRen": "提交人",
+  "tiJiaoShiJian": "提交时间",
+  "bianGengQianYuGuGongShi": "变更前预估工时",
+  "renTian": "人天",
+  "yuGuGongShiBianGeng": "预估工时变更",
+  "bianGengHouYuGuGongShi": "变更后预估工时",
+  "bianGengLiYou": "变更理由",
+  "boHuiLiYou": "驳回理由",
+  "qingShuRuBoHuiLiYou": "请输入驳回理由",
+  "quXiaoBoHui": "取消驳回"
 }

+ 17 - 17
fhKeeper/formulahousekeeper/timesheet/src/views/market/list.vue

@@ -3,7 +3,7 @@
         <!--工具条-->
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
             <el-form :inline="true">
-                <el-form-item label="公司列表">
+                <el-form-item :label="$t('gongSiLieBiao')">
                     
                 </el-form-item>
             </el-form>
@@ -16,20 +16,20 @@
                         {{scope.$index+1+(page-1)*size}}
                     </template>
             </el-table-column>
-            <el-table-column prop="companyName" label="公司名称"  ></el-table-column>
-            <el-table-column prop="cTime" label="注册时间"  ></el-table-column>
-            <el-table-column prop="name" label="联系人" ></el-table-column>
-            <el-table-column prop="phone" label="联系方式"  width="150"></el-table-column>
-            <el-table-column prop="contacted" label="是否联系" >
+            <el-table-column prop="companyName" :label="$t('gongSiMingCheng')"  ></el-table-column>
+            <el-table-column prop="cTime" :label="$t('zhuCeShiJian')"  ></el-table-column>
+            <el-table-column prop="name" :label="$t('contact')" ></el-table-column>
+            <el-table-column prop="phone" :label="$t('lianXiFangShi')"  width="150"></el-table-column>
+            <el-table-column prop="contacted" :label="$t('shiFouLianXi')" >
                 <template slot-scope="scope">
-                    <font v-if="scope.row.contacted" color="green">已联系</font>
-                    <font v-if="!scope.row.contacted" color="red">未联系</font>
+                    <font v-if="scope.row.contacted" color="green">{{ $t('yiLianXi') }}</font>
+                    <font v-if="!scope.row.contacted" color="red">{{ $t('weiLianXi') }}</font>
                 </template>
             </el-table-column>
-            <el-table-column prop="feedback" label="客户反馈" ></el-table-column>
-            <el-table-column label="操作" width="290">
+            <el-table-column prop="feedback" :label="$t('keHuFanKui')" ></el-table-column>
+            <el-table-column :label="$t('operation')" width="290">
                 <template slot-scope="scope">
-                    <el-button size="small" type="primary" @click="handleAdd(scope.$index, scope.row)">填写反馈</el-button>
+                    <el-button size="small" type="primary" @click="handleAdd(scope.$index, scope.row)">{{ $t('tianXieFanKui') }}</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -51,16 +51,16 @@
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-form ref="form1" :model="addForm" :rules="rules" label-width="100px">
                 
-                <el-form-item label="公司名称" prop="companyName">
+                <el-form-item :label="$t('gongSiMingCheng')" prop="companyName">
                     {{addForm.companyName}}
                 </el-form-item>
-                <el-form-item label="反馈结果">
+                <el-form-item :label="$t('fanKuiJieGuo')">
                     <el-input type="area" v-model="addForm.feedback"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click.native="addFormVisible = false">取消</el-button>
-                <el-button type="primary" @click="submitInsert" :loading="addLoading">提交</el-button>
+                <el-button @click.native="addFormVisible = false">{{ $t('quXiao') }}</el-button>
+                <el-button type="primary" @click="submitInsert" :loading="addLoading">{{ $t('tiJiao') }}</el-button>
             </div>
         </el-dialog>
 
@@ -113,7 +113,7 @@
                     feedback:null,
                 },
                 rules: {
-                    feedback: [{ required: true, message: "请输入客户反馈", trigger: "blur" }],
+                    feedback: [{ required: true, message: this.$t('qingShuRuKeHuFanKui'), trigger: "blur" }],
                 }
             };
         },
@@ -194,7 +194,7 @@
                             this.addLoading = false;
                             if (res.code == "ok") {
                                 this.$message({
-                                    message: "填写成功",
+                                    message: this.$t('tianXieChengGong'),
                                     type: "success"
                                 });
                                 this.addFormVisible = false;

+ 18 - 18
fhKeeper/formulahousekeeper/timesheet/src/views/profession/list.vue

@@ -3,18 +3,18 @@
         <!--工具条-->
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
             <el-form :inline="true">
-                <el-form-item label="工程专业列表">
+                <el-form-item :label="$t('gongChengZhuanYeLieBiao')">
                     
                 </el-form-item>
                 <el-form-item >
                     <div>
-                    <el-input style="float:left;" v-model="keyword" class="input-with-select" placeholder="请输入专业名称关键字" clearable="true" @keyup.enter.native="searchList()">
+                    <el-input style="float:left;" v-model="keyword" class="input-with-select" :placeholder="$t('qingShuRuZhuanYeMingChengGuanJianZi')" clearable="true" @keyup.enter.native="searchList()">
                         <el-button slot="append" @click="searchList" icon="el-icon-search"></el-button>
                     </el-input>
                     </div>
                 </el-form-item>
                 <el-form-item style="float:right;">
-                    <el-link type="primary" :underline="false" @click="handleAdd(-1,null)">新增专业</el-link>
+                    <el-link type="primary" :underline="false" @click="handleAdd(-1,null)">{{ $t('xinZengZhuanYe') }}</el-link>
                 </el-form-item>
             </el-form>
         </el-col>
@@ -26,13 +26,13 @@
                         {{scope.$index+1+(page-1)*size}}
                     </template>
             </el-table-column>
-            <el-table-column prop="name" label="专业名称" >
+            <el-table-column prop="name" :label="$t('nameprofessional')" >
             </el-table-column>
             
-            <el-table-column label="操作" width="150">
+            <el-table-column :label="$t('operation')" width="150">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="primary" @click="handleAdd(scope.$index, scope.row)">编辑</el-button>
-                    <el-button size="mini"  @click="deletePro(scope.$index, scope.row)">删除</el-button>
+                    <el-button size="mini" type="primary" @click="handleAdd(scope.$index, scope.row)">{{ $t('bian-ji') }}</el-button>
+                    <el-button size="mini"  @click="deletePro(scope.$index, scope.row)">{{ $t('btn.delete') }}</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -53,13 +53,13 @@
         <!--新增界面-->
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
-                <el-form-item label="专业名称" prop="name">
-                    <el-input v-model="addForm.name" :max="20" placeholder="请输入专业名称" clearable></el-input>
+                <el-form-item :label="$t('nameprofessional')" prop="name">
+                    <el-input v-model="addForm.name" :max="20" :placeholder="$t('qingShuRuZhuanYeMingCheng')" clearable></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer;">
-                <el-button @click.native="addFormVisible = false">取消</el-button>
-                <el-button type="primary" @click="submitInsert" :loading="addLoading">提交</el-button>
+                <el-button @click.native="addFormVisible = false">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitInsert" :loading="addLoading">{{ $t('btn.submit') }}</el-button>
             </div>
         </el-dialog>
     </section>
@@ -105,7 +105,7 @@
                     name: ''
                 },
                 rules: {
-                    name: [{ required: true, message: "请输入专业名称", trigger: "blur" }],
+                    name: [{ required: true, message: this.$t('qingShuRuZhuanYeMingCheng'), trigger: "blur" }],
                 }
             };
         },
@@ -186,11 +186,11 @@
             //显示新增界面
             handleAdd(i, item) {
                 if(i == -1) {
-                    this.title = "新增专业";
+                    this.title = this.$t('xinZengZhuanYe');
                     this.addForm = {
                     }
                 } else {
-                    this.title = "修改专业";
+                    this.title = this.$t('xiuGaiZhuanYe');
                     this.addForm = JSON.parse(JSON.stringify(item));
                 }
                 this.addFormVisible = true;
@@ -227,9 +227,9 @@
             // 删除
             deletePro(i, item) {
                 console.log(item, '要删除的')
-                this.$confirm("确定要专业" + item.name + "吗?","删除专业", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
+                this.$confirm(this.$t('queDingYaoZhuanYe') + item.name + this.$t('ma'),this.$t('shanChuZhuanYe'), {
+                    confirmButtonText: this.$t('btn.determine'),
+                    cancelButtonText: this.$t('btn.cancel'),
                     type: "warning"
                 })
                 .then(() => {
@@ -241,7 +241,7 @@
                         this.listLoading = false;
                         if (res.code == "ok") {
                             this.$message({
-                                message: "删除成功",
+                                message: this.$t('message.successfullyDeleted'),
                                 type: "success"
                             });
                             this.getList();

+ 31 - 31
fhKeeper/formulahousekeeper/timesheet/src/views/project/budgetReview.vue

@@ -5,14 +5,14 @@
                 <!-- 日期 -->
                 <div class="budgetReviewHeader_FormItem">
                     <el-date-picker size="small" v-model="screeningConditionForm.dateRange" :editable="false"
-                        format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="false" :range-separator="'至'"
-                        type="daterange" :start-placeholder="'开始日期'" :end-placeholder="'结束日期'" style="width: 260px"
+                        format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="false" :range-separator="$t('other.to')"
+                        type="daterange" :start-placeholder="$t('selectstartdate')" :end-placeholder="$t('time.endDate')" style="width: 260px"
                         @change="getList"></el-date-picker>
                 </div>
                 <!-- 项目 -->
                 <div class="budgetReviewHeader_FormItem">
-                    <div class="budgetReviewHeader_FormItemText">项目:</div>
-                    <el-select v-model="screeningConditionForm.projectId" filterable placeholder="请选择项目" clearable
+                    <div class="budgetReviewHeader_FormItemText">{{ $t('xiangMu') }}</div>
+                    <el-select v-model="screeningConditionForm.projectId" filterable :placeholder="$t('defaultText.pleaseSelectSnItem')" clearable
                         size="small" @change="getList">
                         <el-option v-for="item in projectList" :key="item.id"
                             :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
@@ -23,8 +23,8 @@
                 </div>
                 <!-- 审核人 -->
                 <div class="budgetReviewHeader_FormItem">
-                    <div class="budgetReviewHeader_FormItemText">审核人:</div>
-                    <el-select v-model="screeningConditionForm.checkUserId" filterable placeholder="请选择审核人" clearable
+                    <div class="budgetReviewHeader_FormItemText">{{ $t('shenHeRen') }}</div>
+                    <el-select v-model="screeningConditionForm.checkUserId" filterable :placeholder="$t('message.Pleaseselectareviewer')" clearable
                         size="small" v-if="user.userNameNeedTranslate != 1" style="width: 130px;" @change="getList">
                         <el-option v-for="item in usersList" :key="item.id" :label="item.name + '\u3000' + item.jobNumber"
                             :value="item.id">
@@ -38,8 +38,8 @@
                 </div>
                 <!-- 审核状态 -->
                 <div class="budgetReviewHeader_FormItem">
-                    <div class="budgetReviewHeader_FormItemText">审核状态:</div>
-                    <el-select v-model="screeningConditionForm.status" filterable placeholder="请选择状态" clearable size="small"
+                    <div class="budgetReviewHeader_FormItemText">{{ $t('other.approvalStatus') }}:</div>
+                    <el-select v-model="screeningConditionForm.status" filterable :placeholder="$t('qingXuanZeZhuangTai')" clearable size="small"
                         style="width: 120px;" @change="getList">
                         <el-option v-for="item in auditStatus" :key="item.id" :label="item.label" :value="item.id">
                         </el-option>
@@ -47,13 +47,13 @@
                 </div>
             </div>
             <div class="budgetReviewHeader_btn">
-                <el-button type="primary" size="small" @click="exportReport" :loading="exporListLoading">导出</el-button>
+                <el-button type="primary" size="small" @click="exportReport" :loading="exporListLoading">{{ $t('export.export') }}</el-button>
             </div>
         </div>
         <!--列表-->
         <el-table :data="list" ref="multipleTable" highlight-current-row v-loading="listLoading" :height="tableHeight"
             style="width: 100%;">
-            <el-table-column prop="projectName" :label="'项目名称'" sortable min-width="200px">
+            <el-table-column prop="projectName" :label="$t('headerTop.projectName')" sortable min-width="200px">
                 <template slot-scope="scope">
                     <div>
                         <span>
@@ -63,7 +63,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column prop="groupName" :label="'分组名称'" sortable min-width="180px">
+            <el-table-column prop="groupName" :label="$t('groupname')" sortable min-width="180px">
                 <template slot-scope="scope">
                     <div>
                         <span>
@@ -73,7 +73,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column prop="creator" :label="'提交人'" sortable min-width="120px">
+            <el-table-column prop="creator" :label="$t('tiJiaoRen')" sortable min-width="120px">
                 <template slot-scope="scope">
                     <div>
                         <span v-if="user.userNameNeedTranslate == '1'">
@@ -86,7 +86,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column prop="createTime" :label="'提交时间'" sortable min-width="120px">
+            <el-table-column prop="createTime" :label="$t('tiJiaoShiJian')" sortable min-width="120px">
                 <template slot-scope="scope">
                     <div>
                         <span>
@@ -95,37 +95,37 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column prop="oldManDay" :label="'变更前预估工时'" sortable min-width="150px">
+            <el-table-column prop="oldManDay" :label="$t('bianGengQianYuGuGongShi')" sortable min-width="150px">
                 <template slot-scope="scope">
                     <div>
                         <span>
-                            {{ scope.row.oldManDay }}人天 / {{ scope.row.oldEstimatedWorkTime }}小时
+                            {{ scope.row.oldManDay }}{{ $t('renTian') }} / {{ scope.row.oldEstimatedWorkTime }} {{ $t('time.hour') }}
                         </span>
                     </div>
                 </template>
             </el-table-column>
 
-            <el-table-column prop="changeManDay" :label="'预估工时变更'" sortable min-width="150px">
+            <el-table-column prop="changeManDay" :label="$t('yuGuGongShiBianGeng')" sortable min-width="150px">
                 <template slot-scope="scope">
                     <div>
                         <span>
-                            {{ scope.row.changeManDay }}人天 / {{ scope.row.changeEstimatedWorkTime }}小时
+                            {{ scope.row.changeManDay }}{{ $t('renTian') }} / {{ scope.row.changeEstimatedWorkTime }}{{ $t('time.hour') }}
                         </span>
                     </div>
                 </template>
             </el-table-column>
 
-            <el-table-column prop="nowManDay" :label="'变更后预估工时'" sortable min-width="150px">
+            <el-table-column prop="nowManDay" :label="$t('bianGengHouYuGuGongShi')" sortable min-width="150px">
                 <template slot-scope="scope">
                     <div>
                         <span>
-                            {{ scope.row.nowManDay }}人天 / {{ scope.row.nowEstimatedWorkTime }}小时
+                            {{ scope.row.nowManDay }}{{ $t('renTian') }} / {{ scope.row.nowEstimatedWorkTime }}{{ $t('time.hour') }}
                         </span>
                     </div>
                 </template>
             </el-table-column>
 
-            <el-table-column prop="remark" :label="'变更理由'" sortable width="200px">
+            <el-table-column prop="remark" :label="$t('bianGengLiYou')" sortable width="200px">
                 <template slot-scope="scope">
                     <div>
                         <div v-if="scope.row.remark && scope.row.remark.length > 11">
@@ -140,7 +140,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column prop="rejectReason" :label="'驳回理由'" sortable width="200px">
+            <el-table-column prop="rejectReason" :label="$t('boHuiLiYou')" sortable width="200px">
                 <template slot-scope="scope">
                     <div>
                         <div v-if="scope.row.rejectReason && scope.row.rejectReason.length > 11">
@@ -197,9 +197,9 @@ export default {
             searchUsersList: [],
             projectList: [],
             auditStatus: [
-                { id: 1, label: '待审核' },
-                { id: 2, label: '审核通过' },
-                { id: 3, label: '已驳回' }
+                { id: 1, label: this.$t('state.WaitingAudit') },
+                { id: 2, label: this.$t('state.approved') },
+                { id: 3, label: this.$t('state.rejected') }
             ],
 
             screeningConditionForm: {
@@ -218,15 +218,15 @@ export default {
     methods: {
         review(id,checkType){
             if(checkType==2){
-                this.$prompt('请输入驳回理由', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+                this.$prompt(this.$t('qingShuRuBoHuiLiYou'), this.$t('other.prompts'), {
+                confirmButtonText: this.$t('btn.determine'),
+                cancelButtonText: this.$t('btn.cancel'),
                 }).then(({ value }) => {
                 this.http.post("/group-budget-review/check", {id:id,checkType:checkType,rejectReason:value},
                     res => {
                     if (res.code == "ok") {
                         this.$message({
-                            message:"操作成功",
+                            message:this.$t('operationissuccessful'),
                             type: "success"
                         });
                         this.getList();
@@ -246,7 +246,7 @@ export default {
                 }).catch(() => {
                     this.$message({
                         type: 'info',
-                        message: '取消驳回'
+                        message: this.$t('quXiaoBoHui')
                     });       
                     });
                 }else{
@@ -254,7 +254,7 @@ export default {
                     res => {
                     if (res.code == "ok") {
                         this.$message({
-                            message:"操作成功",
+                            message:this.$t('operationissuccessful'),
                             type: "success"
                         });
                         this.getList();
@@ -382,7 +382,7 @@ export default {
                     if (res.code == "ok") {
                         var filePath = res.data;
                         const a = document.createElement('a'); // 创建a标签
-                        a.setAttribute('download', '预估工时审核');// download属性
+                        a.setAttribute('download', this.$t('navigation.budgetReview'));// download属性
                         a.setAttribute('href', filePath);// href链接
                         a.click(); //自执行点击事件
                         a.remove();