导入日报审核翻译完成

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

@@ -719,5 +719,9 @@
   "pleaseentername": "Please enter a name",
   "pleaseselectheonesyouwanttodelete": "Please select to delete",
   "customersdata": "pieces of customer data",
-  "makesuretodeletethisone": "Are you sure you want to delete this"
+  "makesuretodeletethisone": "Are you sure you want to delete this",
+  "peaseselectmonth": "Please select a month",
+  "throughwithoneclick": "Pass all by one key",
+  "monany": "month",
+  "confirmapprovalofpendingdataforalldepartmentsanddates": "Are you confirmed to pass pending data for all departments and dates?"
 }

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

@@ -719,5 +719,9 @@
   "pleaseselectheonesyouwanttodelete": "请选择要删除的",
   "makesuretodeleteinbatches": "确定要批量删除",
   "customersdata": "条客户数据",
-  "makesuretodeletethisone": "确定要删除这条"
+  "makesuretodeletethisone": "确定要删除这条",
+  "peaseselectmonth": "请选择月份",
+  "throughwithoneclick": "一键全部通过",
+  "monany": "月份",
+  "confirmapprovalofpendingdataforalldepartmentsanddates": "是否确认通过全部部门和日期的待审核数据？"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_import.vue

@@ -3,14 +3,14 @@
         <!--工具条-->
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
             <el-form :inline="true">
-                <el-form-item label="部门：">
-                    <el-cascader v-model="search.departmentId" placeholder="请选择部门" style="width: 100%"
+                <el-form-item :label="$t('lable.department') + '：'">
+                    <el-cascader v-model="search.departmentId" :placeholder="$t('qing-xuan-ze-bu-men')" style="width: 100%"
                     :options="option" :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
                     @change="getList()" size="small"
                     ></el-cascader>
                 </el-form-item>
-                <el-form-item label="项目：">
-                    <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true" size="small">
+                <el-form-item :label="$t('other.project') + '：'">
+                    <el-select v-model="search.projectId" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="getList()" filterable="true" size="small">
                         <el-option v-for="item in projectList" :key="item.id" :label="item.projectName + item.projectCode" :value="item.id">
                             <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
                             <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
@@ -20,15 +20,15 @@
                 <el-form-item style="margin-left:20px;">
                     <template>
                         <div>
-                            <el-select v-model="search.dateType" placeholder="请选择" style="width: 80px" @change="dataFlgs()" size="small">
+                            <el-select v-model="search.dateType" :placeholder="$t('defaultText.pleaseChoose')" style="width: 80px" @change="dataFlgs()" size="small">
                                 <el-option v-for="item in dataFlgList" :key="item.value" :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>
                             <el-date-picker v-if="search.dateType == 0" v-model="search.date" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" size="small" 
-                                @change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker>
+                                @change="getList()" :clearable="true" type="date" :placeholder="$t('defaultText.selectWorkDate')"></el-date-picker>
                             <!-- <el-date-picker v-if="search.dateType == 0" v-model="date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"  @change="getList()" :clearable="true">
                             </el-date-picker> -->
-                             <el-date-picker size="small" v-if="search.dateType == 1" v-model="search.date" type="month" placeholder="请选择月份" format="yyyy-MM" value-format="yyyy-MM"  @change="dataYue()" :clearable="true">
+                             <el-date-picker size="small" v-if="search.dateType == 1" v-model="search.date" type="month" :placeholder="$t('peaseselectmonth')" format="yyyy-MM" value-format="yyyy-MM"  @change="dataYue()" :clearable="true">
                              </el-date-picker>
                         </div>
                     </template>
@@ -36,12 +36,12 @@
                     @change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker> -->
                 </el-form-item>
                 <el-form-item   style="margin-left:20px;">
