提交leave文件翻译

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

@@ -1707,5 +1707,12 @@
   "shenHeZhuangTai": "Review status:",
   "weiShenHe": "Unaudited",
   "yiShenHe": "Approved",
-  "yueDeGongShiBaoGaoMa": "Is there a monthly work hour report?"
+  "yueDeGongShiBaoGaoMa": "Is there a monthly work hour report?",
+  "boHuiLeQingJiaShenQing": "Rejected leave application",
+  "chaKanYuanYin": "View reasons",
+  "qingJiaDan": "Leave application form",
+  "qingJiaShenHe": "Leave Review",
+  "queDingYaoCheHuiGaiQingJiaShenQingMa": "Are you sure you want to withdraw the leave application",
+  "shengYuJiaQi": "Remaining vacation",
+  "yiCheHui": "Withdrawn"
 }

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

@@ -1707,5 +1707,12 @@
   "caiWuShenHeTiShi": "财务审核提示",
   "ninQueDingYaoShenHeTongGuo": "您确定要审核通过",
   "yueDeGongShiBaoGaoMa": "月的工时报告吗?",
-  "shenHeChengGong": "审核成功!"
+  "shenHeChengGong": "审核成功!",
+  "qingJiaShenHe": "请假审核",
+  "chaKanYuanYin": "查看原因",
+  "yiCheHui": "已撤回",
+  "boHuiLeQingJiaShenQing": "驳回了请假申请",
+  "qingJiaDan": "请假单",
+  "shengYuJiaQi": "剩余假期",
+  "queDingYaoCheHuiGaiQingJiaShenQingMa": "确定要撤回该请假申请吗"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -31,7 +31,7 @@
 
           <el-menu-item index="2" @select="bills" @click="auditList()" v-if="permissions.leaveAudit">
               <i class="iconfont firerock-iconshenhe"></i>
-              <span slot="title">请假审核</span>
+              <span slot="title">{{ $t('qingJiaShenHe') }}</span>
             </el-menu-item>
             <el-menu-item index="3" @select="bills" @click="bills(false, 2)" >
               <i class="iconfont firerock-iconbaoxiaodan"></i>
@@ -164,16 +164,16 @@
                     <el-input type="textarea" v-model="addForm.remark" :rows="5" style="width: 550px" 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>
@@ -277,8 +277,8 @@
                           <TranslationOpenDataText type='userName' :openid='scope.row.auditorName'></TranslationOpenDataText>
                         </span>
                       </div>
-                      <div v-if="scope.row.status == 2" style="color: red">{{ $t('btn.rejected') }}<el-link style="margin-left:5px;" @click="showDenyReason(scope.row.id)">查看原因</el-link></div>
-                      <div v-if="scope.row.status == 3" style="color: #666666">已撤回</div>
+                      <div v-if="scope.row.status == 2" style="color: red">{{ $t('btn.rejected') }}<el-link style="margin-left:5px;" @click="showDenyReason(scope.row.id)">{{ $t('chaKanYuanYin') }}</el-link></div>
+                      <div v-if="scope.row.status == 3" style="color: #666666">{{ $t('yiCheHui') }}</div>
                     </div>
                     <div v-else>
                       <span>{{ $t('norequestforleaveatpresent') }}</span>
@@ -305,9 +305,9 @@
                     <template slot-scope="scope">
                       <!-- <div v-if="(scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll"> -->
                       <div v-if="(scope.row.status != 0 || permissions.leaveAll) && scope.row.ownerId == user.id">
-                        <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>
@@ -731,8 +731,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('boHuiLeQingJiaShenQing'):$t('state.approved')}}</span>
+                  <span v-if="item.isPass == 0">{{ $t('other.reason') }} ：{{item.denyReason}}</span>
                   </el-timeline-item>
             </el-timeline>
         </div>
@@ -1025,7 +1025,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('qingJiaDan'));// download属性
           a.setAttribute('href', filePath);// href链接
           a.click(); //自执行点击事件
           a.remove();
@@ -1065,7 +1065,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('shengYuJiaQi'));// download属性
           a.setAttribute('href', filePath);// href链接
           a.click(); //自执行点击事件
           a.remove();
@@ -1466,12 +1466,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"
                   });
                 }
@@ -1544,7 +1544,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"
         });
       }
@@ -1559,7 +1559,7 @@ export default {
             if (res.code == "ok") {
                 this.auditList();
                 this.$message({
-                        message: '操作成功',
+                        message: this.$t('operationissuccessful'),
                         type: "success"
                         });
             } else {
@@ -1587,7 +1587,7 @@ export default {
         res => {
             if (res.code == "ok") {
                 this.$message({
-                        message: '操作成功',
+                        message: this.$t('operationissuccessful'),
                         type: "success"
                 });
             } else {
@@ -1614,7 +1614,7 @@ export default {
                 this.auditList();
                 this.denyDialogV = false;
                 this.$message({
-                        message: '操作成功',
+                        message: this.$t('operationissuccessful'),
                         type: "success"
                         });
             } else {
@@ -2102,7 +2102,7 @@ export default {
       // console.log(this.addForm)
     },
     cancel(e) {
-      this.$confirm('确定要撤回该请假申请吗', this.$t('other.prompts'), {
+      this.$confirm(this.$t('queDingYaoCheHuiGaiQingJiaShenQingMa'), this.$t('other.prompts'), {
           //type: 'warning'
       }).then(() => {
           this.http.post('/leave-sheet/cancel', {id:e.id},
@@ -2110,7 +2110,7 @@ export default {
               if (res.code == "ok") {
                   this.bills();
                   this.$message({
-                      message: '操作成功',
+                      message: this.$t('operationissuccessful'),
                       type: "success"
                   });
               } else {