提交 794b2b23 编写于 作者: 刘英杰's avatar 刘英杰

V20241021 系统配置/房间管理》默认开放时间更改为Table列表配置方式

上级 9dfff7ea
流水线 #30074 已通过 ,包含阶段
in 36 second
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
<Row style="margin-bottom: 10px"> <Row style="margin-bottom: 10px">
<Col v-for="(item,index) in formDataTimeTable.time" :key="index" span="24" <Col v-for="(item,index) in formDataTimeTable.time" :key="index" span="24"
style="margin-bottom: 10px;display: flex;align-items: center"> style="margin-bottom: 10px;display: flex;align-items: center">
<!-- <TimePicker v-model="item.begin" :editable="false" confirm format="HH:mm" placeholder="未设置" <!-- <TimePicker v-model="item.begin" :editable="false" confirm format="HH:mm" placeholder="未设置"
size="default" style="width: 120px"></TimePicker> size="default" style="width: 120px"></TimePicker>
&nbsp; 至 &nbsp; &nbsp; 至 &nbsp;
<TimePicker v-model="item.end" :editable="false" confirm format="HH:mm" placeholder="未设置" <TimePicker v-model="item.end" :editable="false" confirm format="HH:mm" placeholder="未设置"
size="default" style="width: 120px"></TimePicker>--> size="default" style="width: 120px"></TimePicker>-->
<TimePicker v-model="item.timeRange" format="HH:mm" placeholder="未设置" placement="bottom-end" <TimePicker v-model="item.timeRange" format="HH:mm" placeholder="未设置" placement="bottom-end"
style="width: 240px" type="timerange"/> style="width: 240px" type="timerange"/>
&nbsp;可预约座位 &nbsp;可预约座位
...@@ -104,11 +104,7 @@ ...@@ -104,11 +104,7 @@
clearable clearable
filterable filterable
@on-query-change="onQueryChange"> @on-query-change="onQueryChange">
<Option <Option v-for="it in item.optList" :key="it.value" :value="it.value">{{ it.label }}</Option>
v-for="it in item.optList"
:key="it.value"
:value="it.value">{{ it.label }}
</Option>
</Select> </Select>
<Select <Select
...@@ -119,11 +115,7 @@ ...@@ -119,11 +115,7 @@
clearable clearable
filterable filterable
multiple> multiple>
<Option <Option v-for="it in item.optList" :key="it.value" :value="it.value">{{ it.label }}</Option>
v-for="it in item.optList"
:key="it.value"
:value="it.value">{{ it.label }}
</Option>
</Select> </Select>
<Switch <Switch
...@@ -131,7 +123,6 @@ ...@@ -131,7 +123,6 @@
v-model="formData[item['id']]" v-model="formData[item['id']]"
:false-value="0" :false-value="0"
:true-value="1"/> :true-value="1"/>
<TimePicker <TimePicker
v-else-if="item.type == 'timerange'" v-else-if="item.type == 'timerange'"
v-model="formData[item['id']]" v-model="formData[item['id']]"
...@@ -309,7 +300,7 @@ export default { ...@@ -309,7 +300,7 @@ export default {
}, },
data() { data() {
return { return {
aaa:123123, aaa: 123123,
// Modal显示value // Modal显示value
show: this.value, show: this.value,
modalTitle: '编辑', modalTitle: '编辑',
...@@ -352,7 +343,7 @@ export default { ...@@ -352,7 +343,7 @@ export default {
methods: { methods: {
save() { save() {
//深拷贝,防止污染 1~7天的数据 //深拷贝,防止污染 1~7天的数据
let array = _.cloneDeep(this.formItem.find(cur=>cur.type ==='timeTable').data); let array = _.cloneDeep(this.formItem.find(cur => cur.type === 'timeTable').data);
function getFormatData(data) { function getFormatData(data) {
//获取开放时间段,格式化 //获取开放时间段,格式化
...@@ -372,7 +363,7 @@ export default { ...@@ -372,7 +363,7 @@ export default {
'周日': () => array[6].time = getFormatData(this.formDataTimeTable.time), '周日': () => array[6].time = getFormatData(this.formDataTimeTable.time),
} }
info[this.formDataTimeTable.day](); info[this.formDataTimeTable.day]();
this.formItem.find(cur=>cur.type ==='timeTable').data = array; //Table列表输出 this.formItem.find(cur => cur.type === 'timeTable').data = array; //Table列表输出
let data = { let data = {
//格式化数据, //格式化数据,
"one": array[0].time, "one": array[0].time,
...@@ -383,8 +374,8 @@ export default { ...@@ -383,8 +374,8 @@ export default {
"six": array[5].time, "six": array[5].time,
"seven": array[6].time, "seven": array[6].time,
}; };
this.formData['service_interval_time'] = JSON.stringify(data) //格式化为后端接口格式 this.formData['service_interval_time'] = JSON.stringify(data) //格式化为后端接口格式
this.formData['service_interval_time_info'] =data //格式化为后端接口格式 this.formData['service_interval_time_info'] = data //格式化为后端接口格式
// timeTable // timeTable
...@@ -516,7 +507,7 @@ export default { ...@@ -516,7 +507,7 @@ export default {
let id = this.formItem[tri].id let id = this.formItem[tri].id
obj[id] = obj[id].join('-') obj[id] = obj[id].join('-')
} }
console.log("🚀🚀obj🚀,",obj) console.log("🚀🚀obj🚀,", obj)
this.$emit('onSubmit', obj) this.$emit('onSubmit', obj)
} else { } else {
this.$Message.warning('请检查输入项') this.$Message.warning('请检查输入项')
......
...@@ -694,7 +694,7 @@ export default { ...@@ -694,7 +694,7 @@ export default {
this.formItem[this.formItem.findIndex(a => a.id === 'timeTable')].columns = [ this.formItem[this.formItem.findIndex(a => a.id === 'timeTable')].columns = [
{title: '工作日', width: 100, key: 'day'}, {title: '工作日', width: 100, key: 'day'},
{title: '开放时间段', slot: 'time', minWidth: 410,}, {title: '开放时间段', slot: 'time', minWidth: 410,},
{title: ' ', slot: 'action', width: 110} {title: ' ', slot: 'action', width: 110},
] ]
this.$refs.ceditmodal.aaa ++ this.$refs.ceditmodal.aaa ++
this.defaultOpeningHours(row.service_interval_time); this.defaultOpeningHours(row.service_interval_time);
......
<script> <script>
import CEditModal from '@/components/CEditModal.vue'; import CEditModal from '@/components/CEditModal.vue';
import _, {cloneDeep} from 'lodash'; import _ from 'lodash';
import * as api from '@/api/controller/index'; import * as api from '@/api/controller/index';
import * as hooks from '@/hook/index'; import * as hooks from '@/hook/index';
...@@ -102,6 +102,61 @@ export default { ...@@ -102,6 +102,61 @@ export default {
/** /**
* 默认开放时间 * 默认开放时间
* */ * */
checkTimes(intervals, times) {
// Helper function to convert time string to minutes
function timeToMinutes(timeStr) {
const [hours, minutes] = timeStr.split(':').map(Number);
return hours * 60 + minutes;
}
// Helper function to convert minutes back to time string
function minutesToTime(minutes) {
const hours = Math.floor(minutes / 60);
const mins = minutes % 60;
return `${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}`;
}
// Convert intervals to start and end minutes
const intervalMinutes = intervals.map(interval => {
const [start, end] = interval.split('~').map(timeToMinutes);
return { start, end };
});
// Convert times to minutes
const timeMinutes = times.map(timeToMinutes);
// Check if all times are greater than all intervals
const allGreater = timeMinutes.every(time =>
intervalMinutes.every(({ end }) => time > end)
);
// Check if all times are less than all intervals
const allLess = timeMinutes.every(time =>
intervalMinutes.every(({ start }) => time < start)
);
// Check if all times are outside all intervals
const allOutside = timeMinutes.every(time =>
intervalMinutes.every(({ start, end }) => time < start || time > end)
);
return allGreater || allLess || allOutside;
} ,
onChangeTimeTable(event, item, index) {
let a = this.formData.time.map(cur => {
return cur.timeRange.join('~');
})
a.splice(this.formData.time.length - 1, 1);
let intervals = a
console.log("🚀intervals🚀🚀,", intervals, event);
if (!(this.checkTimes(intervals, event))) {
this.formData.time.splice(index, 1)
this.$Message.error('配置时间重叠,请重新配置时间')
}
},
save() { save() {
//保存开放时间配置 //保存开放时间配置
console.log("🚀🚀🚀,", this.formData); console.log("🚀🚀🚀,", this.formData);
...@@ -172,6 +227,7 @@ export default { ...@@ -172,6 +227,7 @@ export default {
"six": [], "six": [],
"seven": [], "seven": [],
}*/ }*/
console.log("🚀🚀🚀,", data)
this.workDayData = [ this.workDayData = [
{day: info['one'], time: data['one']}, {day: info['one'], time: data['one']},
{day: info['two'], time: data['two']}, {day: info['two'], time: data['two']},
...@@ -266,8 +322,9 @@ export default { ...@@ -266,8 +322,9 @@ export default {
&nbsp; 至 &nbsp; &nbsp; 至 &nbsp;
<TimePicker v-model="item.end" :editable="false" confirm format="HH:mm" placeholder="未设置" <TimePicker v-model="item.end" :editable="false" confirm format="HH:mm" placeholder="未设置"
size="default" style="width: 120px"></TimePicker>--> size="default" style="width: 120px"></TimePicker>-->
<TimePicker v-model="item.timeRange" format="HH:mm" placeholder="未设置" placement="bottom-end" <TimePicker v-model="item.timeRange" format="HH:mm" placeholder="未设置"
style="width: 240px" type="timerange"/> placement="bottom-end" style="width: 240px"
type="timerange" @on-change="onChangeTimeTable($event,item,index)"/>
&nbsp;可预约座位 &nbsp;可预约座位
<div style="margin-left: auto"> <div style="margin-left: auto">
<Poptip <Poptip
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或