-                    <el-button @click="batchApprove(true)" style="margin-left:10px;" :disabled="multipleSelection.length==0" size="small">批量通过</el-button>
-                    <el-button @click="batchApprove(false)"  :disabled="multipleSelection.length==0" size="small">批量驳回</el-button>
-                    <el-button @click="approveAll" style="margin-left:10px;" :disabled="list.length==0" size="small">一键全部通过</el-button>
+                    <el-button @click="batchApprove(true)" style="margin-left:10px;" :disabled="multipleSelection.length==0" size="small">{{ $t('Batchthrough') }}</el-button>
+                    <el-button @click="batchApprove(false)"  :disabled="multipleSelection.length==0" size="small">{{ $t('Batchrejected') }}</el-button>
+                    <el-button @click="approveAll" style="margin-left:10px;" :disabled="list.length==0" size="small">{{ $t('throughwithoneclick') }}</el-button>
                 </el-form-item>
                 <el-form-item style="margin-left:20px;" v-if="permissions.importAudit">
-                   <el-link type="primary" @click="recordList(),recordDialogVisible = true,pageIndexList = 1,pageSizeList = 20">审核记录</el-link>
+                   <el-link type="primary" @click="recordList(),recordDialogVisible = true,pageIndexList = 1,pageSizeList = 20">{{ $t('Auditrecords') }}</el-link>
                 </el-form-item>
             </el-form>
         </el-col>
@@ -106,39 +106,39 @@
                 </template>
             </el-table-column> -->
             
-            <el-table-column prop="name" label="姓名" sortable></el-table-column>
-            <el-table-column prop="date" label="日期" sortable>
+            <el-table-column prop="name" :label="$t('lable.name')" sortable></el-table-column>
+            <el-table-column prop="date" :label="$t('weekDay.date')" sortable>
             </el-table-column>
-            <el-table-column prop="project" label="项目" >
+            <el-table-column prop="project" :label="$t('other.project')" >
             </el-table-column>
-            <el-table-column prop="time" label="工作时长(h)">
+            <el-table-column prop="time" :label="$t('screening.workTime') + '(h)'">
                 <template slot-scope="scope">
                     <span>{{scope.row.time.toFixed(1)}}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="state" label="状态">
