翻译完成 awayOffice 文件

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

@@ -1525,5 +1525,13 @@
   "minMaxCheck": "report time min value should not be greater than the max value",
   "budget": "general budget",
   "areyousuretosynchronize": "Are you sure to synchronize your contacts from DingTalk? (It may take some loading time, please be patient.)",
-  "expenses": "Expense reporting"
+  "expenses": "Expense reporting",
+  "chu-cha-shen-he": "Business trip review",
+  "bo-hui-le-qing-jia-shen-qing": "Rejected leave application",
+  "que-ding-yao-che-hui-gai-chu-cha-shen-qing-ma": "Are you sure you want to withdraw this business trip application",
+  "yi-cun-zai-zhong-fu-bu-men": "Duplicate department already exists",
+  "yi-cun-zai-zhong-fu-ren-yuan": "There are already duplicate personnel present",
+  "zhi-shao-xuan-ze-yi-ge-bu-men-huo-zhe-ren-yuan-zuo-wei-shen-he-ren": "Select at least one department or personnel as the reviewer",
+  "zhong-xin-ti-jiao": "Resubmit",
+  "zhu-yao-fu-ze-ren": "(Main person in charge)"
 }

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

@@ -27,9 +27,9 @@
     "basicSystemSettings": "系统基础设置",
     "roleRightsManagement": "角色权限管理",
     "projectFormSettings": "项目表单设置",
