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
bcb9cba8
Commit
bcb9cba8
authored
May 29, 2021
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
履约记录修改
parent
06bcccbd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
209 additions
and
104 deletions
+209
-104
performanceRecord.vue
src/components/order/performanceRecord.vue
+203
-0
detail.vue
src/pages/order/detail.vue
+6
-104
No files found.
src/components/order/performanceRecord.vue
0 → 100644
View file @
bcb9cba8
<
template
>
<view
class=
"order-record-view"
>
<view
class=
"top-item"
>
<text>
履约记录
</text>
</view>
<view
v-if=
"orderRecords.length == 0"
class=
"no-record-view"
>
当前暂无履约记录
</view>
<view
v-else
class=
"record-list-view"
>
<view
class=
"record-right-view"
>
<view
class=
"dashed-line-view"
></view>
<view
class=
"order-list"
>
<view
v-for=
"(record,index) in shwoOrderRecords"
:key=
"record.operationContent"
:class=
"['order-cell',
{'first': index == 0}]">
<view
class=
"node-view"
>
<view
class=
"node-border-view"
>
<view
class=
"node-middle-view"
></view>
</view>
</view>
<view
class=
"right-view"
>
<view
class=
"line-view-top"
>
<text>
{{
$u
.
timeFormat
(
record
.
operationDatetime
,
'yyyy.mm.dd hh:MM:ss'
)
}}
</text>
<text
style=
"color: red;"
>
{{
record
.
overTime
?
'超时'
:
''
}}{{
record
.
exception
?
'异常'
:
''
}}
</text>
<text
style=
"color: #2272FF;"
v-show=
"record.operationType==='报备' || record.operationType==='改约'"
>
跟进
</text>
</view>
<view
class=
"line-view-item"
>
<view>
<text>
{{
record
.
operationTypeText
}}
</text>
</view>
<view
class=
"item-operation-view"
v-show=
"record.operationType==='报备' || record.operationType==='预约'|| record.operationType==='改约'"
>
<text>
{{
record
.
operationType
===
'报备'
?
'下次联系时间:'
:
record
.
operationType
===
'改约'
?
'改约时间:'
:
''
}}
</text>
<text
style=
"color: #2272FF;word-break: break-all;"
>
{{
record
.
orderRecordRemark
}}
</text>
</view>
</view>
</view>
</view>
</view>
</view>
<view
v-if=
"orderRecords && orderRecords.length > showLenght"
@
click=
"readMoreRecord = !readMoreRecord"
>
<view
v-if=
"readMoreRecord"
class=
"read-more-toggle"
>
<u-icon
name=
"arrow-down"
></u-icon>
<text
class=
"read-more-text"
>
查看更多
</text>
</view>
<view
v-else
class=
"read-more-toggle"
>
<u-icon
name=
"arrow-up"
></u-icon>
<text
class=
"read-more-text"
>
点击收起
</text>
</view>
</view>
<view
v-else
style=
"height: 10rpx;"
></view>
</view>
</view>
</
template
>
<
script
>
export
default
{
props
:
{
// 履约记录
orderRecords
:
{
type
:
Array
,
default
()
{
return
[]
}
},
},
data
()
{
return
{
readMoreRecord
:
true
,
showLenght
:
5
,
}
},
computed
:
{
shwoOrderRecords
()
{
if
(
this
.
readMoreRecord
&&
this
.
orderRecords
&&
this
.
orderRecords
.
length
>
0
)
{
return
this
.
orderRecords
.
slice
(
0
,
this
.
showLenght
)
}
else
{
return
this
.
orderRecords
}
},
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.order-record-view
{
.top-item
{
font-size
:
32rpx
;
color
:
#333333
;
font-weight
:
bold
;
margin-bottom
:
20rpx
;
}
.no-record-view
{
font-size
:
26rpx
;
color
:
#333333
;
margin-top
:
30rpx
;
margin-bottom
:
30rpx
;
}
.record-list-view
{
position
:
relative
;
.record-right-view
{
position
:
relative
;
display
:
flex
;
justify-content
:
space-between
;
.dashed-line-view
{
position
:
absolute
;
width
:
2rpx
;
border-left
:
1px
dashed
#2272FF
;
height
:
100%
;
top
:
14rpx
;
left
:
11rpx
;
}
.order-list
{
width
:
100%
;
.order-cell
{
margin-top
:
50rpx
;
display
:
flex
;
&
.first
{
margin-top
:
0
;
}
.node-view
{
margin-right
:
18rpx
;
flex-shrink
:
0
;
margin-top
:
8rpx
;
.node-border-view
{
border
:
2rpx
solid
#2272FF
;
border-radius
:
11rpx
;
width
:
22rpx
;
height
:
22rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
.node-middle-view
{
width
:
10rpx
;
height
:
10rpx
;
background-color
:
#2272FF
;
border-radius
:
5rpx
;
}
}
}
.right-view
{
width
:
100%
;
.line-view-top
{
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
color
:
#333333
;
font-size
:
28rpx
;
}
.line-view-item
{
color
:
#666666
;
font-size
:
26rpx
;
margin-top
:
10rpx
;
.item-operation-view
{
margin-top
:
20rpx
;
}
}
}
}
}
}
}
.read-more-toggle
{
text-align
:
center
;
color
:
#2272FF
;
font-size
:
26rpx
;
margin-top
:
30rpx
;
padding-bottom
:
30rpx
;
}
.read-more-text
{
padding-left
:
8rpx
;
}
.order-item-more
{
font-size
:
26rpx
;
color
:
#333333
;
text-align
:
right
;
.line-view
{
background-color
:
#F4F5F7
;
height
:
2rpx
;
margin-bottom
:
20rpx
;
}
}
}
</
style
>
src/pages/order/detail.vue
View file @
bcb9cba8
...
@@ -94,45 +94,10 @@
...
@@ -94,45 +94,10 @@
<view
class=
"card appoint-item"
v-show=
"showTimeSelect"
>
<view
class=
"card appoint-item"
v-show=
"showTimeSelect"
>
<appoint-time
:dateList=
"dateList"
:timeList=
"timeList"
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
@
weekChange=
"weekChange"
></appoint-time>
<appoint-time
:dateList=
"dateList"
:timeList=
"timeList"
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
@
weekChange=
"weekChange"
></appoint-time>
</view>
</view>
<view
class=
"card order-item record-item"
>
<view
class=
"card record-item"
>
<view
class=
"top-item"
>
<Record
:orderRecords=
"orderRecords"
></Record>
<text
class=
"title"
>
履约记录
</text>
</view>
<view
v-if=
"orderRecords.length == 0"
class=
"no-record-view"
>
当前暂无履约记录
</view>
<view
v-else
>
<view
class=
"record-line-view"
>
<view
class=
"order-cell display-cell"
v-for=
"(record,index) in shwoOrderRecords"
:key=
"record.operationContent"
>
<view
class=
"node-view"
></view>
<view
class=
"line-view-left"
>
<text>
{{
$u
.
timeFormat
(
record
.
operationDatetime
,
'yyyy.mm.dd
\
n hh:MM:ss'
)
}}
</text>
</view>
<view
class=
"line-view-right"
>
<view>
<text>
{{
record
.
operationTypeText
}}
</text>
<text
style=
"color: red;"
>
{{
record
.
overTime
?
'(超时)'
:
''
}}{{
record
.
exception
?
'(异常)'
:
''
}}
</text>
<text
style=
"color: #2272FF;"
v-show=
"record.operationType==='报备' || record.operationType==='改约'"
>
(跟进)
</text>
</view>
<view
v-show=
"record.operationType==='报备' || record.operationType==='预约'|| record.operationType==='改约'"
>
<text>
{{
record
.
operationType
===
'报备'
?
'下次联系时间:'
:
record
.
operationType
===
'改约'
?
'改约时间:'
:
''
}}
</text>
<text
style=
"color: #2272FF;word-break: break-all;"
>
{{
record
.
orderRecordRemark
}}
</text>
</view>
</view>
</view>
</view>
<view
v-if=
"orderRecords && orderRecords.length > showLenght"
>
<view
v-if=
"readMoreRecord"
@
click=
"readMoreRecord = false"
class=
"read-more-toggle"
>
<u-icon
name=
"arrow-down"
></u-icon>
<text
class=
"read-more-text"
>
查看更多
</text>
</view>
<view
v-else
class=
"read-more-toggle"
>
<u-icon
name=
"arrow-up"
></u-icon>
<text
class=
"read-more-text"
@
click=
"readMoreRecord = true"
>
点击收起
</text>
</view>
</view>
<view
v-else
style=
"height: 10rpx;"
></view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<!-- 不是从我的页面进来不用显示 -->
<!-- 不是从我的页面进来不用显示 -->
<template
v-if=
"!isFromMine"
>
<template
v-if=
"!isFromMine"
>
...
@@ -198,21 +163,20 @@
...
@@ -198,21 +163,20 @@
// import PopView from "@/components/popView/index.vue"
// import PopView from "@/components/popView/index.vue"
import
baseFile
from
'@/components/upload/index'
import
baseFile
from
'@/components/upload/index'
import
Customer
from
"@/components/mine/customer.vue"
import
Customer
from
"@/components/mine/customer.vue"
import
Record
from
"@/components/order/performanceRecord.vue"
let
now
=
new
Date
(
new
Date
().
toLocaleDateString
()).
getTime
();
let
now
=
new
Date
(
new
Date
().
toLocaleDateString
()).
getTime
();
export
default
{
export
default
{
components
:
{
components
:
{
appointTime
,
appointTime
,
'take-photo'
:
takePhoto
,
'take-photo'
:
takePhoto
,
// PopView,
// PopView,
Customer
Customer
,
Record
},
},
mixins
:
[
baseFile
],
mixins
:
[
baseFile
],
data
()
{
data
()
{
return
{
return
{
readMore
:
true
,
readMore
:
true
,
readMoreRecord
:
true
,
showLenght
:
5
,
dateList
:
[
dateList
:
[
{
day
:
now
,
timeRange
:
[]},
{
day
:
now
,
timeRange
:
[]},
{
day
:
now
+
(
1
*
86400000
),
timeRange
:
[]},
{
day
:
now
+
(
1
*
86400000
),
timeRange
:
[]},
...
@@ -242,7 +206,7 @@
...
@@ -242,7 +206,7 @@
// 渐变色
// 渐变色
},
},
visible
:
false
,
visible
:
false
,
orderId
:
null
,
orderId
:
11880333
,
order
:
{},
order
:
{},
allowRejection
:
false
,
// 允许拒单
allowRejection
:
false
,
// 允许拒单
allowFeedback
:
false
,
// 允许过程反馈
allowFeedback
:
false
,
// 允许过程反馈
...
@@ -325,13 +289,6 @@
...
@@ -325,13 +289,6 @@
let
btnClass
=
"appoint-btn"
let
btnClass
=
"appoint-btn"
return
btnClass
return
btnClass
},
},
shwoOrderRecords
()
{
if
(
this
.
readMoreRecord
&&
this
.
orderRecords
&&
this
.
orderRecords
.
length
>
0
)
{
return
this
.
orderRecords
.
slice
(
0
,
5
)
}
else
{
return
this
.
orderRecords
}
},
formatAddress
()
{
formatAddress
()
{
let
self
=
this
let
self
=
this
let
address
=
""
let
address
=
""
...
@@ -1056,61 +1013,6 @@
...
@@ -1056,61 +1013,6 @@
}
}
.no-record-view
{
font-size
:
26rpx
;
color
:
#333333
;
margin-top
:
30rpx
;
margin-bottom
:
30rpx
;
}
.record-line-view
{
padding-left
:
30rpx
;
position
:
relative
;
margin-left
:
6rpx
;
}
.line-view-left
{
width
:
170rpx
;
flex-shrink
:
0
;
}
.line-view-right
{
// text-align: right;
}
.
record-line-view
:
:
before
{
content
:
" "
;
position
:
absolute
;
left
:
0
;
top
:
20rpx
;
width
:
1px
;
bottom
:
20rpx
;
border-left
:
1px
dashed
#2272FF
;
transform-origin
:
0
0
;
transform
:
scaleX
(
0
.5
);
}
.node-view
{
margin-top
:
16rpx
;
position
:
absolute
;
left
:
-3px
;
background-color
:
#2272FF
;
border-radius
:
7rpx
;
width
:
14rpx
;
height
:
14rpx
;
z-index
:
1
;
}
// .address-cell {
// height: 24rpx;
// font-size: 24rpx;
// font-weight: 400;
// color: #333333;
// line-height: 24rpx;
// .left {
// .address-txt {
// margin-left: 8rpx;
// }
// }
// }
}
}
.record-item
{
.record-item
{
...
...
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