+            <el-table-column prop="state" :label="$t('state.states')">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.state == -1" style="color:#DAA520;">待审核</span>
-                    <span v-else-if="scope.row.state == 1" style="color:#32CD32;">已通过</span>
-                    <span v-else-if="scope.row.state == 2" style="color:#FF0000;">已驳回</span>
+                    <span v-if="scope.row.state == -1" style="color:#DAA520;">{{ $t('state.WaitingAudit') }}</span>
+                    <span v-else-if="scope.row.state == 1" style="color:#32CD32;">{{ $t('state.alreadyPassed') }}</span>
+                    <span v-else-if="scope.row.state == 2" style="color:#FF0000;">{{ $t('state.rejected') }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="220">
+            <el-table-column :label="$t('operation')" width="220">
                 <template slot-scope="scope">
-                    <el-button v-if="scope.row.state == -1" type="primary" :loading="logining" size="small" @click="approve(scope.row.id,scope.row.date, scope.row)">通过</el-button>
-                    <el-button v-if="scope.row.state == -1" type="danger" :loading="logining" size="small" @click="showDenyDialog(scope.row.id,0,scope.row.date, scope.row)">驳回</el-button>
-                    <el-button v-if="scope.row.state == 1" type="danger" :loading="logining" size="small" @click="showDenyDialog(scope.row.id,1,scope.row.date, scope.row)">撤销</el-button>
+                    <el-button v-if="scope.row.state == -1" type="primary" :loading="logining" size="small" @click="approve(scope.row.id,scope.row.date, scope.row)">{{ $t('btn.through') }}</el-button>
+                    <el-button v-if="scope.row.state == -1" type="danger" :loading="logining" size="small" @click="showDenyDialog(scope.row.id,0,scope.row.date, scope.row)">{{ $t('btn.rejected') }}</el-button>
+                    <el-button v-if="scope.row.state == 1" type="danger" :loading="logining" size="small" @click="showDenyDialog(scope.row.id,1,scope.row.date, scope.row)">{{ $t('btn.undo') }}</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <!--驳回弹出框 -->
-        <el-dialog title="请输入原因"  v-if="denyReasonDialog" :visible.sync="denyReasonDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog :title="$t('defaultText.pleaseEnterTheReason')"  v-if="denyReasonDialog" :visible.sync="denyReasonDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <div>
-                <el-input type="textarea" v-model="denyForm.reason" rows="2" :placeholder="'请输入您决定'+(denyForm.i==0?'驳回':'撤销')+'的原因'" />
+                <el-input type="textarea" v-model="denyForm.reason" rows="2" :placeholder="$t('defaultText.pleaseEnterYourDecision')+(denyForm.i==0?$t('btn.rejected'):$t('btn.undo'))+$t('other.reason')" />
             </div>
             <div slot="footer" class="dialog-footer">
-                <el-button  @click="denyReasonDialog = false" >取消</el-button>
-                <el-button type="primary" @click="deny()" >确定</el-button>
+                <el-button  @click="denyReasonDialog = false" >{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="deny()" >{{ $t('btn.determine') }}</el-button>
             </div>
         </el-dialog>
         <!--工具条-->
@@ -155,13 +155,13 @@
         </el-col>
 
         <!-- 审核记录弹窗 -->
-        <el-dialog title="审核记录" :visible.sync="recordDialogVisible" width="800px" :before-close="handleClose">
+        <el-dialog title="$t('Auditrecords')" :visible.sync="recordDialogVisible" width="800px" :before-close="handleClose">
             <div style="height: 430px">
                 <el-table :data="recordLists" style="width: 100%" height="400" v-loading="recordLoading">
-                    <el-table-column prop="userName" label="操作人" width="150"></el-table-column>
-                    <el-table-column prop="indate" label="审核时间"></el-table-column>
-                    <el-table-column prop="result" label="审核结果"></el-table-column>
-                    <el-table-column prop="date" label="员工/日期" width="200">
+                    <el-table-column prop="userName" :label="$t('other.operator')" width="150"></el-table-column>
+                    <el-table-column prop="indate" :label="$t('AuditTime')"></el-table-column>
+                    <el-table-column prop="result" :label="$t('Reviewtheresults')"></el-table-column>
+                    <el-table-column prop="date" :label="$t('EmployeeDate')" width="200">
                         <template slot-scope="scope">
                             <div>
                                 <div v-if="scope.row.membdateList.length > 1">
@@ -236,7 +236,7 @@
                 multipleSelection: [],
                 date: '',
                 dataFlg: 0,
-                dataFlgList:[{label: '日期', value: 0}, {label: '月份', value: 1}],
+                dataFlgList:[{label: this.$t('weekDay.date'), value: 0}, {label: this.$t('monany'), value: 1}],
                 yuefen: '',
                 recordDialogVisible: false,
                 recordLists: [],
@@ -319,9 +319,9 @@
             },
             //一键全部通过
             approveAll() {
-                this.$confirm('是否确认通过全部部门和日期的待审核数据？','提示',{
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                this.$confirm(this.$t('confirmapprovalofpendingdataforalldepartmentsanddates'),this.$t('other.prompts'),{
+                    confirmButtonText: this.$t('btn.determine'),
+                    cancelButtonText: this.$t('btn.cancel'),
                     type: 'warning'
                 }).then(()=>{
                     this.http.post('/report/approveAllImport',{},
@@ -331,7 +331,7 @@
                         if (res.code == "ok") {
                             this.getList();
                             this.$message({
-                            message: '审核成功',
+                            message: this.$t('message.Reviewsucceeded'),
                             type: "success"
                             });
                         } else {
@@ -474,7 +474,7 @@
                     this.logining = false;
                     if (res.code == "ok") {
                         this.$message({
-                            message: "审核成功",
+                            message: this.$t('message.Reviewsucceeded'),
                             type: "success"
                         });
                         this.getList();
@@ -547,7 +547,7 @@
                     this.logining = false;
                     if (res.code == "ok") {
                         this.$message({
-                            message: this.denyForm.i==0?"驳回成功":"撤销成功",
+                            message: this.denyForm.i==0?this.$t('message.rejectedsuccessfully'):this.$t('Revocationofsuccess'),
                             type: "success"
                         });
                         this.getList();