提交project文件夹下的的finance文件翻译

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

@@ -1774,5 +1774,13 @@
   "queDingShanChu": "Confirm deletion",
   "tongBuXiuGaiQiTaXiangMuZhongDeTongMingWenJianJia": "Synchronize and modify folders with the same name in other projects",
   "xinZengJieDian": "Add nodes",
-  "ziDingYiMingCheng": "Custom Name"
+  "ziDingYiMingCheng": "Custom Name",
+  "jianCeDaoYou": "Detected presence",
+  "mingYiTianGongShiRenYuanZaiXinZiBiaoZhongWuJiLuBuCanYuChengBenFenTan": "Personnel with completed working hours have no record in the salary table and will not participate in cost allocation",
+  "paiChuBuFenXiangMu": "Exclude some items",
+  "quanBuYiTianBaoXiangMu": "All reported projects",
+  "shangChuan": "upload",
+  "wuXinZiRenYuanLieBiao": "List of unpaid personnel",
+  "xuanZeBuFenXiangMu": "Select some projects",
+  "yiShangRenYuanDangYueYiTianXieGongShiQingDaoRuTaMenDeXinZi": "*The above personnel have already filled in their working hours for the current month. Please import their salaries."
 }

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

@@ -1774,5 +1774,13 @@
   "qingShuRuJieDianMingCheng": "请输入节点名称",
   "queDingShanChu": "确定删除",
   "moBanMa": "模板吗",
-  "jieDian": "节点"
+  "jieDian": "节点",
+  "jianCeDaoYou": "检测到有",
+  "mingYiTianGongShiRenYuanZaiXinZiBiaoZhongWuJiLuBuCanYuChengBenFenTan": "名已填工时人员在薪资表中无记录，不参与成本分摊",
+  "shangChuan": "上传",
+  "wuXinZiRenYuanLieBiao": "无薪资人员列表",
+  "yiShangRenYuanDangYueYiTianXieGongShiQingDaoRuTaMenDeXinZi": "*以上人员当月已填写工时，请导入他们的薪资。",
+  "quanBuYiTianBaoXiangMu": "全部已填报项目",
+  "xuanZeBuFenXiangMu": "选择部分项目",
+  "paiChuBuFenXiangMu": "排除部分项目"
 }

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -228,11 +228,11 @@
                     <el-radio-button label="1" >{{ $t('Apportionmentofpersonnelcosts') }}</el-radio-button>
                     <el-radio-button label="2">{{ $t('Spreadallpersonnelcosts') }}</el-radio-button>
                 </el-radio-group>
-                <span v-if="missingFinanceUserList.length > 0" style="color:red;">检测到有 <el-link @click="showMissingDialog = true">&nbsp;{{ missingFinanceUserList.length }}&nbsp;</el-link> 名已填工时人员在薪资表中无记录，不参与成本分摊</span>
+                <span v-if="missingFinanceUserList.length > 0" style="color:red;">{{ $t('jianCeDaoYou') }} <el-link @click="showMissingDialog = true">&nbsp;{{ missingFinanceUserList.length }}&nbsp;</el-link> {{ $t('mingYiTianGongShiRenYuanZaiXinZiBiaoZhongWuJiLuBuCanYuChengBenFenTan') }}</span>
             </el-form-item>
 
             <el-form-item style="float:right;margin-right:20px;" v-if="permissions.financialShare">
-                <el-link type="primary" :underline="false" @click="uploadTest()" v-if="user.companyId == 936" style="margin-right:10px">上传</el-link>
+                <el-link type="primary" :underline="false" @click="uploadTest()" v-if="user.companyId == 936" style="margin-right:10px">{{ $t('shangChuan') }}</el-link>
                 <el-link type="primary" :underline="false" @click="exportFinanceDialog=true">{{ $t('ExportingtheAllocationData') }}</el-link>
             </el-form-item>
             
@@ -312,11 +312,11 @@
         </el-dialog>
 
         <!--无薪资人员列表-->
-        <el-dialog title="无薪资人员列表" v-if="showMissingDialog" :visible.sync="showMissingDialog" :close-on-click-modal="false" customClass="customWidth" width="600px">
+        <el-dialog :title="$t('wuXinZiRenYuanLieBiao')" v-if="showMissingDialog" :visible.sync="showMissingDialog" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-table :data="missingFinanceUserList" highlight-current-row v-loading="listLoading" :height="400" style="width: 100%;">
             <el-table-column type="index"></el-table-column>
-            <el-table-column prop="jobNumber" label="工号" sortable ></el-table-column>
-            <el-table-column prop="name" label="姓名" >
+            <el-table-column prop="jobNumber" :label="$t('Worknumber')" sortable ></el-table-column>
+            <el-table-column prop="name" :label="$t('lable.name')" >
                 <template slot-scope="scope">
                     <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                     <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
@@ -324,8 +324,8 @@
             </el-table-column>
         </el-table>
             <div slot="footer" class="dialog-footer">
-                <div style="float:left;color:#ff9900;">*以上人员当月已填写工时，请导入他们的薪资。</div>
-                <el-button type="primary" @click="showMissingDialog = false" >关闭</el-button>
+                <div style="float:left;color:#ff9900;">{{ $t('yiShangRenYuanDangYueYiTianXieGongShiQingDaoRuTaMenDeXinZi') }}</div>
+                <el-button type="primary" @click="showMissingDialog = false" >{{ $t('Shutdown') }}</el-button>
             </div>
         </el-dialog>
 
@@ -500,9 +500,9 @@
         <el-dialog :title="proSetting.ymonth + $t('projectstobe assessed')" show-header="false" v-if="projSettingDialog" :visible.sync="projSettingDialog" 
             :close-on-click-modal="false" customClass="customWidth" width="1000px">
             <el-radio-group v-model="proSetting.settingType" style="margin-top:15px;">
-                <el-radio :label=0 >全部已填报项目</el-radio>
-                <el-radio :label=1 >选择部分项目</el-radio>
-                <el-radio :label=2 >排除部分项目</el-radio>
+                <el-radio :label=0 >{{ $t('quanBuYiTianBaoXiangMu') }}</el-radio>
+                <el-radio :label=1 >{{ $t('xuanZeBuFenXiangMu') }}</el-radio>
+                <el-radio :label=2 >{{ $t('paiChuBuFenXiangMu') }}</el-radio>
             </el-radio-group>
             <el-select v-model="proSettingChosenProjects" multiple filterable clearable style="width:100%;margin-top:10px;" v-show="proSetting.settingType > 0" @change="updateChosenView()">
                 <el-option v-for="item in allProjectList"  :key="item.id" :label="item.projectName + '/'+ item.projectCode" :value="item.id">
@@ -725,7 +725,7 @@ import { error } from 'dingtalk-jsapi';
                 this.http.post('/cost-project-setting/save',this.proSetting,res => {
                     if(res.code == 'ok'){
                         this.$message({
-                            message: '保存成功',
+                            message: this.$t('savesuccess'),
                             type: 'success'
                         })
                         this.projSettingDialog = false;
@@ -750,7 +750,7 @@ import { error } from 'dingtalk-jsapi';
                 },res => {
                     if(res.code == 'ok'){
                         this.$message({
-                            message: '上传成功',
+                            message: this.$t('uploadedsuccessfully'),
                             type: 'success'
                         })
                     }else{