Jelajahi Sumber

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

Min 10 bulan lalu
induk
melakukan
261b29417d

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

@@ -1714,5 +1714,25 @@
   "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"
 }

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

@@ -1714,5 +1714,25 @@
   "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": "删除专业"
 }

+ 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();

+ 4 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -908,7 +908,10 @@
                     this.listLoading = false;
                     if (res.code == "ok") {
                         for (let entry of res.data) {
-                            entry.reviewerNames = (entry.data || []).map(item => item.projectAuditorName);
+                            let reviewerNames = (entry.data || []).map(item => item.projectAuditorName);
+                            let uniqueReviewerNames = [...new Set(reviewerNames)];
+                            entry.reviewerNames = uniqueReviewerNames;
+                            // entry.reviewerNames = (entry.data || []).map(item => item.projectAuditorName);
                         }
                         this.listBackup = JSON.parse(JSON.stringify(res.data));
                         console.log(this.listBackup, "《====== 赋值")