From d33acff5eaafe9ab6dc78a01f0b00d43c73833a5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 16 五月 2024 17:41:39 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b3-work-time-management/work-time-config.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-config.vue b/src/components/do/b3-work-time-management/work-time-config.vue
index cb3ae89..d26142d 100644
--- a/src/components/do/b3-work-time-management/work-time-config.vue
+++ b/src/components/do/b3-work-time-management/work-time-config.vue
@@ -8,7 +8,7 @@
</div>
<div class="search_thing">
<div class="search_label">瀹為獙瀹わ細</div>
- <el-select v-model="componentData.entity.laboratory" placeholder="鍏ㄩ儴" size="small">
+ <el-select v-model="componentData.entity.laboratory" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()">
<el-option v-for="item in laboratoryList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -16,7 +16,7 @@
<div class="search_thing">
<div class="search_label">閮ㄩ棬锛�</div>
<div class="search_input">
- <el-select v-model="componentData.entity.department" placeholder="鍏ㄩ儴" size="small">
+ <el-select v-model="componentData.entity.department" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()">
<el-option v-for="item in partList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -73,7 +73,7 @@
laboratory: {
select: []
},
- label: {
+ unit: {
select: []
},
// department: {
@@ -86,15 +86,15 @@
laboratory: {
select: []
},
- label: {
+ unit: {
select: []
},
// department: {
// select: []
// },
},
- requiredAdd: ['number','auxiliaryProject','laboratory','label','approvedWorkingHour','department'],
- requiredUp: ['number','auxiliaryProject','laboratory','label','approvedWorkingHour','department']
+ requiredAdd: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour','department'],
+ requiredUp: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour','department']
},
entityCopy: {},
upIndex: 0,
@@ -162,8 +162,8 @@
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "鍗曚綅"
}).then(res => {
- this.componentData.selectField.label.select = res.data
- this.componentData.tagField.label.select = res.data
+ this.componentData.selectField.unit.select = res.data
+ this.componentData.tagField.unit.select = res.data
})
},
}
@@ -200,7 +200,7 @@
margin-top: 10px;
background-color: #fff;
width: calc(100% - 40px);
- height: calc(100% - 60px - 80px - 10px - 40px);
+ height: calc(100% - 60px - 80px - 10px - 24px);
padding: 20px;
}
</style>
--
Gitblit v1.9.3