Commit 2f9af7db authored by Facius's avatar Facius

feat: 前台——待预约,待签到,过程反馈页面修改

parent be6c1c12
...@@ -180,7 +180,8 @@ export default { ...@@ -180,7 +180,8 @@ export default {
computed: { computed: {
needTodyClipping() { needTodyClipping() {
// 报备不限制当天已经过去的时间 // 报备不限制当天已经过去的时间
return this.type != 'filing' // return this.type != 'filing'
return false // 报备和改约都不限制了
}, },
}, },
methods: { methods: {
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
:dateList="dateList" :dateList="dateList"
:title="appointTitle" :title="appointTitle"
:timeList="timeList" :timeList="timeList"
:type="timeType" :type="type"
:defaultAppointRangeItem="defaultAppointRangeItem" :defaultAppointRangeItem="defaultAppointRangeItem"
@dateChange="dateChange" @dateChange="dateChange"
@timeChange="timeChange" @timeChange="timeChange"
...@@ -146,7 +146,6 @@ export default { ...@@ -146,7 +146,6 @@ export default {
curTab() { curTab() {
return this.isSubscribe ? 1 : 0 return this.isSubscribe ? 1 : 0
}, },
isSubscribe() { isSubscribe() {
return this.type == 'subscribe' return this.type == 'subscribe'
}, },
...@@ -169,9 +168,9 @@ export default { ...@@ -169,9 +168,9 @@ export default {
typeKeys() { typeKeys() {
return { filing: '报备', subscribe: '改约' } return { filing: '报备', subscribe: '改约' }
}, },
timeType() { // timeType() {
return this.types[this.options.name] // return this.types[this.options.name]
}, // },
defaultAppointRangeItem() { defaultAppointRangeItem() {
return this.options.defaultAppointRangeItem return this.options.defaultAppointRangeItem
}, },
...@@ -263,16 +262,16 @@ export default { ...@@ -263,16 +262,16 @@ export default {
let owns = Object.keys(data) let owns = Object.keys(data)
let ownVals = Object.values(data) let ownVals = Object.values(data)
var defaultAppointRangeItem = var defaultAppointRangeItem =
key == '报备' this.isSubscribe
? { ? {
name: '22:00-24:00',
pkey: 'appointment_range_24',
disabled: false,
}
: {
name: '', name: '',
pkey: '', pkey: '',
disabled: false, disabled: false,
}
: {
name: '22:00-24:00',
pkey: 'appointment_range_24',
disabled: false,
} }
configs = { configs = {
name: key, name: key,
...@@ -302,26 +301,26 @@ export default { ...@@ -302,26 +301,26 @@ export default {
self.trace.traceDate = null self.trace.traceDate = null
self.trace.timeRange = null self.trace.timeRange = null
self.trace.dateItem = null self.trace.dateItem = null
if (self.trace.reasonType == '改约') { // if (self.trace.reasonType == '改约') { // 屏蔽改约对时间段选择的限制
if (self.dateList && self.timeList) { // if (self.dateList && self.timeList) {
self.timeList.map((item, index) => { // self.timeList.map((item, index) => {
if ( // if (
(self.trace.dateItem && // (self.trace.dateItem &&
self.trace.dateItem.timeRange && // self.trace.dateItem.timeRange &&
self.trace.dateItem.timeRange.indexOf(item.pkey) > -1) || // self.trace.dateItem.timeRange.indexOf(item.pkey) > -1) ||
item.isEnd // item.isEnd
) { // ) {
item.disabled = true // item.disabled = true
} else { // } else {
item.disabled = false // item.disabled = false
} // }
}) // })
} // }
} else { // } else {
self.timeList.map((item, index) => { self.timeList.map((item, index) => {
item.disabled = false item.disabled = false
}) })
} // }
} }
}, },
...@@ -374,23 +373,23 @@ export default { ...@@ -374,23 +373,23 @@ export default {
// 点击日期选择 // 点击日期选择
let self = this let self = this
self.trace.dateItem = data.item self.trace.dateItem = data.item
if (self.trace.reasonType == '改约') { // if (self.trace.reasonType == '改约') {
self.timeList.map((item, index) => { // self.timeList.map((item, index) => {
if ( // if (
(data.item.timeRange && // (data.item.timeRange &&
data.item.timeRange.indexOf(item.pkey) > -1) || // data.item.timeRange.indexOf(item.pkey) > -1) ||
item.isEnd // item.isEnd
) { // ) {
item.disabled = true // item.disabled = true
} else { // } else {
item.disabled = false // item.disabled = false
} // }
}) // })
} else { // } else {
self.timeList.map((item, index) => { self.timeList.map((item, index) => {
item.disabled = false item.disabled = false
}) })
} // }
self.trace.traceDate = data.item.day self.trace.traceDate = data.item.day
self.trace.timeRange = null self.trace.timeRange = null
}, },
......
This diff is collapsed.
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