Commit 225a9aa8 authored by 沈翠玲's avatar 沈翠玲

排班计划

parent 449adc0f
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
</el-table-column> </el-table-column>
<el-table-column label="工作结束时间" align="center" prop="endTime" width="100"> <el-table-column label="工作结束时间" align="center" prop="endTime" width="100">
</el-table-column> </el-table-column>
<!-- <el-table-column label="休息开始时间" align="center" prop="breakStartTime" width="100"> <!--
</el-table-column>
<el-table-column label="休息结束时间" align="center" prop="breakEndTime" width="100"> <el-table-column label="休息结束时间" align="center" prop="breakEndTime" width="100">
</el-table-column> --> </el-table-column> -->
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
...@@ -39,7 +38,7 @@ ...@@ -39,7 +38,7 @@
</el-table> </el-table>
<!-- 添加或修改计划班次对话框 --> <!-- 添加或修改计划班次对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
...@@ -102,10 +101,11 @@ ...@@ -102,10 +101,11 @@
<div class="box" :class="{'onlyread': onlyread}"> <div class="box" :class="{'onlyread': onlyread}">
<el-row class="row" v-for="(item, index) in breakTimeList" :key="index"> <el-row class="row" v-for="(item, index) in breakTimeList" :key="index">
<el-col class="td" :span="22"> <el-col class="td" :span="22">
<el-col :span="11"> <el-col :span="8">
<el-form-item label="休息开始时间" prop="breakStartTime"> <el-form-item label="休息开始时间" prop="breakStartTime">
<el-time-picker <el-time-picker
v-model="item.breakStartTime" v-model="item.breakStartTime"
style="width: 180px"
:disabled="onlyread" :disabled="onlyread"
placeholder="请选择休息开始时间" placeholder="请选择休息开始时间"
format ="HH:mm" format ="HH:mm"
...@@ -114,10 +114,11 @@ ...@@ -114,10 +114,11 @@
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="8">
<el-form-item label="休息结束时间" prop="breakEndTime"> <el-form-item label="休息结束时间" prop="breakEndTime">
<el-time-picker <el-time-picker
v-model="item.breakEndTime" v-model="item.breakEndTime"
style="width: 180px"
:disabled="onlyread" :disabled="onlyread"
placeholder="请选择休息结束时间" placeholder="请选择休息结束时间"
format ="HH:mm" format ="HH:mm"
...@@ -126,6 +127,14 @@ ...@@ -126,6 +127,14 @@
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="是否跨天" prop="nextDay">
<el-radio-group v-model="item.nextDay">
<el-radio :label="1">跨天</el-radio>
<el-radio :label="0">不跨天</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col> </el-col>
<el-col :span="1" v-if="!onlyread"> <el-col :span="1" v-if="!onlyread">
<i class="el-icon-plus" @click="addlist" /> <i class="el-icon-plus" @click="addlist" />
...@@ -240,7 +249,7 @@ export default { ...@@ -240,7 +249,7 @@ export default {
if(this.breakTimeList.length >= 2) { if(this.breakTimeList.length >= 2) {
return this.$message.warning('最多只能增加两个休息时段') return this.$message.warning('最多只能增加两个休息时段')
} }
this.breakTimeList.push({breakStartTime: null, breakEndTime: null, orderNum: this.breakTimeList.length + 1}) this.breakTimeList.push({breakStartTime: null, breakEndTime: null, orderNum: this.breakTimeList.length + 1, nextDay: 0})
}, },
/** 查询计划班次列表 */ /** 查询计划班次列表 */
getList() { getList() {
...@@ -287,7 +296,7 @@ export default { ...@@ -287,7 +296,7 @@ export default {
this.form = Object.assign({}, row); this.form = Object.assign({}, row);
this.breakTimeList = row.breakTimeList this.breakTimeList = row.breakTimeList
if(this.breakTimeList.length === 0){ if(this.breakTimeList.length === 0){
this.breakTimeList.push({breakStartTime: null, breakEndTime: null, orderNum: this.breakTimeList.length + 1}) this.breakTimeList.push({breakStartTime: null, breakEndTime: null, orderNum: this.breakTimeList.length + 1, nextDay: 0})
} }
this.onlyread = onlyread this.onlyread = onlyread
this.open = true; this.open = true;
...@@ -307,7 +316,7 @@ export default { ...@@ -307,7 +316,7 @@ export default {
const list = [] const list = []
this.breakTimeList.forEach(i => { this.breakTimeList.forEach(i => {
if(i.breakStartTime && i.breakEndTime) { if(i.breakStartTime && i.breakEndTime) {
list.push({breakStartTime: i.breakStartTime, breakEndTime: i.breakEndTime, orderNum: i.orderNum, shiftId: i.shiftId}) list.push({breakStartTime: i.breakStartTime, breakEndTime: i.breakEndTime, orderNum: i.orderNum, shiftId: i.shiftId, nextDay: 0})
} }
}) })
this.currentRow.breakTimeList = list this.currentRow.breakTimeList = list
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment