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 ++++++++++++++------
src/components/view/role-manage.vue | 6 +-
src/components/do/b3-work-time-management/work-time-management.vue | 12 +++---
src/components/view/a5-laboratory-qualifications.vue | 6 +-
src/components/view/a5-laboratory-management.vue | 4 +-
5 files changed, 42 insertions(+), 27 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 e8665b8..d38f8a2 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
@@ -161,7 +161,7 @@
</el-select>
</el-form-item>
<el-form-item label="濮撳悕:">
- <el-input v-model="formData0.nameUser" size="small" disabled></el-input>
+ <el-input v-model="formData0.name" size="small" disabled></el-input>
</el-form-item>
<el-form-item label="鐝:">
<el-select v-model="formData0.shift" placeholder="璇烽�夋嫨" size="small" :disabled="title=='鎵瑰噯'">
@@ -399,7 +399,8 @@
reviewerNonproductiveTime:'',
auxiliaryProject:'',
reviewerRemark:'',
- nameUser: ''
+ nameUser: '',
+ name: ''
},
checkVisible:false,
checkLoadN:false,
@@ -574,7 +575,9 @@
if(this.currentTable=='ValueTable0'){
entity.state = this.entity.state
this.componentData.entity = {...this.componentData.entity,...entity}
- this.$refs['ValueTable0'].selectList(e)
+ this.$nextTick(() => {
+ this.$refs['ValueTable0'].selectList(e)
+ })
}else{
this.componentData1.entity = {...this.componentData1.entity,...entity}
this.$refs['ValueTable1'].selectList(e)
@@ -921,7 +924,4 @@
height: calc(100% - 60px - 80px - 10px - 40px - 25px);
padding: 20px;
}
->>>.el-dialog__wrapper {
- z-index: 9999 !important; /* 鏍规嵁闇�瑕佽皟鏁村眰绾� */
-}
</style>
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('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�')
diff --git a/src/components/view/a5-laboratory-management.vue b/src/components/view/a5-laboratory-management.vue
index 560acea..3e6b5fe 100644
--- a/src/components/view/a5-laboratory-management.vue
+++ b/src/components/view/a5-laboratory-management.vue
@@ -302,7 +302,7 @@
this.fileVisible = true;
this.fileComponentData.entity.labId = row.id;
this.$nextTick(function () {
- this.$refs['ValueTable0'].selectList()
+ this.$refs['ValueTable0'].selectList('page')
})
},
confirmConnect(){
@@ -327,7 +327,7 @@
if (res.code === 201) {
return
}
- this.$refs['ValueTable0'].selectList()
+ this.$refs['ValueTable0'].selectList('page')
this.upFileVisible = false;
})
},
diff --git a/src/components/view/a5-laboratory-qualifications.vue b/src/components/view/a5-laboratory-qualifications.vue
index 9094057..6850540 100644
--- a/src/components/view/a5-laboratory-qualifications.vue
+++ b/src/components/view/a5-laboratory-qualifications.vue
@@ -351,9 +351,9 @@
this.refreshTable();
}
},
- refreshTable() {
+ refreshTable(e) {
if (this.radio === '0') {
- this.$refs['itemParameterTable'].selectList()
+ this.$refs['itemParameterTable'].selectList(e)
} else {
if(this.currentPage>1){
this.isLoding = true
@@ -504,7 +504,7 @@
this.loading = false
if (res.code == 201) return
this.$message.success('宸叉彁浜�')
- this.refreshTable()
+ this.refreshTable('page')
this.qualificationsConnectVisible = false
})
},
diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index 184fac0..c92965d 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -177,8 +177,8 @@
this.getPower()
},
methods: {
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -265,7 +265,7 @@
}
this.addLoad = false
this.addDia = false
- this.refreshTable()
+ this.refreshTable('page')
}).catch(e => {
this.addLoad = false
})
--
Gitblit v1.9.3