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

V20241021 保存

上级 ad316fc9
流水线 #30035 已通过 ,包含阶段
in 44 second
...@@ -31,6 +31,15 @@ export declare function getApiRoomGetRoomInfo(params: GetApiRoomGetRoomInfoParam ...@@ -31,6 +31,15 @@ export declare function getApiRoomGetRoomInfo(params: GetApiRoomGetRoomInfoParam
attendance_area_list: { attendance_area_list: {
[x: string]: any; [x: string]: any;
}[]; }[];
service_interval_time_info: {
one: string[];
two: string[];
three: string[];
four: string[];
five: string[];
six: string[];
seven: string[];
};
}; };
}>; }>;
export interface GetApiRoomGetRoomInfoParams { export interface GetApiRoomGetRoomInfoParams {
......
export interface DateViewModel {
one?: string[];
two?: string[];
three?: string[];
four?: string[];
five?: string[];
six?: string[];
seven?: string[];
}
import { type Coordinate } from "../../interface"; import { type Coordinate, type DateViewModel } from "../../interface";
export interface RoomDataViewModel { export interface RoomDataViewModel {
room_id?: string; room_id?: string;
room_name?: string; room_name?: string;
...@@ -20,4 +20,5 @@ export interface RoomDataViewModel { ...@@ -20,4 +20,5 @@ export interface RoomDataViewModel {
capacity?: number; capacity?: number;
is_sys?: number; is_sys?: number;
attendance_area_list?: Coordinate[]; attendance_area_list?: Coordinate[];
service_interval_time_info?: DateViewModel;
} }
...@@ -44,6 +44,7 @@ export * from "./apiTypes/RoomRequests"; ...@@ -44,6 +44,7 @@ export * from "./apiTypes/RoomRequests";
export * from "./apiTypes/PlaceOccupyseatRoom"; export * from "./apiTypes/PlaceOccupyseatRoom";
export * from "./apiTypes/PlaceOccupyseatRoomMessageModel"; export * from "./apiTypes/PlaceOccupyseatRoomMessageModel";
export * from "./apiTypes/PlaceOccupyseatRoomMessageModelPageModel"; export * from "./apiTypes/PlaceOccupyseatRoomMessageModelPageModel";
export * from "./apiTypes/DateViewModel";
export * from "./apiTypes/RoomDataViewModel"; export * from "./apiTypes/RoomDataViewModel";
export * from "./apiTypes/RoomDataViewModelMessageModel"; export * from "./apiTypes/RoomDataViewModelMessageModel";
export * from "./apiTypes/RoomReducibleViewModel"; export * from "./apiTypes/RoomReducibleViewModel";
......
...@@ -44,6 +44,7 @@ export * from "./apiTypes/RoomRequests"; ...@@ -44,6 +44,7 @@ export * from "./apiTypes/RoomRequests";
export * from "./apiTypes/PlaceOccupyseatRoom"; export * from "./apiTypes/PlaceOccupyseatRoom";
export * from "./apiTypes/PlaceOccupyseatRoomMessageModel"; export * from "./apiTypes/PlaceOccupyseatRoomMessageModel";
export * from "./apiTypes/PlaceOccupyseatRoomMessageModelPageModel"; export * from "./apiTypes/PlaceOccupyseatRoomMessageModelPageModel";
export * from "./apiTypes/DateViewModel";
export * from "./apiTypes/RoomDataViewModel"; export * from "./apiTypes/RoomDataViewModel";
export * from "./apiTypes/RoomDataViewModelMessageModel"; export * from "./apiTypes/RoomDataViewModelMessageModel";
export * from "./apiTypes/RoomReducibleViewModel"; export * from "./apiTypes/RoomReducibleViewModel";
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div> <div>
<!-- timeTable 添加班次抽屉 --> <!-- timeTable 添加班次抽屉 -->
<Drawer v-model="showDrawer" <Drawer v-model="showDrawer"
class="class-drawer" title="配置开放时间" width="800"> class="class-drawer" title="配置开放时间" width="800">
<!-- <div class="subTitle">打卡时段</div>--> <!-- <div class="subTitle">打卡时段</div>-->
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<!-- 第一次上班 --> <!-- 第一次上班 -->
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
:title="modalTitle" :title="modalTitle"
:transfer="false" :transfer="false"
:width="width"> :width="width">
<template > <template>
<!-- Modal全局loading --> <!-- Modal全局loading -->
<Spin v-if="loading" fix size="large"></Spin> <Spin v-if="loading" fix size="large"></Spin>
...@@ -206,9 +206,10 @@ ...@@ -206,9 +206,10 @@
</Row> </Row>
<!-- 详情 --> <!-- 详情 -->
<Row v-if="isDetails"> <Row v-if="isDetails">
<Col v-for="item in formItem.filter(a => a.type != 'file'&& a.type != 'timeTable' && (!a.hasOwnProperty('show') || a.show))" <Col
:key="item.id" v-for="item in formItem.filter(a => a.type != 'file'&& a.type != 'timeTable' && (!a.hasOwnProperty('show') || a.show))"
v-bind="grid"> :key="item.id"
v-bind="grid">
<FormItem :label="item.name" :prop="item.name"> <FormItem :label="item.name" :prop="item.name">
<span v-if="item.type == 'input'">{{ formData[item.id] }}</span> <span v-if="item.type == 'input'">{{ formData[item.id] }}</span>
<span v-if="item.type == 'datetime'">{{ formData[item.id] }}</span> <span v-if="item.type == 'datetime'">{{ formData[item.id] }}</span>
...@@ -349,7 +350,7 @@ export default { ...@@ -349,7 +350,7 @@ export default {
save() { save() {
//保存时间配置 剩下保存后刷新列表数据和格式化为提交数据 //保存时间配置 剩下保存后刷新列表数据和格式化为提交数据
this.formData[this.formDataTimeTable.id] = this.formDataTimeTable; this.formData[this.formDataTimeTable.id] = this.formDataTimeTable;
console.log("🚀🚀this.formDataTimeTable🚀,",this.formDataTimeTable); console.log("🚀🚀this.formDataTimeTable🚀,", this.formDataTimeTable);
this.showDrawer = false; this.showDrawer = false;
}, },
openClass(row, index, item) { openClass(row, index, item) {
...@@ -389,8 +390,8 @@ export default { ...@@ -389,8 +390,8 @@ export default {
* @param {String} addOrEdit add.新增 edit.编辑 * @param {String} addOrEdit add.新增 edit.编辑
*/ */
modalInit(addOrEdit = 'add', row, title = '') { modalInit(addOrEdit = 'add', row, title = '') {
this.isDetails = false this.isDetails = false;
this.uploadBtLoading = [] this.uploadBtLoading = [];
if (addOrEdit == 'add') { if (addOrEdit == 'add') {
this.$refs.form.resetFields() this.$refs.form.resetFields()
...@@ -409,7 +410,6 @@ export default { ...@@ -409,7 +410,6 @@ export default {
this.formData[id] = this.formData[id].split('-') this.formData[id] = this.formData[id].split('-')
} }
} }
// 设置上传按钮loading // 设置上传按钮loading
this.formItem.forEach(a => { this.formItem.forEach(a => {
if (a.type == 'file') { if (a.type == 'file') {
...@@ -427,8 +427,8 @@ export default { ...@@ -427,8 +427,8 @@ export default {
// 上传文件 // 上传文件
uploadFile(file, id, i) { uploadFile(file, id, i) {
this.uploadBtLoading[i] = true this.uploadBtLoading[i] = true
this.$forceUpdate() this.$forceUpdate();
let fd = new FormData() let fd = new FormData();
fd.append('file', file) fd.append('file', file)
this.asc.postApiCommonFileUpload(fd).then(res => { this.asc.postApiCommonFileUpload(fd).then(res => {
// console.log('上传后', res) // console.log('上传后', res)
...@@ -472,13 +472,11 @@ export default { ...@@ -472,13 +472,11 @@ export default {
if (valid) { if (valid) {
let obj = cloneDeep(this.formData) let obj = cloneDeep(this.formData)
// 时间范围处理 // 时间范围处理
let tri = this.formItem.findIndex(a => a.type == 'timerange') let tri = this.formItem.findIndex(a => a.type == 'timerange');
if (tri != -1) { if (tri != -1) {
let id = this.formItem[tri].id let id = this.formItem[tri].id
obj[id] = obj[id].join('-') obj[id] = obj[id].join('-')
} }
this.$emit('onSubmit', obj) this.$emit('onSubmit', obj)
} else { } else {
this.$Message.warning('请检查输入项') this.$Message.warning('请检查输入项')
...@@ -513,7 +511,7 @@ export default { ...@@ -513,7 +511,7 @@ export default {
outline: 0; outline: 0;
}*/ }*/
/deep/.ivu-drawer-mask { /deep/ .ivu-drawer-mask {
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0; bottom: 0;
...@@ -523,7 +521,8 @@ export default { ...@@ -523,7 +521,8 @@ export default {
height: 100%; height: 100%;
z-index: 60000 !important; z-index: 60000 !important;
} }
/deep/.ivu-drawer-wrap {
/deep/ .ivu-drawer-wrap {
position: fixed; position: fixed;
overflow: auto; overflow: auto;
top: 0; top: 0;
...@@ -534,6 +533,7 @@ export default { ...@@ -534,6 +533,7 @@ export default {
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
outline: 0; outline: 0;
} }
.ivu-form-item { .ivu-form-item {
padding-right: 15px; padding-right: 15px;
} }
......
...@@ -3,6 +3,7 @@ import CEditModal from '@/components/CEditModal.vue'; ...@@ -3,6 +3,7 @@ import CEditModal from '@/components/CEditModal.vue';
import _, {cloneDeep} from 'lodash'; import _, {cloneDeep} 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';
export default { export default {
name: 'list', name: 'list',
components: { components: {
...@@ -18,23 +19,23 @@ export default { ...@@ -18,23 +19,23 @@ export default {
}, },
showDrawer: false, showDrawer: false,
columns3: [ columns3: [
{title: '工作日', width: 100, key: 'day'}, {title: '工作日', width: 100, key: 'day'},
{ {
title: '开放时间段', title: '开放时间段',
slot: 'time', slot: 'time',
minWidth: 100, minWidth: 100,
}, },
{title: ' ', key: 'action', slot: 'action'} {title: ' ', key: 'action', slot: 'action'}
], ],
workDayData: [{day: '周一', time: '未配置开放时间'}, {day: '周二', time: '未配置开放时间'}, { workDayData: [
day: '周三', {day: '周一', time: {}},
time: '未配置开放时间' {day: '周二', time: {}},
}, {day: '周四', time: '未配置开放时间'}, {day: '周五', time: '未配置开放时间'}, { {day: '周三', time: {}},
day: '周六', {day: '周四', time: {}},
time: '未配置开放时间' {day: '周五', time: {}},
}, {day: '周日', time: '未配置开放时间'}], {day: '周六', time: {}},
{day: '周日', time: {}}
],
configData: { configData: {
// 使用开始前提醒/分钟 // 使用开始前提醒/分钟
before_use_occupyseat: '', before_use_occupyseat: '',
...@@ -98,20 +99,31 @@ export default { ...@@ -98,20 +99,31 @@ export default {
this.defaultOpeningHours() this.defaultOpeningHours()
}, },
methods: { methods: {
/**
* 默认开放时间
* */
save() { save() {
//保存开放时间配置 //保存开放时间配置
console.log("🚀🚀🚀,", this.formData); console.log("🚀🚀🚀,", this.formData);
//深拷贝,防止污染 //深拷贝,防止污染
let array = _.cloneDeep(this.workDayData); let array = _.cloneDeep(this.workDayData);
function getFormatData(data) {
//获取开放时间段,格式化
return data.map(cur => {
return cur.timeRange.join('~')
})
}
let info = { let info = {
//策略判断日期,把数据分配给对应日期,最后保存 //策略判断日期,把数据分配给对应日期,最后保存
'周一': ()=>array[0].time = this.formData.time.filter(cur=>{return cur.begin && cur.end}).map(cur=>{return cur.begin+'~'+cur.end}), '周一': () => array[0].time = getFormatData(this.formData.time),
'周二': ()=>array[1].time = this.formData.time.filter(cur=>{return cur.begin && cur.end}).map(cur=>{return cur.begin+'~'+cur.end}), '周二': () => array[1].time = getFormatData(this.formData.time),
'周三': ()=>array[2].time = this.formData.time.filter(cur=>{return cur.begin && cur.end}).map(cur=>{return cur.begin+'~'+cur.end}), '周三': () => array[2].time = getFormatData(this.formData.time),
'周四': ()=>array[3].time = this.formData.time.filter(cur=>{return cur.begin && cur.end}).map(cur=>{return cur.begin+'~'+cur.end}), '周四': () => array[3].time = getFormatData(this.formData.time),
'周五': ()=>array[4].time = this.formData.time.filter(cur=>{return cur.begin && cur.end}).map(cur=>{return cur.begin+'~'+cur.end}), '周五': () => array[4].time = getFormatData(this.formData.time),
'周六': ()=>array[5].time = this.formData.time.filter(cur=>{return cur.begin && cur.end}).map(cur=>{return cur.begin+'~'+cur.end}), '周六': () => array[5].time = getFormatData(this.formData.time),
'周日': ()=>array[6].time = this.formData.time.filter(cur=>{return cur.begin && cur.end}).map(cur=>{return cur.begin+'~'+cur.end}), '周日': () => array[6].time = getFormatData(this.formData.time),
} }
info[this.formData.day](); info[this.formData.day]();
...@@ -125,10 +137,21 @@ export default { ...@@ -125,10 +137,21 @@ export default {
"six": array[5].time, "six": array[5].time,
"seven": array[6].time, "seven": array[6].time,
}; };
console.log("🚀🚀data🚀,",data) console.log("🚀🚀data🚀,", data)
//接口请求 //接口请求
hooks.myEncapsulationFunction(() => {
return this.asc.postApiSysConfigGetSysConfigSave({
id: "service_interval_time_occupyseat",
value: JSON.stringify(data),
}).then(res => {
this.showDrawer = false
this.getData()
return res
})
})
}, },
defaultOpeningHours() { defaultOpeningHours(noFormatData) {
//
//获取默认开放时间 //获取默认开放时间
let info = { let info = {
'one': '周一', 'one': '周一',
...@@ -139,15 +162,16 @@ export default { ...@@ -139,15 +162,16 @@ export default {
'six': '周六', 'six': '周六',
'seven': '周日', 'seven': '周日',
} }
let data = { let data = eval("(" + noFormatData + ")")
"one": ["8:00~13:00", "14:00~18:00"], /*{
"two": [], "one": ["8:00~13:00", "14:00~18:00"],
"three": [], "two": [],
"four": [], "three": [],
"five": ["8:00~13:00", "14:00~18:00"], "four": [],
"six": [], "five": ["8:00~13:00", "14:00~18:00"],
"seven": [], "six": [],
} "seven": [],
}*/
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']},
...@@ -175,16 +199,24 @@ export default { ...@@ -175,16 +199,24 @@ export default {
return { return {
begin: cur.split('~')[0], begin: cur.split('~')[0],
end: cur.split('~')[1], end: cur.split('~')[1],
timeRange: [cur.split('~')[0], cur.split('~')[1]]
} }
}) })
} }
console.log("🚀🚀this.formData🚀,", this.formData)
this.showDrawer = true this.showDrawer = true
}, },
/**
* 默认开放时间
* */
getData() { getData() {
//初始化 //初始化
api.getApiSysConfigGetSysConfigAll().then(res => { api.getApiSysConfigGetSysConfigAll().then(res => {
this.data = res.response.map(cur => { this.data = res.response.map(cur => {
this.configData[cur.id] = cur.value this.configData[cur.id] = cur.value
if (cur.id === 'service_interval_time_occupyseat') this.defaultOpeningHours(cur.value)
return cur return cur
}) })
}) })
...@@ -215,7 +247,6 @@ export default { ...@@ -215,7 +247,6 @@ export default {
<div> <div>
<!-- 添加班次抽屉 --> <!-- 添加班次抽屉 -->
<Drawer v-model="showDrawer" class="class-drawer" title="配置开放时间" width="800"> <Drawer v-model="showDrawer" class="class-drawer" title="配置开放时间" width="800">
<!-- <div class="subTitle">打卡时段</div>--> <!-- <div class="subTitle">打卡时段</div>-->
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<!-- 第一次上班 --> <!-- 第一次上班 -->
...@@ -230,11 +261,13 @@ export default { ...@@ -230,11 +261,13 @@ export default {
<Row style="margin-bottom: 10px"> <Row style="margin-bottom: 10px">
<Col v-for="(item,index) in formData.time" :key="index" span="24" <Col v-for="(item,index) in formData.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"
style="width: 240px" type="timerange"/>
&nbsp;可预约座位 &nbsp;可预约座位
<div style="margin-left: auto"> <div style="margin-left: auto">
<Poptip <Poptip
...@@ -251,7 +284,8 @@ export default { ...@@ -251,7 +284,8 @@ export default {
</Col> </Col>
</Row> </Row>
<Row style="margin-bottom: 10px;display: flex;justify-content: center"> <Row style="margin-bottom: 10px;display: flex;justify-content: center">
<Button icon="ios-add" style="width: 200px;" type="dashed" @click=" formData.time.push({begin: '',end:''})">添加时间 <Button icon="ios-add" style="width: 200px;" type="dashed" @click=" formData.time.push({begin: '',end:''})">
添加时间
</Button> </Button>
</Row> </Row>
</Card> </Card>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或