From a133429e9c1dbe107e34646cdf859eafe166ab34 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 01 八月 2024 16:39:21 +0800
Subject: [PATCH] 班次时间设置修改、多样品切换数据携带等bug更新
---
src/components/view/b3-classes.vue | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 3a2811d..eca7f12 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -265,9 +265,9 @@
</div>
<div style="width: calc(100% - 260px);">
<span class="form_label">鏃堕棿锛�</span>
- <span v-if="!item.isEdit"> {{item.time === null ? '' : item.time[0] + '~' + item.time[1]}} </span>
+ <span v-if="!item.isEdit"> {{item.startTime&&item.endTime ? item.startTime + '~' + item.endTime:''}} </span>
<span class="form_input" v-if="item.isEdit">
- <el-time-picker
+ <!-- <el-time-picker
style="width: 200px;"
is-range
size="small"
@@ -278,7 +278,28 @@
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
placeholder="閫夋嫨鏃堕棿鑼冨洿">
- </el-time-picker>
+ </el-time-picker> -->
+ <el-time-select
+ placeholder="璧峰鏃堕棿"
+ v-model="item.startTime"
+ size="small"
+ :picker-options="{
+ start: '00:00',
+ step: '00:15',
+ end: '24:00'
+ }" style="width: 120px;">
+ </el-time-select>
+ <el-time-select
+ style="width: 120px;"
+ placeholder="缁撴潫鏃堕棿"
+ v-model="item.endTime"
+ size="small"
+ :picker-options="{
+ start: '00:00',
+ step: '00:15',
+ end: '24:00'
+ }">
+ </el-time-select>
</span>
</div>
<span>
@@ -695,9 +716,9 @@
if (res.data.length > 0) {
res.data.forEach(item => {
item.isEdit = false
- item.time = []
- item.time.push(item.startTime)
- item.time.push(item.endTime)
+ // item.time = []
+ // item.time.push(item.startTime)
+ // item.time.push(item.endTime)
const index = this.timeTypeList.findIndex(val => val.value === item.shift)
if (index > -1) {
item.type = this.timeTypeList[index].label
@@ -727,6 +748,7 @@
}
}
delete item.orderBy
+ delete item.time
const isEmpty = this.isObjectEmpty(item)
if (isEmpty) {
this.$message.error('璇峰～鍐欏畬鏁�')
@@ -735,8 +757,8 @@
let newObj = {}
let url = ''
newObj.shift = item.shift
- newObj.startTime = item.time[0]
- newObj.endTime = item.time[1]
+ newObj.startTime = item.startTime
+ newObj.endTime = item.endTime
url = this.$api.performanceShift.shiftAdd
if (item.id) {
// 鏈塱d涓轰慨鏀�
--
Gitblit v1.9.3