فهرست منبع

新增剩余假期表

Lijy 2 سال پیش
والد
کامیت
3c7f3eabd9

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

@@ -1445,5 +1445,6 @@
   "can-yu-de-xiang-mu-de-shu-liang": "number of projects involved",
   "can-yu-ren-ci": "Number of participants",
   "chu-cha-de-tian-shu": "Days of business trip",
-  "xiang-mu-chuang-jian-shi-jian-duan": "Project Creation Period"
+  "xiang-mu-chuang-jian-shi-jian-duan": "Project Creation Period",
+  "dao-chu-jia-qi": "Export holidays"
 }

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

@@ -1445,5 +1445,6 @@
   "can-yu-de-xiang-mu-de-shu-liang": "参与的项目的数量",
   "can-yu-ren-ci": "参与人次",
   "chu-cha-de-tian-shu": "出差的天数",
-  "xiang-mu-chuang-jian-shi-jian-duan": "项目创建时间段"
+  "xiang-mu-chuang-jian-shi-jian-duan": "项目创建时间段",
+  "dao-chu-jia-qi": "导出假期"
 }

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

@@ -931,7 +931,7 @@ export default {
         leaveCode: this.leaveTypeItem,
         companyId: this.user.companyId,
         departmentId: this.departmentSel ? this.departmentSel[this.departmentSel.length - 1] : '',
-        userId: this.user.id,
+        userId: this.userSelId,
       }
       this.http.post('/user-yearleave-setting/exportDingDingLeaveQt',param,
       res => {