2022.9.17 请假单导出

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

@@ -400,6 +400,7 @@
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" width="220"></el-table-column>
                 <el-table-column prop="degreeName" :label="user.timeType.customDegreeName" width="180" v-if="user.timeType.customDegreeActive == 1"></el-table-column>
                 <el-table-column prop="username" :label="$t('lable.name')" width="120"></el-table-column>
+                <el-table-column prop="jobNumber" :label="$t('Worknumber')" width="120"></el-table-column>
                 <el-table-column prop="departmentName" :label="$t('lable.department')" width="140"></el-table-column>
                 <el-table-column prop="createDate" :label="$t('screening.workingDate')" width="120"></el-table-column>
                 <el-table-column prop="workingTime" :label="$t('screening.workTime')+ '(h)'" width="100" align="right">
@@ -422,6 +423,7 @@
               <!-- 人员工时分配表 -->
             <el-table v-if="ins == 8" key="8" border :data="userWorkHoursList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
               <el-table-column prop="username" :label="$t('ren-yuan')" width="150"></el-table-column>
+              <el-table-column prop="jobNumber" :label="$t('Worknumber')" width="150"></el-table-column>
               <el-table-column prop="unPublic" :label="$t('ordinaryprojecthours')" min-width="160" align="right">
                 <template slot-scope="scope">
                   <span>{{scope.row.unPublic == null? 0 + 'h' : scope.row.unPublic.toFixed(1) + 'h'}}</span>
@@ -493,6 +495,7 @@
             <!-- 员工填报及时率 -->
             <el-table v-if="ins == 9" key="9" border :data="reportTimelyList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
                 <el-table-column prop="userName" :label="$t('ren-yuan')" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="jobNumber" :label="$t('Worknumber')" min-width="200" align="center"></el-table-column>
                 <el-table-column prop="departmentName" :label="$t('subordinatedepartments')" min-width="200" align="center"></el-table-column>
                 <el-table-column prop="timelinessRate" :label="$t('timelyreportingrate')" min-width="200" align="center">
                   <template slot-scope="scope">
@@ -517,6 +520,7 @@
             <!-- 人员工时统计表 -->
             <el-table v-if="ins == 11" key="11" border :data="personnelList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
                 <el-table-column prop="name" :label="$t('lable.name')" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="jobNumber" :label="$t('Worknumber')" min-width="200" align="center"></el-table-column>
                 <el-table-column prop="departmentName" :label="$t('lable.department')" min-width="200" align="center"></el-table-column>
                 <el-table-column prop="planHours" :label="$t('plantime')" min-width="200" align="center">
                   <template slot-scope="scope">

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

@@ -208,6 +208,9 @@
                 <span style="color: #606266">{{ $t('message.period') }}</span>
                 <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="chufas()" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:280px"></el-date-picker>
             </div>
+            <div>
+              <el-button type="primary" size="small" style="margin-left:20px" @click="exportLeave()">导出请假单</el-button>
+            </div>
           </div>
             <el-table v-loading="loading" :data="tableData" style="width: 100%" height="94%">
                 <el-table-column prop="ownerName" :label="$t('leavepeople')" min-width="120" fixed="left"></el-table-column>
@@ -838,6 +841,44 @@ export default {
   },
   filters: {},
   methods: {
+    // 导出请假单
+    exportLeave(){
+      let param = {}
+      if(this.code !== ''){
+        param.status = this.code
+      }
+      if(this.type !== ''){
+        param.leaveType = this.type
+      }
+      if(this.createDate && this.createDate.length){
+        param.startTime = this.createDate[0]
+        param.endTime = this.createDate[1]
+      }
+      // console.log(this.code,this.type,param);
+      // return
+      this.http.post('/leave-sheet/exportLeave',param,
+      res => {
+        if(res.code == 'ok'){
+          var filePath = res.data;
+          const a = document.createElement('a'); // 创建a标签
+          a.setAttribute('download', '请假单');// download属性
+          a.setAttribute('href', filePath);// href链接
+          a.click(); //自执行点击事件
+          a.remove();
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          })
+        }
+      },err => {
+        this.$message({
+          message: err,
+          type: 'error'
+        })
+      })
+    },
+
     // 从钉钉同步假期剩余表
     listSynchronize(){
       this.synchronizeLoading = true

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

@@ -1832,7 +1832,7 @@
                 domain.groupId=null;
                 this.http.post('/task-group/listMyJoinGroup',{ 
                     projectId: domain.projectId,
-                    isSubstitude: this.isBatch == 2 ? 1 : 0
+                    isSubstitude: this.isSubstitude ? 1 : 0
                 },
                 res => {
                     if (res.code == "ok") {