提交 b705da5f 编写于 作者: 钟一霄's avatar 钟一霄

系统设置→值班配置→编辑Modal的时间配置新增当日/次日开关

上级 e2c228e2
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
......@@ -140,6 +140,7 @@
<div style="width: 100%;height: 50%;display: flex;align-items: center;line-height: 18px">
<Icon style="margin-right: 8px" type="ios-alarm-outline"/>
{{ item.begin + '~' + item.end }}
<Tag v-if="item.morrow == 1" class="ivu-ml-8" color="primary">次日</Tag>
</div>
</div>
<div
......@@ -163,6 +164,7 @@
<div style="width: 100%;height: 50%;display: flex;align-items: center;line-height: 18px">
<Icon style="margin-right: 8px" type="ios-alarm-outline"/>
{{ item.begin + '~' + item.end }}
<Tag v-if="item.morrow == 1" class="ivu-ml-8" color="primary">次日</Tag>
</div>
</div>
<div
......@@ -229,15 +231,17 @@
>
<div style="width: 100%;height: 50%;display: flex;align-items: center;line-height: 18px">
<Icon style="margin-right: 8px" type="ios-alarm-outline"/>{{ item.begin + '~' + item.end }}
<Tag v-if="item.morrow == 1" class="ivu-ml-8" color="primary">次日</Tag>
</div>
</div>
</span>
<span v-if="item.type == 'areaTime2'">
<div v-for="(item,index) in formData['sign_daytime']" v-if="formData['sign_daytime'].length >0"
<div v-for="(item,index) in formData['sign_night_time']" v-if="formData['sign_night_time'].length >0"
:key="index"
>
<div style="width: 100%;height: 50%;display: flex;align-items: center;line-height: 18px">
<Icon style="margin-right: 8px" type="ios-alarm-outline"/>{{ item.begin + '~' + item.end }}
<Tag v-if="item.morrow == 1" class="ivu-ml-8" color="primary">次日</Tag>
</div>
</div>
</span>
......
......@@ -8,14 +8,22 @@
format="HH:mm"
placeholder="请选择时间"
placement="bottom-end"
style="width: 100%;"
style="width: calc(100% - 70px);"
type="timerange"
/>
<i-switch class="ivu-ml-8" v-model="daylightHours.morrow" size="large" :true-value="1" :false-value="0">
<template #open>
<span>次日</span>
</template>
<template #close>
<span>当日</span>
</template>
</i-switch>
<template #footer>
<Button @click="()=>daylightHours.show = false">取消</Button>
<Button :disabled="!daylightHours.value.length >0" type="primary" @click="()=>{
// defaultFormData.sign_daytime.push({begin:daylightHours.value[0],end:daylightHours.value[1]})
$refs.ceditmodal.formData.sign_daytime.push({begin:daylightHours.value[0],end:daylightHours.value[1]}) //子组件同步坐标
$refs.ceditmodal.formData.sign_daytime.push({begin:daylightHours.value[0],end:daylightHours.value[1],morrow:daylightHours.morrow}) //子组件同步坐标
daylightHours.show = false
$refs.ceditmodal.$refs.form.validate()
}">确定
......@@ -29,14 +37,22 @@
format="HH:mm"
placeholder="请选择时间"
placement="bottom-end"
style="width: 100%;"
style="width: calc(100% - 70px);"
type="timerange"
/>
<i-switch class="ivu-ml-8" v-model="eveningTime.morrow" size="large" :true-value="1" :false-value="0">
<template #open>
<span>次日</span>
</template>
<template #close>
<span>当日</span>
</template>
</i-switch>
<template #footer>
<Button @click="()=>eveningTime.show = false">取消</Button>
<Button :disabled="!eveningTime.value.length > 0" type="primary" @click="()=>{
// defaultFormData.sign_night_time.push({begin:eveningTime.value[0],end:eveningTime.value[1]})
$refs.ceditmodal.formData.sign_night_time.push({begin:eveningTime.value[0],end:eveningTime.value[1]}) //子组件同步坐标
$refs.ceditmodal.formData.sign_night_time.push({begin:eveningTime.value[0],end:eveningTime.value[1],morrow:eveningTime.morrow}) //子组件同步坐标
eveningTime.show = false
$refs.ceditmodal.$refs.form.validate()
}">确定
......@@ -182,10 +198,12 @@ export default {
return {
daylightHours: {
show: false,
morrow: 0,
value: []
},
eveningTime: {
show: false,
morrow: 0,
value: []
},
isEdit: false,
......@@ -400,11 +418,13 @@ export default {
setTime2() {
//触发晚上签到时间
this.eveningTime.show = true
this.eveningTime.morrow = 0
this.eveningTime.value = []
},
setTime1() {
//触发白天签到时间
this.daylightHours.show = true
this.daylightHours.morrow = 0
this.daylightHours.value = []
},
setMap() {
......@@ -505,12 +525,14 @@ export default {
return {
begin: cur.Begin,
end: cur.End,
morrow: cur.Morrow
}
}),
sign_night_time: JSON.parse(res.sign_night_time).map(cur => {
return {
begin: cur.Begin,
end: cur.End,
morrow: cur.Morrow
}
}),
attandence_area: JSON.parse(res.attendance_area),
......@@ -550,12 +572,14 @@ export default {
return {
begin: cur.Begin,
end: cur.End,
morrow: cur.Morrow,
}
}),
sign_night_time: JSON.parse(res.sign_night_time).map(cur => {
return {
begin: cur.Begin,
end: cur.End,
morrow: cur.Morrow,
}
}),
attandence_area: JSON.parse(res.attendance_area),
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或