From 856c232988d2a89b84e6c63e85a0590e8dd737b5 Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期五, 19 七月 2024 13:20:09 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master --- src/components/tool/value-table.vue | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index cf0b8b7..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> @@ -1134,7 +1138,7 @@ return } this.$message.success('鍒犻櫎鎴愬姛') - this.selectList() + this.selectList('page') }).catch(e => { this.$message.error('鍒犻櫎澶辫触') }) @@ -1149,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