-    "budgetReview":"预估工时审核",
-    "gongshitongji":"工时统计表",
-    "caiwushenhe":"财务审核"
+    "budgetReview": "预估工时审核",
+    "gongshitongji": "工时统计表",
+    "caiwushenhe": "财务审核"
   },
   "role": {
     "ordinaryEmployees": "普通员工",
@@ -527,7 +527,7 @@
   "taskthatisoverdue": "已超期的任务",
   "yi-ban": "一般",
   "zhong-yao": "重要",
-  "AuditProcess":"审核流程设置",
+  "AuditProcess": "审核流程设置",
   "jin-ji": "紧急",
   "makesuretodeletethesubproject": "确定要删除子项目",
   "ma": "吗?",
@@ -1525,5 +1525,13 @@
   "que-ding-yao-shan-chu-gai-he-tong-ma": "确定要删除该合同吗?",
   "que-ding-yao-shan-chu-gai-wen-jian-ma": "确定要删除该文件吗?",
   "he-tong-guan-li-dao-ru-mo-ban": "合同管理导入模板",
-  "minMaxCheck": "工时下限不得大于上限"
+  "minMaxCheck": "工时下限不得大于上限",
+  "chu-cha-shen-he": "出差审核",
+  "zhu-yao-fu-ze-ren": "(主要负责人)",
+  "zhong-xin-ti-jiao": "重新提交",
+  "bo-hui-le-qing-jia-shen-qing": "驳回了请假申请",
+  "que-ding-yao-che-hui-gai-chu-cha-shen-qing-ma": "确定要撤回该出差申请吗",
+  "zhi-shao-xuan-ze-yi-ge-bu-men-huo-zhe-ren-yuan-zuo-wei-shen-he-ren": "至少选择一个部门或者人员做为审核人",
+  "yi-cun-zai-zhong-fu-bu-men": "已存在重复部门",
+  "yi-cun-zai-zhong-fu-ren-yuan": "已存在重复人员"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -11,7 +11,7 @@
                 </el-menu-item>
                 <el-menu-item index="2" @select="bills" @click="auditList()" v-if="permissions.awayOfficeAudit">
                 <i class="iconfont firerock-iconshenhe"></i>
-                <span slot="title">出差审核</span>
+                <span slot="title">{{ $t('chu-cha-shen-he') }}</span>
                 </el-menu-item>
                 <el-menu-item index="3" @select="bills" @click="bills(false, 2)" >
                 <i class="iconfont firerock-iconbaoxiaodan"></i>
@@ -141,16 +141,16 @@
                             <el-input type="textarea" v-model="addform.remark" :rows="3" style="width: 100%" maxlength="100" show-word-limit></el-input>
                         </el-form-item>
                         <!--流程显示-->
-                        <el-form-item label="审批流程" style="width: 100%;color:#606266" >
+                        <el-form-item :label="$t('other.approvalProcess')" style="width: 100%;color:#606266" >
                         <span v-for="(item, index) in curWorkflowList" :key="item.id" >
                             <span v-if="index>0"><i class="el-icon-right"></i></span>
                             <span><i class="el-icon-s-custom"></i></span>
                             <span v-if="user.userNameNeedTranslate == 1">
-                            <span v-if="item.auditorType == 1"><TranslationOpenDataText type='departmentName' :openid='item.auditDeptName' ></TranslationOpenDataText>(主要负责人)</span>
+                            <span v-if="item.auditorType == 1"><TranslationOpenDataText type='departmentName' :openid='item.auditDeptName' ></TranslationOpenDataText>{{ $t('zhu-yao-fu-ze-ren') }}</span>
                             <TranslationOpenDataText type='userName' :openid='item.userName' v-if="item.auditorType == 2"></TranslationOpenDataText>
                             </span>
                             <span v-if="user.userNameNeedTranslate == 0">
-                            {{item.auditorType == 1?(item.auditDeptName+'(主要负责人)'):item.userName}}
+                            {{item.auditorType == 1?(item.auditDeptName+$t('zhu-yao-fu-ze-ren')):item.userName}}
                             </span>
                         </span>
                         </el-form-item>
@@ -295,9 +295,9 @@
                             <el-button icon="el-icon-close" circle size="mini"  @click.stop.native="deny(scope.row)"></el-button>
                         </div>
                         <div v-if="!isAuditList && ((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.awayOfficeAll)">
-                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2" @click.stop.native="deletes(scope.row)" >删除</el-button>
-                            <el-button size="mini" v-if="scope.row.status == 1" @click.stop.native="cancel(scope.row)">撤回</el-button>
-                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2 " type="primary" @click.stop.native="editor(scope.row)">重新提交</el-button>
+                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2" @click.stop.native="deletes(scope.row)" >{{ $t('btn.delete') }}</el-button>
+                            <el-button size="mini" v-if="scope.row.status == 1" @click.stop.native="cancel(scope.row)">{{ $t('btn.withdraw') }}</el-button>
+                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2 " type="primary" @click.stop.native="editor(scope.row)">{{ $t('zhong-xin-ti-jiao') }}</el-button>
                         </div>
                         </template>
                     </el-table-column>
@@ -735,8 +735,8 @@
                 <el-timeline-item v-for="item in auditLogList" :key="item.id" :timestamp="item.indate">
                   <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText> </span>
                   <span v-if="user.userNameNeedTranslate == 0">{{item.auditorName}}</span>
-                  <span> {{item.isPass==0?"驳回了请假申请。":"审核通过。"}}</span>
-                  <span v-if="item.isPass == 0">原因：{{item.denyReason}}</span>
+                  <span> {{item.isPass==0?`${$t('bo-hui-le-qing-jia-shen-qing')}`:`${$t('state.approved')}`}}</span>
+                  <span v-if="item.isPass == 0">{{ $t('other.reason') }}：{{item.denyReason}}</span>
                   </el-timeline-item>
             </el-timeline>
         </div>
@@ -1503,7 +1503,7 @@ export default {
                 if (res.code == "ok") {
                     this.auditList();
                     this.$message({
-                        message: '操作成功',
+                        message: this.$t('operationissuccessful'),
                         type: "success"
                         });
                 } else {
@@ -1533,7 +1533,7 @@ export default {
                     this.auditList();
                     this.denyDialogV = false;
                     this.$message({
-                        message: '操作成功',
+                        message: this.$t('operationissuccessful'),
                         type: "success"
                         });
                 } else {
@@ -1551,7 +1551,7 @@ export default {
             });
         },
         cancel(e) {
-            this.$confirm('确定要撤回该出差申请吗', this.$t('other.prompts'), {
+            this.$confirm(this.$t('que-ding-yao-che-hui-gai-chu-cha-shen-qing-ma'), this.$t('other.prompts'), {
                 //type: 'warning'
             }).then(() => {
                 this.http.post('/business-trip/cancel', {id:e.id},
@@ -1559,7 +1559,7 @@ export default {
                     if (res.code == "ok") {
                         this.bills();
                         this.$message({
-                            message: '操作成功',
+                            message: this.$t('operationissuccessful'),
                             type: "success"
                         });
                     } else {
@@ -1889,7 +1889,7 @@ export default {
                 });
             } else {
                 this.$message({
-                    message: '至少选择一个部门或者人员做为审核人',
+                    message: this.$t('zhi-shao-xuan-ze-yi-ge-bu-men-huo-zhe-ren-yuan-zuo-wei-shen-he-ren'),
                     type: "error"
                 });
             }
@@ -1926,12 +1926,12 @@ export default {
               if(!flgUserRadio) {
                 if(node.type == 'dep') {
                   this.$message({
-                      message: '已存在重复部门',
+                      message: this.$t('yi-cun-zai-zhong-fu-bu-men'),
                       type: "error"
                   });
                 } else {
                   this.$message({
-                      message: '已存在重复人员',
+                      message: this.$t('yi-cun-zai-zhong-fu-ren-yuan'),
                       type: "error"
                   });
                 }