You need to sign in or sign up before continuing.
提交 5ba9a76a 编写于 作者: 刘英杰's avatar 刘英杰

v20241223 值班配置》列表值不读取,计算属性处理过的

上级 4bfca872
[data-v-5ff263ac] .ivu-modal-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1050!important}[data-v-5ff263ac] .ivu-modal-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1050!important;-webkit-overflow-scrolling:touch;outline:0}[data-v-5ff263ac] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-5ff263ac] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}.ivu-form-item[data-v-5ff263ac]{padding-right:15px}.fileRow[data-v-5ff263ac]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-5ff263ac]{color:#ed4014}.fileRow .delIcon[data-v-5ff263ac]:hover{color:#f16643;cursor:pointer}.class-drawer[data-v-5ff263ac]{height:"calc(100% - 55px)";overflow:"auto";padding-bottom:"53px";position:"static";z-index:1100!important}.class-drawer .subTitle[data-v-5ff263ac]{margin-top:20px;font-size:14px;color:#191f25;font-weight:700}.class-drawer .drawer-footer[data-v-5ff263ac]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}.class-drawer[data-v-5ff263ac] .ivu-drawer-header-inner{font-size:20px;font-weight:600} [data-v-2fc404c8] .ivu-modal-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1050!important}[data-v-2fc404c8] .ivu-modal-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1050!important;-webkit-overflow-scrolling:touch;outline:0}[data-v-2fc404c8] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-2fc404c8] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}.ivu-form-item[data-v-2fc404c8]{padding-right:15px}.fileRow[data-v-2fc404c8]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2fc404c8]{color:#ed4014}.fileRow .delIcon[data-v-2fc404c8]:hover{color:#f16643;cursor:pointer}.class-drawer[data-v-2fc404c8]{height:"calc(100% - 55px)";overflow:"auto";padding-bottom:"53px";position:"static";z-index:1100!important}.class-drawer .subTitle[data-v-2fc404c8]{margin-top:20px;font-size:14px;color:#191f25;font-weight:700}.class-drawer .drawer-footer[data-v-2fc404c8]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}.class-drawer[data-v-2fc404c8] .ivu-drawer-header-inner{font-size:20px;font-weight:600}
\ No newline at end of file \ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><title>值班管理</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.e335ea91.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 值班管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.95a08806.js></script><script src=js/app.fc7ced5b.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><title>值班管理</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.e335ea91.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 值班管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.95a08806.js></script><script src=js/app.d5c3ffb2.js></script></body></html>
\ No newline at end of file \ No newline at end of file
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
type="timerange" type="timerange"
@on-open-change="onOpenChangeTimeTable($event,item,index)"/> @on-open-change="onOpenChangeTimeTable($event,item,index)"/>
<!--&nbsp;可预约座位--> <!--&nbsp;可预约座位-->
<i-switch @on-change="onSwitchChangeTimeTable($event,item,index)" v-model="item.morrow" :false-value="0" :true-value="1" class="ivu-ml-8" size="large"> <i-switch @on-change="onSwitchChangeTimeTable($event,item,index)" v-model="item.morrow" :false-value="0"
:true-value="1" class="ivu-ml-8" size="large">
<template #open> <template #open>
<span>次日</span> <span>次日</span>
</template> </template>
...@@ -515,32 +516,32 @@ export default { ...@@ -515,32 +516,32 @@ export default {
if (!event) { if (!event) {
// 关闭浮层时触发 // 关闭浮层时触发
let strategy = { let strategy = {
//当日|次日,执行不同对比策略 //当日|次日,执行不同对比策略
0:()=>{ 0: () => {
let deleteEventArrayCurrentDay = this.formDataTimeTable.time.map(cur => { let deleteEventArrayCurrentDay = this.formDataTimeTable.time.map(cur => {
//当日 //当日
if (cur.morrow === 0)return cur.timeRange.join('~'); if (cur.morrow === 0) return cur.timeRange.join('~');
}).filter(cur=>cur!==undefined) }).filter(cur => cur !== undefined)
if (deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayCurrentDay.splice(deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内 if (deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayCurrentDay.splice(deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内
if (!(this.checkTimes(deleteEventArrayCurrentDay, item.timeRange))) { if (!(this.checkTimes(deleteEventArrayCurrentDay, item.timeRange))) {
//对比算法 ,大于、小于且不在已有时间段内,返回则删除 //对比算法 ,大于、小于且不在已有时间段内,返回则删除
this.formDataTimeTable.time.splice(index, 1); this.formDataTimeTable.time.splice(index, 1);
this.$Message.error('当日配置时间重叠,请重新配置时间'); this.$Message.error('当日配置时间重叠,请重新配置时间');
this.aaa ++ this.aaa++
} }
}, },
1:()=>{ 1: () => {
let deleteEventArrayMorrowDay = this.formDataTimeTable.time.map(cur => { let deleteEventArrayMorrowDay = this.formDataTimeTable.time.map(cur => {
//次日 //次日
if (cur.morrow === 1)return cur.timeRange.join('~'); if (cur.morrow === 1) return cur.timeRange.join('~');
}).filter(cur=>cur!==undefined) }).filter(cur => cur !== undefined)
if (deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayMorrowDay.splice(deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内 if (deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayMorrowDay.splice(deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内
if (!(this.checkTimes(deleteEventArrayMorrowDay, item.timeRange))) { if (!(this.checkTimes(deleteEventArrayMorrowDay, item.timeRange))) {
//对比算法 ,大于、小于且不在已有时间段内,返回则删除 //对比算法 ,大于、小于且不在已有时间段内,返回则删除
this.formDataTimeTable.time.splice(index, 1); this.formDataTimeTable.time.splice(index, 1);
this.$Message.error('次日配置时间重叠,请重新配置时间'); this.$Message.error('次日配置时间重叠,请重新配置时间');
this.aaa ++ this.aaa++
} }
} }
...@@ -550,35 +551,35 @@ export default { ...@@ -550,35 +551,35 @@ export default {
}, },
onSwitchChangeTimeTable(event, item, index) { onSwitchChangeTimeTable(event, item, index) {
if (item.timeRange !== void 0){ if (item.timeRange !== void 0) {
console.log("🚀🚀event, item, index🚀,", event, item, index) console.log("🚀🚀event, item, index🚀,", event, item, index)
let strategy = { let strategy = {
//当日|次日,执行不同对比策略 //当日|次日,执行不同对比策略
0:()=>{ 0: () => {
let deleteEventArrayCurrentDay = this.formDataTimeTable.time.map(cur => { let deleteEventArrayCurrentDay = this.formDataTimeTable.time.map(cur => {
//当日 //当日
if (cur.morrow === 0)return cur.timeRange.join('~'); if (cur.morrow === 0) return cur.timeRange.join('~');
}).filter(cur=>cur!==undefined) }).filter(cur => cur !== undefined)
if (deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayCurrentDay.splice(deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内 if (deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayCurrentDay.splice(deleteEventArrayCurrentDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内
if (!(this.checkTimes(deleteEventArrayCurrentDay, item.timeRange))) { if (!(this.checkTimes(deleteEventArrayCurrentDay, item.timeRange))) {
//对比算法 ,大于、小于且不在已有时间段内,返回则删除 //对比算法 ,大于、小于且不在已有时间段内,返回则删除
this.formDataTimeTable.time.splice(index, 1); this.formDataTimeTable.time.splice(index, 1);
this.$Message.error('当日配置时间重叠,请重新配置时间'); this.$Message.error('当日配置时间重叠,请重新配置时间');
this.aaa ++ this.aaa++
} }
}, },
1:()=>{ 1: () => {
let deleteEventArrayMorrowDay = this.formDataTimeTable.time.map(cur => { let deleteEventArrayMorrowDay = this.formDataTimeTable.time.map(cur => {
//次日 //次日
if (cur.morrow === 1)return cur.timeRange.join('~'); if (cur.morrow === 1) return cur.timeRange.join('~');
}).filter(cur=>cur!==undefined) }).filter(cur => cur !== undefined)
if (deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayMorrowDay.splice(deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内 if (deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')) !== -1) deleteEventArrayMorrowDay.splice(deleteEventArrayMorrowDay.indexOf(item.timeRange.join('~')), 1);//删除刚添加的元素,不在对比数据内
if (!(this.checkTimes(deleteEventArrayMorrowDay, item.timeRange))) { if (!(this.checkTimes(deleteEventArrayMorrowDay, item.timeRange))) {
//对比算法 ,大于、小于且不在已有时间段内,返回则删除 //对比算法 ,大于、小于且不在已有时间段内,返回则删除
this.formDataTimeTable.time.splice(index, 1); this.formDataTimeTable.time.splice(index, 1);
this.$Message.error('次日配置时间重叠,请重新配置时间'); this.$Message.error('次日配置时间重叠,请重新配置时间');
this.aaa ++ this.aaa++
} }
} }
...@@ -589,19 +590,18 @@ export default { ...@@ -589,19 +590,18 @@ export default {
}, },
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) {
//获取开放时间段,格式化 //获取开放时间段,格式化
return data.map(cur => { return data.map(cur => {
if (cur.timeRange!== void 0)return { if (cur.timeRange !== void 0) return {
"Begin": cur.timeRange[0], "Begin": cur.timeRange[0],
"End": cur.timeRange[1], "End": cur.timeRange[1],
"Morrow": cur.morrow, "Morrow": cur.morrow,
} }
}).filter(cur=>cur!==undefined) }).filter(cur => cur !== undefined)
} }
let info = { let info = {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或