Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李俊赕
self-support
Commits
2f9af7db
Commit
2f9af7db
authored
Aug 16, 2021
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 前台——待预约,待签到,过程反馈页面修改
parent
be6c1c12
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
286 additions
and
254 deletions
+286
-254
appoint-time.vue
src/components/appoint/appoint-time.vue
+2
-1
feedback.vue
src/components/order/feedback.vue
+44
-45
performanceRecord.vue
src/components/order/performanceRecord.vue
+240
-208
No files found.
src/components/appoint/appoint-time.vue
View file @
2f9af7db
...
...
@@ -180,7 +180,8 @@ export default {
computed
:
{
needTodyClipping
()
{
// 报备不限制当天已经过去的时间
return
this
.
type
!=
'filing'
// return this.type != 'filing'
return
false
// 报备和改约都不限制了
},
},
methods
:
{
...
...
src/components/order/feedback.vue
View file @
2f9af7db
...
...
@@ -41,7 +41,7 @@
:dateList=
"dateList"
:title=
"appointTitle"
:timeList=
"timeList"
:type=
"t
imeT
ype"
:type=
"type"
:defaultAppointRangeItem=
"defaultAppointRangeItem"
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
...
...
@@ -146,7 +146,6 @@ export default {
curTab
()
{
return
this
.
isSubscribe
?
1
:
0
},
isSubscribe
()
{
return
this
.
type
==
'subscribe'
},
...
...
@@ -169,9 +168,9 @@ export default {
typeKeys
()
{
return
{
filing
:
'报备'
,
subscribe
:
'改约'
}
},
timeType
()
{
return
this
.
types
[
this
.
options
.
name
]
},
//
timeType() {
//
return this.types[this.options.name]
//
},
defaultAppointRangeItem
()
{
return
this
.
options
.
defaultAppointRangeItem
},
...
...
@@ -263,16 +262,16 @@ export default {
let
owns
=
Object
.
keys
(
data
)
let
ownVals
=
Object
.
values
(
data
)
var
defaultAppointRangeItem
=
key
==
'报备'
this
.
isSubscribe
?
{
name
:
'22:00-24:00'
,
pkey
:
'appointment_range_24'
,
disabled
:
false
,
}
:
{
name
:
''
,
pkey
:
''
,
disabled
:
false
,
}
:
{
name
:
'22:00-24:00'
,
pkey
:
'appointment_range_24'
,
disabled
:
false
,
}
configs
=
{
name
:
key
,
...
...
@@ -302,26 +301,26 @@ export default {
self
.
trace
.
traceDate
=
null
self
.
trace
.
timeRange
=
null
self
.
trace
.
dateItem
=
null
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
if
(
self
.
dateList
&&
self
.
timeList
)
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
(
self
.
trace
.
dateItem
&&
self
.
trace
.
dateItem
.
timeRange
&&
self
.
trace
.
dateItem
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
||
item
.
isEnd
)
{
item
.
disabled
=
true
}
else
{
item
.
disabled
=
false
}
})
}
}
else
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
item
.
disabled
=
false
})
}
// if (self.trace.reasonType == '改约') { // 屏蔽改约对时间段选择的限制
//
if (self.dateList && self.timeList) {
//
self.timeList.map((item, index) => {
//
if (
//
(self.trace.dateItem &&
//
self.trace.dateItem.timeRange &&
//
self.trace.dateItem.timeRange.indexOf(item.pkey) > -1) ||
//
item.isEnd
//
) {
//
item.disabled = true
//
} else {
//
item.disabled = false
//
}
//
})
//
}
//
} else {
self
.
timeList
.
map
((
item
,
index
)
=>
{
item
.
disabled
=
false
})
//
}
}
},
...
...
@@ -374,23 +373,23 @@ export default {
// 点击日期选择
let
self
=
this
self
.
trace
.
dateItem
=
data
.
item
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
(
data
.
item
.
timeRange
&&
data
.
item
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
||
item
.
isEnd
)
{
item
.
disabled
=
true
}
else
{
item
.
disabled
=
false
}
})
}
else
{
//
if (self.trace.reasonType == '改约') {
//
self.timeList.map((item, index) => {
//
if (
//
(data.item.timeRange &&
//
data.item.timeRange.indexOf(item.pkey) > -1) ||
//
item.isEnd
//
) {
//
item.disabled = true
//
} else {
//
item.disabled = false
//
}
//
})
//
} else {
self
.
timeList
.
map
((
item
,
index
)
=>
{
item
.
disabled
=
false
})
}
//
}
self
.
trace
.
traceDate
=
data
.
item
.
day
self
.
trace
.
timeRange
=
null
},
...
...
src/components/order/performanceRecord.vue
View file @
2f9af7db
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment