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
f7eb8862
Commit
f7eb8862
authored
Apr 29, 2021
by
刘用法
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
12822d9c
2a6ebb23
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
126 additions
and
64 deletions
+126
-64
.env.prod.js
.env.prod.js
+1
-1
.env.test.js
.env.test.js
+1
-1
order.js
src/common/api/order.js
+43
-25
XhCheckbox.vue
src/components/createCom/XhCheckbox.vue
+2
-2
XhFiles.vue
src/components/createCom/XhFiles.vue
+2
-9
XhServiceMeasure.vue
src/components/createCom/XhServiceMeasure.vue
+1
-1
complete.vue
src/pages/order/complete.vue
+68
-16
feedback.vue
src/pages/order/feedback.vue
+7
-8
index.vue
src/pages/order/index.vue
+1
-1
No files found.
.env.prod.js
View file @
f7eb8862
...
@@ -8,7 +8,7 @@ const UNI_APP = {
...
@@ -8,7 +8,7 @@ const UNI_APP = {
apiUrl
:
'https://system.banshouhui.com'
,
//java端域名请求头
apiUrl
:
'https://system.banshouhui.com'
,
//java端域名请求头
},
},
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'http
://deudn.c.pp.cc/
'
qn_asset_url
:
'http
s://qn-static.banshouhui.com
'
}
}
module
.
exports
=
UNI_APP
;
module
.
exports
=
UNI_APP
;
.env.test.js
View file @
f7eb8862
...
@@ -8,6 +8,6 @@ const UNI_APP = {
...
@@ -8,6 +8,6 @@ const UNI_APP = {
apiUrl
:
'https://system.dev.banshouhui.com'
,
//java端域名请求头
apiUrl
:
'https://system.dev.banshouhui.com'
,
//java端域名请求头
},
},
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'http
://deudn.c.pp.cc/
'
qn_asset_url
:
'http
s://qn-static.banshouhui.com
'
}
}
module
.
exports
=
UNI_APP
;
module
.
exports
=
UNI_APP
;
src/common/api/order.js
View file @
f7eb8862
...
@@ -8,93 +8,109 @@ let orderApiFun = function(vm){
...
@@ -8,93 +8,109 @@ let orderApiFun = function(vm){
* 工单数量查询接口
* 工单数量查询接口
*/
*/
let
listOrderCount
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/queryOrdersCount/V2'
,
params
);
let
listOrderCount
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/queryOrdersCount/V2'
,
params
);
/**
/**
* 工单列表接口
* 工单列表接口
*/
*/
let
listOrder
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/list'
,
params
);
let
listOrder
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/list'
,
params
);
/**
/**
* 获取师傅的预约日历
* 获取师傅的预约日历
*/
*/
let
workerCalendar
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/calendar'
,
params
);
let
workerCalendar
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/calendar'
,
params
);
/**
/**
* 师傅预约
* 师傅预约
*/
*/
let
workerAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/'
+
vm
.
vuex_token
+
'/'
+
orderId
,
params
)
let
workerAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/'
+
vm
.
vuex_token
+
'/'
+
orderId
,
params
)
// 联系顾客时间更新接口,暂时没有
// 联系顾客时间更新接口,暂时没有
/**
/**
* 师傅签到接口
* 师傅签到接口
*/
*/
let
maintainWorkerCheckin
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintainWorkerCheckin'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
maintainWorkerCheckin
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintainWorkerCheckin'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
/**
/**
* 订单详情查询
* 订单详情查询
*/
*/
let
orderDetail
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/'
+
orderId
,
params
);
let
orderDetail
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/'
+
orderId
,
params
);
/* 过程反馈查询接口 */
/* 过程反馈查询接口 */
let
feedbackConfig
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/v2/getFeedBack/'
+
vm
.
vuex_token
,
params
)
let
feedbackConfig
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/v2/getFeedBack/'
+
vm
.
vuex_token
,
params
)
/* 预约+过程反馈 接口 */
/* 预约+过程反馈 接口 */
let
traceAndAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/'
+
vm
.
vuex_token
+
`/`
+
orderId
,
params
)
let
traceAndAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/'
+
vm
.
vuex_token
+
`/`
+
orderId
,
params
)
/* 师傅拒单 */
/* 师傅拒单 */
let
rejectOrder
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
`/order/
${
orderId
}
/workerReject/V2`
,
params
)
let
rejectOrder
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
`/order/
${
orderId
}
/workerReject/V2`
,
params
)
/**
/**
* 查询工单操作记录列表接口
* 查询工单操作记录列表接口
*/
*/
let
listOrderRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/record/'
+
vm
.
vuex_token
+
'/listOrderRecord/'
+
params
.
orderId
,
params
);
let
listOrderRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/record/'
+
vm
.
vuex_token
+
'/listOrderRecord/'
+
params
.
orderId
,
params
);
/**
/**
* 接单
* 接单
*/
*/
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/accept'
,
params
);
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/accept'
,
params
);
/**
/**
* 抢单
* 抢单
*/
*/
let
orderGan
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/revision/applets/'
+
vm
.
vuex_token
+
'/order/acceptAppletsOrder'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
orderGan
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/revision/applets/'
+
vm
.
vuex_token
+
'/order/acceptAppletsOrder'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
/**
/**
* 获取拍照标准
* 获取拍照标准
*/
*/
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/standard'
,
params
);
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/standard'
,
params
);
/**
/**
* 保存图片信息
* 保存图片信息
*/
*/
let
saveImage
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveImage'
,
params
);
let
saveImage
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveImage'
,
params
);
/**
/**
* 获取师傅水印 or 默认水印
* 获取师傅水印 or 默认水印
*/
*/
let
getWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
let
getWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
/**
/**
* 获取师傅开放可选时间段
* 获取师傅开放可选时间段
*/
*/
let
openTimerange
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/timerange'
,
params
);
let
openTimerange
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/timerange'
,
params
);
/**
/**
* 联系时间接口
* 联系时间接口
*/
*/
let
contactTime
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/record/'
+
vm
.
vuex_token
+
'/contact/'
+
orderId
,
params
);
let
contactTime
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/record/'
+
vm
.
vuex_token
+
'/contact/'
+
orderId
,
params
);
/**
/**
* 检查是否可以拒单
* 检查是否可以拒单
*/
*/
let
checkRejectable
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/'
+
vm
.
vuex_token
+
'/wokerOrder/checkRejectable'
,
params
);
let
checkRejectable
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/'
+
vm
.
vuex_token
+
'/wokerOrder/checkRejectable'
,
params
);
/**
/**
* 获取签到距离
* 获取签到距离
*/
*/
let
getSignDistance
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
`/wokerOrder/sign/distance`
,
params
)
let
getSignDistance
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
`/wokerOrder/sign/distance`
,
params
)
/**
* 获取订单的完工项目(配置+数据)
*/
let
getCompleteConfigAndData
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/info'
);
/**
* 查询措施
*/
let
getMeasure
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/service/'
+
vm
.
vuex_token
+
'/measure/queryMeasureItems'
,
params
);
/**
* 保存售后记录
*/
let
saveCompleteData
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveMaintainInfoV2'
,
params
);
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
listOrderCount
,
listOrderCount
,
...
@@ -106,7 +122,6 @@ let orderApiFun = function(vm){
...
@@ -106,7 +122,6 @@ let orderApiFun = function(vm){
listOrderRecord
,
listOrderRecord
,
orderAccept
,
orderAccept
,
orderGan
,
orderGan
,
maintainWorkerCheckin
,
feedbackConfig
,
feedbackConfig
,
traceAndAppointment
,
traceAndAppointment
,
rejectOrder
,
rejectOrder
,
...
@@ -116,10 +131,13 @@ let orderApiFun = function(vm){
...
@@ -116,10 +131,13 @@ let orderApiFun = function(vm){
openTimerange
,
openTimerange
,
contactTime
,
contactTime
,
checkRejectable
,
checkRejectable
,
getSignDistance
getSignDistance
,
getCompleteConfigAndData
,
getMeasure
,
saveCompleteData
}
}
return
orderApi
return
orderApi
}
}
module
.
exports
=
{
module
.
exports
=
{
orderApiFun
orderApiFun
}
}
\ No newline at end of file
src/components/createCom/XhCheckbox.vue
View file @
f7eb8862
...
@@ -8,11 +8,11 @@
...
@@ -8,11 +8,11 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
objMixin
from
'./obj
Mixin'
import
arrMixin
from
'./arr
Mixin'
export
default
{
export
default
{
name
:
'XhRadio'
,
name
:
'XhRadio'
,
components
:
{},
components
:
{},
mixins
:
[
obj
Mixin
],
mixins
:
[
arr
Mixin
],
props
:
{},
props
:
{},
filters
:{},
filters
:{},
data
()
{
data
()
{
...
...
src/components/createCom/XhFiles.vue
View file @
f7eb8862
...
@@ -75,21 +75,14 @@
...
@@ -75,21 +75,14 @@
deep
:
true
,
deep
:
true
,
immediate
:
true
,
immediate
:
true
,
},
},
// 'value'(val, oldVal){
// if(val){
// this.imgList = val.map(img =>{
// return {path:img}
// })
// }
// }
},
},
mounted
()
{
mounted
()
{
if
(
this
.
value
){
if
(
this
.
value
){
this
.
imgList
=
this
.
value
.
map
(
img
=>
{
this
.
imgList
=
this
.
value
.
map
(
img
=>
{
return
{
path
:
img
}
return
{
path
:
img
,
src
:
img
}
})
})
this
.
setValue
()
}
}
this
.
setValue
()
},
},
methods
:
{
methods
:
{
selectUpload
(){
selectUpload
(){
...
...
src/components/createCom/XhServiceMeasure.vue
View file @
f7eb8862
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
},
},
watch
:
{
watch
:
{
specificationId
(
val
,
oldVal
){
specificationId
(
val
,
oldVal
){
this
.
initComponent
()
this
.
initComponent
()
},
},
},
},
mounted
()
{
mounted
()
{
...
...
src/pages/order/complete.vue
View file @
f7eb8862
...
@@ -77,13 +77,22 @@
...
@@ -77,13 +77,22 @@
</scroll-view>
</scroll-view>
</view>
</view>
<view
class=
"btn-wrap flex-xc"
>
<view
class=
"btn-wrap flex-xc"
>
<u-button
class=
"btn-submit"
@
click=
"nextStep"
:custom-style=
"buttonStyle"
<u-button
class=
"btn-submit"
@
click=
"saveComplete"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
暂存
</u-button>
<u-button
class=
"btn-submit"
@
click=
"nextStep"
v-if=
"tabIndex===list.length - 1"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
交付
</u-button>
<u-button
class=
"btn-submit"
@
click=
"nextStep"
:custom-style=
"buttonStyle"
v-else
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
下一步
下一步
</u-button>
</u-button>
</view>
</view>
</view>
</view>
<take-photo
v-else
@
close=
"closeTake"
></take-photo>
<take-photo
v-else
@
close=
"closeTake"
></take-photo>
<u-toast
ref=
"uToast"
/>
</view>
</view>
</template>
</template>
<
script
>
<
script
>
...
@@ -176,12 +185,13 @@
...
@@ -176,12 +185,13 @@
if
(
option
)
{
if
(
option
)
{
this
.
orderId
=
option
.
orderId
this
.
orderId
=
option
.
orderId
this
.
categoryId
=
option
.
categoryId
this
.
categoryId
=
option
.
categoryId
this
.
orderServiceType
=
option
.
orderServiceType
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
}
else
{
}
else
{
this
.
orderId
=
9708719
this
.
orderId
=
9708719
this
.
categoryId
=
88
this
.
categoryId
=
88
this
.
orderServiceType
=
'安装'
this
.
orderServiceType
=
'安装'
}
}
this
.
getCompleteData
()
},
},
onReady
()
{
onReady
()
{
this
.
$refs
.
uForm
.
setRules
(
this
.
rules
);
this
.
$refs
.
uForm
.
setRules
(
this
.
rules
);
...
@@ -192,18 +202,6 @@
...
@@ -192,18 +202,6 @@
//console.log(this.form.name, 'form.name')
//console.log(this.form.name, 'form.name')
},
},
computed
:
{
computed
:
{
getCompleteData
()
{
let
self
=
this
if
(
self
.
orderId
){
self
.
$u
.
api
.
getCompleteConfigAndData
(
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
self
.
list
=
res
.
data
.
config
}
else
{
console
.
log
(
res
.
message
,
"获取订单详情失败!"
);
}
});
}
},
mixingImage
()
{
mixingImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
},
},
...
@@ -226,6 +224,51 @@
...
@@ -226,6 +224,51 @@
}
}
},
},
methods
:
{
methods
:
{
getCompleteData
()
{
//获取工单配置的完工项目
let
self
=
this
if
(
self
.
orderId
){
self
.
$u
.
api
.
getCompleteConfigAndData
(
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
self
.
list
=
res
.
data
.
config
self
.
form
=
res
.
data
.
value
}
else
{
console
.
log
(
res
.
message
,
"获取订单完工项目失败!"
);
}
});
}
},
saveComplete
(){
// 保存完工信息
let
self
=
this
let
param
=
{}
self
.
list
.
forEach
((
panel
)
=>
{
param
[
panel
.
panelFieldsName
]
=
[]
panel
.
items
.
forEach
((
group
)
=>
{
group
.
items
.
forEach
((
ele
)
=>
{
if
(
self
.
form
[
ele
.
fieldsName
]){
param
[
panel
.
panelFieldsName
].
push
({
"fieldsName"
:
ele
.
fieldsName
,
"fieldsType"
:
ele
.
fieldsType
,
"fieldsValue"
:
self
.
form
[
ele
.
fieldsName
],
"required"
:
ele
.
required
,
})
}
})
})
})
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
this
.
$refs
.
uToast
.
show
({
title
:
'保存成功'
,
type
:
'success'
,
})
}
else
{
this
.
$refs
.
uToast
.
show
({
title
:
res
.
message
,
type
:
'error'
,
})
}
})
},
getTakeStatus
(
event
)
{
getTakeStatus
(
event
)
{
this
.
takeStatus
=
event
.
status
this
.
takeStatus
=
event
.
status
this
.
fileIndex
=
event
.
index
.
toString
()
this
.
fileIndex
=
event
.
index
.
toString
()
...
@@ -260,10 +303,9 @@
...
@@ -260,10 +303,9 @@
}
else
{
}
else
{
this
.
$set
(
this
.
form
,
innerItem
.
fieldsName
,
data
.
value
)
this
.
$set
(
this
.
form
,
innerItem
.
fieldsName
,
data
.
value
)
}
}
console
.
log
(
this
.
form
,
'this.form'
)
},
},
nextStep
()
{
nextStep
()
{
if
(
this
.
tabIndex
<
this
.
list
.
length
)
{
if
(
this
.
tabIndex
<
this
.
list
.
length
-
1
)
{
this
.
tabIndex
++
this
.
tabIndex
++
this
.
arr
=
[]
this
.
arr
=
[]
this
.
$nextTick
(
function
()
{
this
.
$nextTick
(
function
()
{
...
@@ -600,5 +642,15 @@
...
@@ -600,5 +642,15 @@
.btn-wrap
{
.btn-wrap
{
width
:
100%
;
width
:
100%
;
padding
:
20rpx
0
40rpx
0
;
padding
:
20rpx
0
40rpx
0
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
}
}
.btn-save
{
color
:
#FFFFFF
;
background-color
:
#2272FF
;
font-size
:
32rpx
;
font-weight
:
bold
;
}
</
style
>
</
style
>
src/pages/order/feedback.vue
View file @
f7eb8862
...
@@ -126,10 +126,8 @@ export default {
...
@@ -126,10 +126,8 @@ export default {
nextTraceDatetime
:
''
,
// 下次跟踪时间
nextTraceDatetime
:
''
,
// 下次跟踪时间
remark
:
''
// 备注
remark
:
''
// 备注
},
},
appointTime
:
{
dateItem
:
null
,
dateItem
:
{},
timeItem
:
null
,
timeItem
:
{}
},
showRemark
:
false
,
showRemark
:
false
,
submiting
:
false
,
submiting
:
false
,
curTab
:
0
,
curTab
:
0
,
...
@@ -228,7 +226,8 @@ export default {
...
@@ -228,7 +226,8 @@ export default {
self
.
showRemark
=
true
;
self
.
showRemark
=
true
;
if
(
self
.
dateList
&&
self
.
timeList
)
{
if
(
self
.
dateList
&&
self
.
timeList
)
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
self
.
dateList
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
if
(
self
.
dateItem
&&
self
.
dateItem
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
item
.
disabled
=
true
;
item
.
disabled
=
true
;
}
else
{
}
else
{
item
.
disabled
=
false
;
item
.
disabled
=
false
;
...
@@ -300,7 +299,7 @@ export default {
...
@@ -300,7 +299,7 @@ export default {
// 点击日期选择
// 点击日期选择
console
.
log
(
data
,
'week-data'
);
console
.
log
(
data
,
'week-data'
);
let
self
=
this
;
let
self
=
this
;
self
.
appointTime
.
dateItem
=
data
.
item
self
.
dateItem
=
data
.
item
if
(
self
.
trace
.
reasonType
==
'报备'
)
{
if
(
self
.
trace
.
reasonType
==
'报备'
)
{
self
.
trace
.
appointmentDatetime
=
null
;
self
.
trace
.
appointmentDatetime
=
null
;
self
.
trace
.
nextTraceDatetime
=
data
.
item
.
day
;
self
.
trace
.
nextTraceDatetime
=
data
.
item
.
day
;
...
@@ -323,8 +322,8 @@ export default {
...
@@ -323,8 +322,8 @@ export default {
timeChange
(
data
)
{
timeChange
(
data
)
{
// 时间段选择变化
// 时间段选择变化
console
.
log
(
data
,
'week-data'
);
console
.
log
(
data
,
'week-data'
);
this
.
trace
.
appointmentDatetimeRange
=
data
.
item
;
this
.
trace
.
appointmentDatetimeRange
=
data
.
item
.
pkey
;
this
.
appointTime
.
timeItem
=
data
.
item
this
.
timeItem
=
data
.
item
},
},
async
submitForm
()
{
async
submitForm
()
{
let
self
=
this
;
let
self
=
this
;
...
...
src/pages/order/index.vue
View file @
f7eb8862
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
// 页面数据
// 页面数据
getOrderList
(
index
)
{
getOrderList
(
index
)
{
// 状态处理
// 状态处理
this
.
pageNumber
+=
1
//
this.pageNumber += 1
this
.
loaded
=
false
this
.
loaded
=
false
var
param
=
{
var
param
=
{
pageNumber
:
this
.
pageNumber
,
pageNumber
:
this
.
pageNumber
,
...
...
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