From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/basic/shift/shift-form.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/basic/shift/shift-form.vue b/src/views/basic/shift/shift-form.vue
index be46727..17d18a9 100644
--- a/src/views/basic/shift/shift-form.vue
+++ b/src/views/basic/shift/shift-form.vue
@@ -42,7 +42,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="mondayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.mondayWorkHours"
@@ -73,7 +73,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="tuesdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.tuesdayWorkHours"
@@ -104,7 +104,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="wensdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.wensdayWorkHours"
@@ -135,7 +135,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="thursdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.thursdayWorkHours"
@@ -166,7 +166,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="fridayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.fridayWorkHours"
@@ -197,7 +197,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="saturdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.saturdayWorkHours"
@@ -228,7 +228,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="sundayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.sundayWorkHours"
@@ -366,6 +366,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
--
Gitblit v1.9.3