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
37caa8cc
Commit
37caa8cc
authored
Apr 28, 2021
by
李超鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:add、update
scope:self-support body:完工页面交互调试
parent
02d04def
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
798 additions
and
725 deletions
+798
-725
order.js
src/common/api/order.js
+19
-2
XhCheckbox.vue
src/components/createCom/XhCheckbox.vue
+17
-17
XhFiles.vue
src/components/createCom/XhFiles.vue
+122
-102
XhInput.vue
src/components/createCom/XhInput.vue
+3
-4
XhLocation.vue
src/components/createCom/XhLocation.vue
+27
-28
XhPicker.vue
src/components/createCom/XhPicker.vue
+1
-1
XhRadio.vue
src/components/createCom/XhRadio.vue
+20
-20
XhSelect.vue
src/components/createCom/XhSelect.vue
+11
-6
XhTime.vue
src/components/createCom/XhTime.vue
+6
-10
complete.vue
src/pages/order/complete.vue
+569
-534
detail.vue
src/pages/order/detail.vue
+3
-1
No files found.
src/common/api/order.js
View file @
37caa8cc
...
@@ -73,6 +73,21 @@ let orderApiFun = function(vm){
...
@@ -73,6 +73,21 @@ let orderApiFun = function(vm){
*/
*/
let
getWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
let
getWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
/**
* 获取订单的完工项目(配置+数据)
*/
let
getCompleteConfigAndData
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/'
+
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
(
'wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveMaintainInfoV2'
,
params
);
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
listOrderCount
,
listOrderCount
,
...
@@ -84,13 +99,15 @@ let orderApiFun = function(vm){
...
@@ -84,13 +99,15 @@ let orderApiFun = function(vm){
listOrderRecord
,
listOrderRecord
,
orderAccept
,
orderAccept
,
orderGan
,
orderGan
,
maintainWorkerCheckin
,
feedbackConfig
,
feedbackConfig
,
traceAndAppointment
,
traceAndAppointment
,
rejectOrder
,
rejectOrder
,
orderStandard
,
orderStandard
,
saveImage
,
saveImage
,
getWatermark
getWatermark
,
getCompleteConfigAndData
,
getMeasure
,
saveCompleteData
}
}
return
orderApi
return
orderApi
}
}
...
...
src/components/createCom/XhCheckbox.vue
View file @
37caa8cc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<
template
>
<
template
>
<view
class=
"list"
>
<view
class=
"list"
>
<view
v-for=
"(item,index) in settings"
:key=
"index"
<view
v-for=
"(item,index) in settings"
:key=
"index"
:class=
"
{'txt':true,'active':checkStatus(item
)}" @click="setValue(item)">
{{
item
}}
:class=
"
{'txt':true,'active':checkStatus(item
.key)}" @click="setValue(item.key)">
{{
item
.
label
}}
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
},
},
computed
:
{
computed
:
{
settings
()
{
settings
()
{
return
this
.
item
.
setting
s
||
[]
return
this
.
item
.
fieldsOption
s
||
[]
}
}
},
},
watch
:
{},
watch
:
{},
...
...
src/components/createCom/XhFiles.vue
View file @
37caa8cc
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
<view
class=
"icon-del rotate"
></view>
<view
class=
"icon-del rotate"
></view>
</view>
</view>
</view>
</view>
<view
class=
"img-list"
@
click=
"choose"
>
<view
class=
"img-list"
>
<u-image
class=
"pic"
width=
"170rpx"
height=
"170"
@
click=
"selectUpload"
src=
"https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png"
></u-image>
<u-image
class=
"pic"
width=
"170rpx"
height=
"170"
@
click=
"selectUpload"
src=
"https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png"
></u-image>
</view>
</view>
<!--
<u-image
class=
"pic"
v-for=
"item in 6"
width=
"170rpx"
height=
"170"
src=
"'https://cdn.uviewui.com/uview/example/fade.jpg"
></u-image>
-->
<!--
<u-image
class=
"pic"
v-for=
"item in 6"
width=
"170rpx"
height=
"170"
src=
"'https://cdn.uviewui.com/uview/example/fade.jpg"
></u-image>
-->
...
@@ -23,12 +23,12 @@
...
@@ -23,12 +23,12 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
objMixin
from
'./obj
Mixin'
import
arrMixin
from
'./arr
Mixin'
import
baseFile
from
'@/components/upload/index'
;
import
baseFile
from
'@/components/upload/index'
;
export
default
{
export
default
{
name
:
'XhFiles'
,
name
:
'XhFiles'
,
components
:
{},
components
:
{},
mixins
:
[
obj
Mixin
,
baseFile
],
mixins
:
[
arr
Mixin
,
baseFile
],
props
:
{
props
:
{
files
:
{
files
:
{
type
:
Array
,
type
:
Array
,
...
@@ -60,17 +60,37 @@
...
@@ -60,17 +60,37 @@
},
},
'files'
:
{
// 处理相机拍照返回的图片
'files'
:
{
// 处理相机拍照返回的图片
handler
(
val
)
{
handler
(
val
)
{
this
.
imgList
=
val
.
map
(
v
=>
{
if
(
val
&&
val
.
length
>
0
){
v
.
path
=
v
.
src
val
.
forEach
((
item
,
index
,
array
)
=>
{
return
v
item
.
path
=
item
.
src
this
.
imgList
.
push
(
item
)
})
})
// this.imgList = val.map(v => {
// v.path = v.src
// return v
// })
this
.
setValue
()
this
.
setValue
()
}
},
},
deep
:
true
,
deep
:
true
,
immediate
:
true
,
immediate
:
true
,
},
// 'value'(val, oldVal){
// if(val){
// this.imgList = val.map(img =>{
// return {path:img}
// })
// }
// }
},
mounted
()
{
if
(
this
.
value
){
this
.
imgList
=
this
.
value
.
map
(
img
=>
{
return
{
path
:
img
}
})
}
}
this
.
setValue
()
},
},
mounted
()
{},
methods
:
{
methods
:
{
selectUpload
(){
selectUpload
(){
// 弹窗展示
// 弹窗展示
...
@@ -90,7 +110,7 @@
...
@@ -90,7 +110,7 @@
let
config
=
{
let
config
=
{
options
:{
options
:{
sourceType
:[
'album'
],
//['album', 'camera']
sourceType
:[
'album'
],
//['album', 'camera']
count
:
5
,
count
:
10
,
sizeType
:
[
'compressed'
]
sizeType
:
[
'compressed'
]
}
}
}
}
...
@@ -104,9 +124,8 @@
...
@@ -104,9 +124,8 @@
setValue
()
{
setValue
()
{
const
dataValue
=
[]
const
dataValue
=
[]
this
.
imgList
.
map
(
item
=>
{
this
.
imgList
.
map
(
item
=>
{
dataValue
.
push
(
item
.
key
)
dataValue
.
push
(
item
.
src
)
})
})
console
.
log
(
this
.
imgList
)
this
.
valueChange
(
dataValue
)
this
.
valueChange
(
dataValue
)
},
},
prviewImage
(
url
,
index
)
{
prviewImage
(
url
,
index
)
{
...
@@ -117,14 +136,15 @@
...
@@ -117,14 +136,15 @@
},
},
delFile
(
index
)
{
delFile
(
index
)
{
this
.
imgList
.
splice
(
index
,
1
)
this
.
imgList
.
splice
(
index
,
1
)
this
.
setValue
()
}
}
}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.pic
{
.pic
{
margin-right
:
15rpx
;
//
margin-right: 15rpx;
margin-bottom
:
15rpx
;
//
margin-bottom: 15rpx;
&
:nth-child
(
3n
)
{
&
:nth-child
(
3n
)
{
margin-right
:
0
;
margin-right
:
0
;
}
}
...
...
src/components/createCom/XhInput.vue
View file @
37caa8cc
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
},
},
computed
:
{
computed
:
{
type
()
{
type
()
{
console
.
log
(
this
.
item
)
if
(
this
.
item
&&
this
.
item
.
fieldsType
==
'password'
||
this
.
item
.
fieldsType
==
'textarea'
)
{
if
(
this
.
item
&&
this
.
item
.
fieldsType
==
'password'
||
this
.
item
.
fieldsType
==
'textarea'
)
{
return
this
.
item
.
fieldsType
return
this
.
item
.
fieldsType
}
else
{
}
else
{
...
...
src/components/createCom/XhLocation.vue
View file @
37caa8cc
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
<view
class=
"list u-flex u-row-between"
>
<view
class=
"list u-flex u-row-between"
>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<view
class=
"u-m-r-20"
>
{{
item
.
fieldsTitle
}}
</view>
<view
class=
"u-m-r-20"
>
{{
item
.
fieldsTitle
}}
</view>
<!--
<u-button
type=
"primary"
size=
"mini"
@
click=
"$u.debounce(getLocation,1000)"
>
自动定位
</u-button>
-->
<view
class=
"u-flex-1 location-name"
>
<view
class=
"u-flex-1 location-name"
>
<u-icon
name=
"map"
color=
"#2979ff"
size=
"30"
></u-icon>
自动定位
<u-icon
name=
"map"
color=
"#2979ff"
size=
"30"
></u-icon>
自动定位
</view>
</view>
...
@@ -14,11 +13,11 @@
...
@@ -14,11 +13,11 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
objMixin
from
'./obj
Mixin'
import
arrMixin
from
'./arr
Mixin'
export
default
{
export
default
{
name
:
'XhLocation'
,
name
:
'XhLocation'
,
components
:
{},
components
:
{},
mixins
:
[
obj
Mixin
],
mixins
:
[
arr
Mixin
],
props
:
{},
props
:
{},
filters
:{},
filters
:{},
data
()
{
data
()
{
...
...
src/components/createCom/XhPicker.vue
View file @
37caa8cc
<!-- *******************
单级/多级 选择
******************* -->
<!-- *******************
服务措施
******************* -->
<
template
>
<
template
>
<view
class=
"picker-box"
>
<view
class=
"picker-box"
>
<view
class=
"u-flex u-row-between"
@
click=
"openPicker"
>
<view
class=
"u-flex u-row-between"
@
click=
"openPicker"
>
...
...
src/components/createCom/XhRadio.vue
View file @
37caa8cc
<!-- ******************* 单选框 ******************* -->
<!-- ******************* 单选框 ******************* -->
<
template
>
<
template
>
<view
class=
"list"
>
<view
class=
"list"
>
<view
v-for=
"(item,index) in settings"
:key=
"index"
:class=
"
{'txt':true,'active':item===dataValue}"
<view
v-for=
"(item,index) in settings"
:key=
"index"
:class=
"
{'txt':true,'active':item
.key
===dataValue}"
@click="setValue(item
)">
{{
item
}}
</view>
@click="setValue(item
.key)">
{{
item
.
label
}}
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
},
},
computed
:
{
computed
:
{
settings
(){
settings
(){
return
this
.
item
.
setting
s
||
[]
return
this
.
item
.
fieldsOption
s
||
[]
}
}
},
},
watch
:
{},
watch
:
{},
...
...
src/components/createCom/XhSelect.vue
View file @
37caa8cc
<!-- ******************* 单个下拉选择 ******************* -->
<!-- ******************* 单个下拉选择 ******************* -->
<
template
>
<
template
>
<view>
<view>
<u-input
v-model=
"dataValue
"
readOnly
@
click=
"show=true"
type=
"select"
/>
<u-input
:value=
"text
"
readOnly
@
click=
"show=true"
type=
"select"
/>
<u-action-sheet
:list=
"settings"
v-model=
"show"
@
click=
"actionSheetCallback"
></u-action-sheet>
<u-action-sheet
:list=
"settings"
v-model=
"show"
@
click=
"actionSheetCallback"
></u-action-sheet>
</view>
</view>
</
template
>
</
template
>
...
@@ -28,22 +28,27 @@
...
@@ -28,22 +28,27 @@
},
},
settings
()
{
settings
()
{
let
result
=
[]
let
result
=
[]
let
settings
=
this
.
item
.
setting
s
||
[]
let
settings
=
this
.
item
.
fieldsOption
s
||
[]
result
=
settings
.
map
(
item
=>
{
result
=
settings
.
map
(
item
=>
{
return
{
return
{
text
:
item
text
:
item
.
label
,
id
:
item
.
key
}
}
})
})
return
result
return
result
},
text
(){
let
option
=
this
.
item
.
fieldsOptions
.
find
(
a
=>
{
return
a
.
key
===
this
.
dataValue
})
return
option
?
option
.
label
:
''
}
}
},
},
watch
:
{},
watch
:
{},
mounted
()
{},
mounted
()
{},
methods
:
{
methods
:
{
actionSheetCallback
(
index
)
{
actionSheetCallback
(
index
)
{
let
txt
=
this
.
settings
[
index
].
text
;
let
id
=
this
.
settings
[
index
].
id
;
this
.
dataValue
=
txt
this
.
dataValue
=
id
this
.
valueChange
(
txt
)
this
.
valueChange
(
id
)
}
}
}
}
}
}
...
...
src/components/createCom/XhTime.vue
View file @
37caa8cc
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
<
template
>
<
template
>
<view
class=
"picker-box"
>
<view
class=
"picker-box"
>
<view
class=
"u-flex u-row-between"
@
click=
"openPicker"
>
<view
class=
"u-flex u-row-between"
@
click=
"openPicker"
>
<
view
class=
"txt"
>
{{
item
.
fieldsTitle
}}
</view
>
<
!--
<view
class=
"txt"
>
{{
item
.
fieldsTitle
}}
</view>
--
>
<view
class=
"txt u-flex-1"
>
{{
dataValue
}}
</view>
<view
class=
"txt u-flex-1"
>
{{
dataValue
||
'请选择时间'
}}
</view>
<u-icon
name=
"arrow-right"
color=
"#666"
size=
"28"
></u-icon>
<u-icon
name=
"arrow-right"
color=
"#666"
size=
"28"
></u-icon>
</view>
</view>
<u-picker
:params=
"params"
v-model=
"showPicker"
mode=
"time"
@
confirm=
"pickerConfirm"
></u-picker>
<u-picker
:params=
"params"
v-model=
"showPicker"
mode=
"time"
@
confirm=
"pickerConfirm"
></u-picker>
...
@@ -25,10 +25,9 @@
...
@@ -25,10 +25,9 @@
year
:
true
,
year
:
true
,
month
:
true
,
month
:
true
,
day
:
true
,
day
:
true
,
hour
:
true
,
hour
:
false
,
minute
:
true
,
minute
:
false
,
second
:
true
,
second
:
false
,
// 选择时间的时间戳
timestamp
:
true
,
timestamp
:
true
,
}
}
}
}
...
@@ -49,11 +48,8 @@
...
@@ -49,11 +48,8 @@
this
.
showPicker
=
true
this
.
showPicker
=
true
},
},
pickerConfirm
(
data
)
{
pickerConfirm
(
data
)
{
console
.
log
(
data
,
'DATA'
)
let
result
=
[]
let
result
=
[]
let
dataValue
=
data
.
year
+
'-'
+
data
.
month
+
'-'
+
data
.
day
+
' '
+
data
.
hour
+
':'
+
data
.
minute
+
let
dataValue
=
data
.
year
+
'-'
+
data
.
month
+
'-'
+
data
.
day
':'
+
data
.
second
console
.
log
(
dataValue
,
'dataValue'
)
this
.
dataValue
=
dataValue
this
.
dataValue
=
dataValue
this
.
valueChange
(
dataValue
)
this
.
valueChange
(
dataValue
)
},
},
...
...
src/pages/order/complete.vue
View file @
37caa8cc
...
@@ -2,69 +2,70 @@
...
@@ -2,69 +2,70 @@
<view>
<view>
<view
class=
"u-wrap"
v-if=
"!takeStatus"
>
<view
class=
"u-wrap"
v-if=
"!takeStatus"
>
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-tabs-swiper
ref=
"tabs"
:current=
"tabIndex"
:list=
"list
"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"120"
></u-tabs-swiper>
<u-tabs-swiper
ref=
"tabs"
:current=
"tabIndex"
name=
"panelName"
:list=
"list"
@
change=
"tabsChange
"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"120"
></u-tabs-swiper>
<view
class=
"u-menu-wrap"
>
<view
class=
"u-menu-wrap"
>
<scroll-view
scroll-y
scroll-with-animation
class=
"u-tab-view menu-scroll-view"
:scroll-top=
"scrollTop"
<scroll-view
scroll-y
scroll-with-animation
class=
"u-tab-view menu-scroll-view"
:scroll-top=
"scrollTop"
:scroll-into-view=
"itemId"
v-if=
"list[tabIndex].items.length > 1"
>
:scroll-into-view=
"itemId"
>
<view
v-for=
"(item,index) in list[tabIndex].items"
:key=
"index"
class=
"u-tab-item"
<view
v-for=
"(item,index) in groupList"
:key=
"index"
class=
"u-tab-item"
:class=
"[current == index ? 'u-tab-item-active' : '']"
@
tap
.
stop=
"swichMenu(index)"
>
:class=
"[current == index ? 'u-tab-item-active' : '']"
@
tap
.
stop=
"swichMenu(index)"
>
<text
class=
"u-line-1"
>
{{
item
.
groupN
ame
}}
</text>
<text
class=
"u-line-1"
>
{{
item
.
n
ame
}}
</text>
</view>
</view>
</scroll-view>
</scroll-view>
<scroll-view
:scroll-top=
"scrollRightTop"
scroll-y
scroll-with-animation
class=
"right-box"
<scroll-view
:scroll-top=
"scrollRightTop"
scroll-y
scroll-with-animation
class=
"right-box"
@
scroll=
"rightScroll"
>
@
scroll=
"rightScroll"
>
<u-form
:model=
"form"
ref=
"uForm"
>
<u-form
:model=
"form"
ref=
"uForm"
>
<template
v-for=
"(groupItem,groupIndex) in groupList
"
>
<template
v-for=
"(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])
"
>
<view
class=
"class-item"
:key=
"groupIndex"
>
<view
class=
"class-item"
:key=
"groupIndex"
>
<view
class=
"title"
>
{{
groupItem
.
groupN
ame
}}
</view>
<view
class=
"title"
>
{{
groupItem
.
n
ame
}}
</view>
<view
class=
"class-bd"
>
<view
class=
"class-bd"
>
<u-form-item
v-for=
"(item,itemIndex) in groupItem.item
"
:key=
"itemIndex"
<u-form-item
v-for=
"(item,itemIndex) in groupItem.items
"
:key=
"itemIndex"
label-position=
"top"
:prop=
"item.fieldsName"
:border-bottom=
"false"
>
label-position=
"top"
:prop=
"item.fieldsName"
:border-bottom=
"false"
>
<view
class=
"label"
v-if=
"item.fieldsType!=='location'"
>
<view
class=
"label"
v-if=
"typeToComponentType(item.fieldsType)!=='location'"
>
<!--
<text
class=
"required"
v-if=
"item.required"
>
*
</text>
-->
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
{{
item
.
fieldsTitle
}}
{{
item
.
fieldsTitle
}}
</view>
</view>
<template
v-if=
"item.fieldsType"
>
<template
v-if=
"item.fieldsType"
>
<xh-input
v-if=
"typeToComponentType(item.fieldsType)==='input'"
:groupIndex=
"groupIndex"
<xh-input
v-if=
"typeToComponentType(item.fieldsType)==='input'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
@
value-change=
"fieldValueChange"
>
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
</xh-input>
</xh-input>
<xh-multi-input
v-else-if=
"typeToComponentType(item.fieldsType)==='multiinput'"
<xh-multi-input
v-else-if=
"typeToComponentType(item.fieldsType)==='multiinput'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-multi-input>
</xh-multi-input>
<xh-radio
v-else-if=
"typeToComponentType(item.fieldsType)==='radio'"
<xh-radio
v-else-if=
"typeToComponentType(item.fieldsType)==='radio'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-radio>
</xh-radio>
<xh-checkbox
v-else-if=
"typeToComponentType(item.fieldsType)==='checkbox'"
<xh-checkbox
v-else-if=
"typeToComponentType(item.fieldsType)==='checkbox'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-checkbox>
</xh-checkbox>
<xh-select
v-else-if=
"typeToComponentType(item.fieldsType)==='select'"
<xh-select
v-else-if=
"typeToComponentType(item.fieldsType)==='select'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-select>
</xh-select>
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || []'
:files=
"files[itemIndex.toString()]"
:files=
"files[itemIndex.toString()]"
@
value-change=
"fieldValueChange"
@
getTakeStatus=
"getTakeStatus"
>
@
value-change=
"fieldValueChange"
@
getTakeStatus=
"getTakeStatus"
>
</xh-files>
</xh-files>
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-location>
</xh-location>
<xh-scan
v-else-if=
"typeToComponentType(item.fieldsType)==='scan'"
<xh-scan
v-else-if=
"typeToComponentType(item.fieldsType)==='scan'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-scan>
</xh-scan>
<xh-picker
v-else-if=
"typeToComponentType(item.fieldsType)==='picker'"
<xh-picker
v-else-if=
"typeToComponentType(item.fieldsType)==='picker'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-picker>
</xh-picker>
<xh-service-measure
v-else-if=
"typeToComponentType(item.fieldsType)==='servicemeasure'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:orderId=
"orderId"
:categoryId=
"categoryId"
:orderServiceType=
"orderServiceType"
:specificationId=
"form['specificationId'] || 0"
:value=
"form[item.fieldsName]"
@
value-change=
"fieldValueChange"
>
</xh-service-measure>
<xh-time
v-else-if=
"typeToComponentType(item.fieldsType)==='time'"
<xh-time
v-else-if=
"typeToComponentType(item.fieldsType)==='time'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-time>
</xh-time>
</
template
>
</
template
>
...
@@ -76,7 +77,7 @@
...
@@ -76,7 +77,7 @@
</scroll-view>
</scroll-view>
</view>
</view>
<view
class=
"btn-wrap flex-xc"
>
<view
class=
"btn-wrap flex-xc"
>
<u-button
class=
"btn-submit"
@
click=
"$u.debounce(nextStep, 500)"
:custom-style=
"buttonStyle"
<u-button
class=
"btn-submit"
@
click=
"nextStep"
:custom-style=
"buttonStyle"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
下一步
下一步
</u-button>
</u-button>
...
@@ -98,22 +99,16 @@
...
@@ -98,22 +99,16 @@
import
XhPicker
from
'@/components/createCom/XhPicker.vue'
import
XhPicker
from
'@/components/createCom/XhPicker.vue'
import
XhTime
from
'@/components/createCom/XhTime.vue'
import
XhTime
from
'@/components/createCom/XhTime.vue'
import
takePhoto
from
'@/components/take/index.vue'
import
takePhoto
from
'@/components/take/index.vue'
import
XhServiceMeasure
from
'@/components/createCom/XhServiceMeasure.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue'
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
list
:
[
orderId
:
0
,
{
categoryId
:
0
,
name
:
'基础信息'
orderServiceType
:
''
,
},
list
:
[],
{
tabIndex
:
0
,
name
:
'勘察信息'
},
{
name
:
'安装信息'
}
],
tabIndex
:
1
,
scrollTop
:
0
,
//tab标题的滚动条位置
scrollTop
:
0
,
//tab标题的滚动条位置
oldScrollTop
:
0
,
oldScrollTop
:
0
,
current
:
0
,
// 预设当前项的值
current
:
0
,
// 预设当前项的值
...
@@ -126,8 +121,6 @@
...
@@ -126,8 +121,6 @@
scrollRightTop
:
0
,
// 右边栏目scroll-view的滚动条高度
scrollRightTop
:
0
,
// 右边栏目scroll-view的滚动条高度
timer
:
null
,
// 定时器
timer
:
null
,
// 定时器
form
:
{
// 一维表单
form
:
{
// 一维表单
name
:
'name'
,
radio
:
''
},
},
rules
:
{
rules
:
{
name
:
[{
name
:
[{
...
@@ -172,13 +165,23 @@
...
@@ -172,13 +165,23 @@
XhScan
,
XhScan
,
XhPicker
,
XhPicker
,
XhTime
,
XhTime
,
XhServiceMeasure
,
'take-photo'
:
takePhoto
'take-photo'
:
takePhoto
},
},
created
()
{
created
()
{
// console.log(allComponents,'allComponents')
// console.log(allComponents,'allComponents')
},
},
onLoad
()
{
onLoad
(
option
)
{
console
.
log
(
option
)
if
(
option
)
{
this
.
orderId
=
option
.
orderId
this
.
categoryId
=
option
.
categoryId
this
.
orderServiceType
=
option
.
orderServiceType
}
else
{
this
.
orderId
=
9708719
this
.
categoryId
=
88
this
.
orderServiceType
=
'安装'
}
},
},
onReady
()
{
onReady
()
{
this
.
$refs
.
uForm
.
setRules
(
this
.
rules
);
this
.
$refs
.
uForm
.
setRules
(
this
.
rules
);
...
@@ -189,6 +192,18 @@
...
@@ -189,6 +192,18 @@
//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'
},
},
...
@@ -216,6 +231,16 @@
...
@@ -216,6 +231,16 @@
this
.
fileIndex
=
event
.
index
.
toString
()
this
.
fileIndex
=
event
.
index
.
toString
()
if
(
!
this
.
files
[
event
.
index
]
||
this
.
files
[
event
.
index
].
length
<
1
)
this
.
files
[
event
.
index
]
=
[]
if
(
!
this
.
files
[
event
.
index
]
||
this
.
files
[
event
.
index
].
length
<
1
)
this
.
files
[
event
.
index
]
=
[]
},
},
tabsChange
(
index
){
this
.
tabIndex
=
index
this
.
arr
=
[]
this
.
scrollRightTop
=
0
;
this
.
current
=
0
;
this
.
leftMenuStatus
(
0
)
this
.
$nextTick
(
function
()
{
this
.
getMenuItemTop
()
})
},
closeTake
(
images
)
{
closeTake
(
images
)
{
this
.
takeStatus
=
false
this
.
takeStatus
=
false
//const newFile = this.files[this.fileIndex].concat(images)
//const newFile = this.files[this.fileIndex].concat(images)
...
@@ -223,25 +248,28 @@
...
@@ -223,25 +248,28 @@
},
},
// 字段的值更新
// 字段的值更新
fieldValueChange
(
data
)
{
fieldValueChange
(
data
)
{
// data.groupIndex data.itemIndex值下标 data.value //值
const
groupItem
=
this
.
list
[
this
.
tabIndex
].
items
[
data
.
groupIndex
]
console
.
log
(
data
,
'data'
)
const
groupItem
=
this
.
groupList
[
data
.
groupIndex
]
let
innerItem
let
innerItem
if
(
groupItem
.
item
)
{
if
(
groupItem
.
items
)
{
innerItem
=
groupItem
.
item
[
data
.
itemIndex
]
innerItem
=
groupItem
.
items
[
data
.
itemIndex
]
}
}
console
.
log
(
data
.
value
,
'data.value'
,
innerItem
,
'innerItem'
)
if
(
innerItem
.
fieldsType
===
'multiInput'
){
if
(
innerItem
.
fieldsType
===
'multiInput'
){
// 多个输入框的值触发
// 多个输入框的值触发
let
key
=
Object
.
keys
(
data
.
value
)[
0
]
let
key
=
Object
.
keys
(
data
.
value
)[
0
]
this
.
form
[
key
]
=
data
.
value
[
key
]
this
.
form
[
key
]
=
data
.
value
[
key
]
}
else
{
}
else
{
this
.
form
[
innerItem
.
fieldsName
]
=
data
.
value
this
.
$set
(
this
.
form
,
innerItem
.
fieldsName
,
data
.
value
)
}
}
console
.
log
(
this
.
form
,
'this.form'
)
console
.
log
(
this
.
form
,
'this.form'
)
},
},
nextStep
(
item
)
{
nextStep
()
{
if
(
this
.
tabIndex
<
3
)
this
.
tabIndex
++
if
(
this
.
tabIndex
<
this
.
list
.
length
)
{
this
.
tabIndex
++
this
.
arr
=
[]
this
.
$nextTick
(
function
()
{
this
.
getMenuItemTop
()
})
}
},
},
typeToComponentType
(
type
)
{
typeToComponentType
(
type
)
{
// 将fieldType类型统一转换为公共组件判定类型
// 将fieldType类型统一转换为公共组件判定类型
...
@@ -252,12 +280,15 @@
...
@@ -252,12 +280,15 @@
case
'password'
:
case
'password'
:
case
'textarea'
:
case
'textarea'
:
case
'number'
:
case
'number'
:
case
'decimal'
:
case
'double'
:
formType
=
'input'
formType
=
'input'
break
break
case
'multiinput'
:
case
'multiinput'
:
formType
=
'multiinput'
formType
=
'multiinput'
break
;
break
;
case
'select'
:
case
'select'
:
case
'specifications'
:
formType
=
'select'
formType
=
'select'
break
break
case
'radio'
:
case
'radio'
:
...
@@ -267,6 +298,7 @@
...
@@ -267,6 +298,7 @@
formType
=
'checkbox'
formType
=
'checkbox'
break
break
case
'file'
:
case
'file'
:
case
'photos'
:
formType
=
'file'
formType
=
'file'
break
break
case
'location'
:
case
'location'
:
...
@@ -279,11 +311,14 @@
...
@@ -279,11 +311,14 @@
case
'mutipicker'
:
case
'mutipicker'
:
formType
=
'picker'
formType
=
'picker'
break
break
case
'service_measures'
:
formType
=
'servicemeasure'
break
case
'time'
:
case
'time'
:
case
'date'
:
formType
=
'time'
formType
=
'time'
break
break
}
}
//console.log(formType,'formType')
return
formType
return
formType
},
},
// ------------------------- 以下方法为展示滚动切换 -------------------------
// ------------------------- 以下方法为展示滚动切换 -------------------------
...
...
src/pages/order/detail.vue
View file @
37caa8cc
...
@@ -378,6 +378,8 @@
...
@@ -378,6 +378,8 @@
// 去完工
// 去完工
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'pages/order/complete?orderId='
+
this
.
order
.
orderId
url
:
'pages/order/complete?orderId='
+
this
.
order
.
orderId
+
"&categoryId="
+
this
.
order
.
categoryId
+
"&orderServiceType="
+
this
.
order
.
orderServiceType
})
})
},
},
/**
/**
...
...
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