提交月度财务工时表的修改

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

@@ -258,6 +258,12 @@
                   <el-link type="warning" :underline="false" style="margin-left: 15px;">查看说明</el-link>
                 </el-tooltip>
               </div>
+              <div class="monthlyFinance-item">
+                工单：<el-select v-model="isItAWorkOrderValue" placeholder="全部" clearable @change="selcts()" size="small" style="margin-left: 10px;width: 140px">
+                  <el-option label="工单" value="2"></el-option>
+                  <el-option label="非工单" value="3"></el-option>
+                </el-select>
+              </div>
               <div class="monthlyFinance-item">
                 工单结算日期{{ obtainMonthlyFinancialModificationDate ? '(修改日期)' : '' }}：
                 <template v-if="!obtainMonthlyFinancialModificationDate">
@@ -282,12 +288,13 @@
         <el-button type="primary" @click="setWarning" size="mini" v-if="ins == 21">{{ $t('sheZhiYuJing') }}</el-button>
       </p>
       
-      <div v-if="ins == 31" style="width: 15%" class="tableRightBtn">
+      <div v-if="ins == 31" style="width: 300px" class="tableRightBtn">
         <template v-if="!obtainMonthlyFinancialStatementsRows.lastSendTime">
           <el-button type="success" size="small" @click="confirmTheFinalDraft()" :disabled="obtainMonthlyFinancialStatementsRows.status">
             {{ obtainMonthlyFinancialStatementsRows.status == 1 ? '已定稿' : '确定定稿' }}
           </el-button>
           <el-button type="primary" size="small" @click="immediateVisableCli()" :disabled="!obtainMonthlyFinancialStatementsRows.timesheetDate">立即发送</el-button>
+          <el-button type="primary" :loading="exportReportLoading" @click="exportExcel" size="small">{{ $t('reporderived') }}</el-button>
         </template>
         <el-link type="success" :underline="false" v-else>
           {{ obtainMonthlyFinancialStatementsRows.lastSendTime }} 已发送
@@ -2347,6 +2354,7 @@ export default {
       timelyTaskHoursRadio: '按任务查看',
       timelyReportingOfTaskHoursList: [],
       timelyReportingOfTaskHoursLoading: false,
+      isItAWorkOrderValue: '',
     };
   },
   computed: {},
@@ -3174,6 +3182,13 @@ export default {
             sl.taskType = this.taskTypeId
           }
           sl.projectId = this.proJuctId
+        } else if(this.ins == 31) {
+          fName = `${this.obtainMonthlyFinancialStatementsYmonth}月度财务工时表.xlsx`
+          url = `/finance-monthly-worktime/exportByMonth`
+          sl.ymonth = this.obtainMonthlyFinancialStatementsYmonth
+          sl.companyId = this.user.companyId
+          sl.reGenerate = ''
+          sl.isItAWorkOrder = this.isItAWorkOrderValue
         } else if(this.ins == 32) {
           fName = `${this.timelyTaskHoursRadio}任务工时填报及时表.xlsx`
           url = `/report/exportReportRateOfTask`
@@ -5068,7 +5083,8 @@ export default {
       this.postData(`/finance-monthly-worktime/getByMonth`, {
         companyId: this.user.companyId,
         ymonth: this.obtainMonthlyFinancialStatementsYmonth,
-        reGenerate: reGenerate
+        reGenerate: reGenerate,
+        isItAWorkOrder: this.isItAWorkOrderValue
       }).then(res => {
         if(reGenerate) {
           this.$message({
@@ -5079,7 +5095,7 @@ export default {
         this.obtainMonthlyFinancialStatementsRows = {
           ...res.data,
           detailList: (res.data.detailList || []).map(item => {
-            const timeFields = ['maintanceTime', 'debugTime', 'waitingTime', 'assistTime', 'publicTime', 'composeTime'];
+            const timeFields = ['composeTime', 'repairTime', 'debugTime', 'waitingTime', 'publicTime'];
             // const timeFields = ['composeTime', 'repairTime', 'publicTime'];
             const projectWorkingHoursFields = ['bustripTime', 'cleanTime']
             const totalTime = timeFields.reduce((sum, key) => sum + (item[key] || 0), 0);