From d6091acaf760936ceee8d3e5a9c2bd1a51d0ab32 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 22:04:58 +0800
Subject: [PATCH] 工时汇总加传参2.0
---
src/components/do/b3-work-time-management/work-time-management.vue | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 77e90cd..6b25f2a 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
@@ -210,10 +210,10 @@
:visible.sync="batchCheckDialog"
width="30%"
:before-close="closeBatchCheckDialog">
- <span>杩欐槸涓�娈典俊鎭�</span>
+ <span>{{batchCheckDialogMessage}}</span>
<span slot="footer" class="dialog-footer">
- <el-button @click="batchCheckDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="batchCheck">纭� 瀹�</el-button>
+ <el-button @click="batchCheckDialog = false">{{batchCheckTitle=='鎵归噺瀹℃牳'?'涓嶉�氳繃':'涓嶆壒鍑�'}}</el-button>
+ <el-button type="primary" @click="batchCheck">{{batchCheckTitle=='鎵归噺瀹℃牳'?'閫� 杩�':'鎵� 鍑�'}}</el-button>
</span>
</el-dialog>
</div>
@@ -425,7 +425,8 @@
outLoading:false,
batchCheckTitle: '鎵归噺瀹℃牳',
batchCheckDialog: false,
- ValueTable0Selected: []
+ ValueTable0Selected: [],
+ batchCheckDialogMessage: ''
}
},
watch:{
@@ -575,6 +576,7 @@
this.componentData1.entity = {...this.componentData1.entity,...entity}
this.$refs['ValueTable1'].selectList()
}
+ this.collectWorkingHours()
},
refresh(){
this.entity = {}
@@ -686,6 +688,7 @@
const isApprove = this.ValueTable0Selected.every(item => item.state !== '宸叉壒鍑�')
console.log('this.isApprove---', isApprove)
this.batchCheckTitle = e === 0 ? '鎵归噺瀹℃牳' : '鎵归噺鎵瑰噯'
+ this.batchCheckDialogMessage = e === 0 ? '鏄惁鍏ㄩ儴閫氳繃瀹℃牳?' : '鏄惁鍏ㄩ儴閫氳繃鎵瑰噯?'
if (this.batchCheckTitle === '鎵归噺瀹℃牳') {
if (isChecked) {
this.batchCheckDialog = true
@@ -817,9 +820,28 @@
return String(d)
},
collectWorkingHours(){
- this.$axios.post(this.$api.auxiliaryOutputWorkingHours.collectWorkingHours).then(res => {
- this.totalInfo = res.data
- })
+ let entity = {}
+ if(this.entity.week1&&this.entity.week2){
+ entity.week = JSON.stringify([this.entity.week1,this.entity.week2])
+ }else{
+ entity.week = ''
+ }
+ if(this.entity.dateTime){
+ entity.dateTime = JSON.stringify(this.entity.dateTime)
+ }else{
+ entity.dateTime = ''
+ }
+ entity.weekDay = this.entity.weekDay
+ entity.name = this.entity.name
+ this.$axios.post(this.$api.auxiliaryOutputWorkingHours.collectWorkingHours,{
+ entity:entity
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.totalInfo = res.data
+ })
},
selectshiftByUser(){
this.$axios.post(this.$api.auxiliaryWorkingHoursDay.selectshiftByUser).then(res => {
--
Gitblit v1.9.3