From 58faef5c48c7491fe14e2a3ec0a0db4dba8967a6 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 23 七月 2024 17:23:49 +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 | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 024991e..1688891 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>
@@ -119,7 +123,7 @@
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
@@ -344,6 +348,10 @@
default: () => '155'
},
isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
+ isShowZero: {
type: Boolean,
default: () => false
},
@@ -586,9 +594,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 +624,18 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ if (this.isShowZero) {
+ this.tableData.map(item => {
+ Object.keys(item).forEach(val => {
+ if (item[val] === null && val.includes('Hours')) {
+ item[val] = '/'
+ }
+ })
+ })
+ }
+ 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 +652,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 +820,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
this.$emit('delete')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
@@ -858,7 +882,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upDia = false
- this.selectList()
+ this.selectList('page')
this.$refs.eltable.doLayout();
this.upLoad = false
}).catch(e => {
@@ -950,7 +974,7 @@
}
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
- this.selectList()
+ this.selectList('page')
this.addLoad = false
}).catch(e => {
this.addDia = false
@@ -1127,7 +1151,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
})
@@ -1142,20 +1166,24 @@
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
+ auxiliaryWorkingHoursDays.push(item)
+ })
+ 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