From c9071ee03a4664db1ca2887aec8323b9c0f72726 Mon Sep 17 00:00:00 2001 From: gaoluyang <gaoluyang@rengu.cc> Date: 星期五, 19 七月 2024 10:45:56 +0800 Subject: [PATCH] 日工时管理批量审核,批准接口传参修改 --- src/components/tool/value-table.vue | 56 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index 024991e..68e01c5 100644 --- a/src/components/tool/value-table.vue +++ b/src/components/tool/value-table.vue @@ -52,6 +52,9 @@ .red{ color: red !important; } + >>>.el-loading-parent--relative { + z-index: 1 !important; + } </style> <style> /* .value-table .highlight-warning-row-border td { @@ -104,6 +107,7 @@ display: inline-block; margin-left: 200px; } + </style> <template> @@ -586,9 +590,14 @@ this.selectList('page') }, selectList(val) { + console.log('val---', val) + console.log('this.page---', this.page) this.loading = true if(val===undefined){ this.page.current = 1; + } + if (val === 'lastPage') { + this.page.current = this.page.current - 1 // 渚嬪鍒犻櫎鏈〉鏈�鍚庝竴鏉℃暟鎹紝灏嗗綋鍓嶉〉闈㈠畾涓轰笂涓�椤碉紝闄ょ涓�椤靛 } if (this.data.isPage != undefined && this.data.isPage != true) { this.page = { @@ -611,6 +620,9 @@ this.total = res.data.body.total this.tableHead = res.data.head this.tableData = res.data.body.records + if (this.tableData.length === 0 && this.page.current > 1) { + this.selectList('lastPage') + } if (this.isColumnWidth) { this.tableHead.forEach(item => { if (item.value.length === 4) { @@ -627,7 +639,6 @@ item.width = 86 } }) - console.log('this.tableHead----', this.tableHead) } // console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData)) for (var a in this.data.selectField) { @@ -796,7 +807,7 @@ return } this.$message.success('鍒犻櫎鎴愬姛') - this.selectList() + this.selectList('page') this.$emit('delete') }).catch(e => { this.$message.error('鍒犻櫎澶辫触') @@ -858,7 +869,7 @@ } this.$message.success('淇敼鎴愬姛') this.upDia = false - this.selectList() + this.selectList('page') this.$refs.eltable.doLayout(); this.upLoad = false }).catch(e => { @@ -950,7 +961,7 @@ } this.$message.success('娣诲姞鎴愬姛') this.addDia = false - this.selectList() + this.selectList('page') this.addLoad = false }).catch(e => { this.addDia = false @@ -1127,7 +1138,7 @@ return } this.$message.success('鍒犻櫎鎴愬姛') - this.selectList() + this.selectList('page') }).catch(e => { this.$message.error('鍒犻櫎澶辫触') }) @@ -1142,20 +1153,31 @@ const list = JSON.parse(JSON.stringify(this.multipleSelection)) const url = e === 0 ? this.$api.auxiliaryWorkingHoursDay.check : this.$api.auxiliaryWorkingHoursDay.approve const state = e === 0 ? '宸插鏍�' : '宸叉壒鍑�' + let auxiliaryWorkingHoursDays = [] list.forEach(item => { - this.$axios.post(url, {id: item.id, state: state - },{ - headers: { - 'Content-Type': 'application/json' - } + delete item.orderBy + item.state = state + if (e === 0) { + auxiliaryWorkingHoursDays.push(item) + } else { + auxiliaryWorkingHoursDays.push({ + id: item.id, + state: item.state + }) + } + }) + this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays + },{ + headers: { + 'Content-Type': 'application/json' } - ).then(res => { - if (res.code === 201) { - return - } - this.$parent.submitBatchCheckDialog() - this.$message.success('鎿嶄綔鎴愬姛') - }) + } + ).then(res => { + if (res.code === 201) { + return + } + this.$parent.submitBatchCheckDialog() + this.$message.success('鎿嶄綔鎴愬姛') }) } else { this.$message.error('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�') -- Gitblit v1.9.3