From f2dcf52e97f3acd00211ad065550d041c48ab3c5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 31 五月 2024 11:09:23 +0800
Subject: [PATCH] 修改班次bug
---
src/components/do/b3-work-time-management/work-time-management.vue | 34 +++-------------
src/components/do/b3-work-time-management/work-time-statistics.vue | 29 +++++++++-----
src/components/view/b3-classes.vue | 2 +
3 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index 583d07b..0135ba5 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -702,35 +702,15 @@
},
handleOut(){
this.outLoading = true
- this.$axios.post(this.$api.auxiliaryOutputWorkingHours.exportWorkingHours,{responseType: 'blob'}).then(res => {
+ this.$axios.post(this.$api.auxiliaryOutputWorkingHours.exportWorkingHours,{responseType: "blob"}).then(res => {
this.outLoading = false
this.$message.success('瀵煎嚭鎴愬姛')
- // let fileName="鏃ュ伐鏃舵眹鎬昏〃";
- // const blob = new Blob([res], {
- // type: 'application/force-download'
- // })
- // const filename = decodeURI(fileName+'.xlsx')
- // // 鍒涘缓涓�涓秴閾炬帴锛屽皢鏂囦欢娴佽祴杩涘幓锛岀劧鍚庡疄鐜拌繖涓秴閾炬帴鐨勫崟鍑讳簨浠�
- // const elink = document.createElement('a')
- // elink.download = filename
- // elink.style.display = 'none'
- // elink.href = URL.createObjectURL(blob)
- // document.body.appendChild(elink)
- // elink.click()
- // URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
- // document.body.removeChild(elink)
- const blob = new Blob([res], {
- type: 'application/force-download'
- })
- const link = document.createElement('a')
- link.href = URL.createObjectURL(blob)
- link.download = decodeURI('鏃ュ伐鏃舵眹鎬昏〃'+'.xlsx')
- document.body.appendChild(link)
- link.click()
- window.setTimeout(function () {
- URL.revokeObjectURL(blob)
- document.body.removeChild(link)
- }, 0)
+ const blob = new Blob([res.data]);
+ const url = URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = '鏃ュ伐鏃舵眹鎬昏〃.xlsx';
+ link.click();
})
},
}
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 06e33e7..57777e9 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -5,17 +5,17 @@
<div class="search_label">鏃ユ湡锛�</div>
<div class="search_input" style="display: flex;align-items: center;">
<el-date-picker
- v-model="componentData.entity.laboratory"
+ v-model="componentData.entity.month"
type="month"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM"
+ value-format="yyyy"
placeholder="閫夋嫨鏈�" size="small" style="width: 100%;">
</el-date-picker>
</div>
</div>
<div class="search_thing">
<div class="search_label">鍛樺伐锛�</div>
- <el-select v-model="componentData.entity.laboratory" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()">
+ <el-select v-model="componentData.entity.name" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()">
<el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -28,7 +28,7 @@
</el-option>
</el-select> -->
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.department" @keyup.enter.native="refreshTable()"></el-input>
+ v-model="componentData.entity.departLims" @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
<div class="search_thing" style="padding-left: 30px;width: 100px;">
@@ -61,6 +61,9 @@
<script>
import ValueTable from '../../tool/value-table.vue'
+import {
+ getYearAndMonthAndDays
+ } from '../../../util/date'
export default {
components: {
ValueTable
@@ -69,9 +72,9 @@
return{
componentData: {
entity: {
- number: null,
- department: null,
- laboratory: null,
+ month: null,
+ name: null,
+ departLims: null,
orderBy: {
field: 'id',
order: 'desc'
@@ -118,9 +121,9 @@
},
componentData0: {
entity: {
- number: null,
- department: null,
- laboratory: null,
+ month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
+ name: null,
+ departLims: null,
orderBy: {
field: 'id',
order: 'desc'
@@ -165,6 +168,7 @@
requiredAdd: [],
requiredUp: []
},
+ entity:{},
upIndex:0,
weekList:[],
personList:[],
@@ -175,6 +179,9 @@
this.getUsers()
},
methods: {
+ getYearAndMonthAndDays(date){
+ return getYearAndMonthAndDays(date)
+ },
refresh(){},
refreshTable(){},
getUsers(){
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 0171ca0..8514f63 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -331,6 +331,7 @@
this.list = [];
this.yearList = []
this.keyMap = {};
+ this.finishLoding = false;
this.currentPage = 1
this.query = {
userName:'',
@@ -347,6 +348,7 @@
refreshTable(){
this.keyMap = {};
this.currentPage = 1
+ this.finishLoding = false;
if(this.query.month){
this.list = [];
this.init()
--
Gitblit v1.9.3