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
27e28742
Commit
27e28742
authored
Jun 08, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://git.banshouhui.com/lijundan/self-support
into dev
parents
95f720ea
0085ebd7
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
401 additions
and
366 deletions
+401
-366
.env.dev.js
.env.dev.js
+3
-3
order.js
src/common/api/order.js
+7
-1
complete-check.vue
src/components/complete-check/complete-check.vue
+56
-38
XhCheckbox.vue
src/components/createCom/XhCheckbox.vue
+1
-1
XhFiles.vue
src/components/createCom/XhFiles.vue
+1
-1
XhInput.vue
src/components/createCom/XhInput.vue
+21
-31
complete.vue
src/pages/order/complete.vue
+311
-291
detail.vue
src/pages/order/detail.vue
+1
-0
No files found.
.env.dev.js
View file @
27e28742
...
@@ -5,11 +5,11 @@ const UNI_APP = {
...
@@ -5,11 +5,11 @@ const UNI_APP = {
// banshou: 'https://m.banshou.com', //扳手app
// banshou: 'https://m.banshou.com', //扳手app
},
},
systemUrl
:
{
systemUrl
:
{
apiUrl
:
'http://192.168.
1.22
'
,
//java端域名请求头
apiUrl
:
'http://192.168.
0.62:37080
'
,
//java端域名请求头
// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
},
},
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://deudn.c.pp.cc/'
,
argoDebugMode
:
1
argoDebugMode
:
1
}
}
module
.
exports
=
UNI_APP
;
module
.
exports
=
UNI_APP
;
src/common/api/order.js
View file @
27e28742
...
@@ -119,6 +119,11 @@ let orderApiFun = function(vm){
...
@@ -119,6 +119,11 @@ let orderApiFun = function(vm){
*/
*/
let
getCompleteConfigAndData
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/info'
);
let
getCompleteConfigAndData
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/info'
);
/**
* 完工项阶段下一步
*/
let
completeNextStep
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/nextStep'
,
params
);
/**
/**
* 查询措施
* 查询措施
*/
*/
...
@@ -218,7 +223,8 @@ let orderApiFun = function(vm){
...
@@ -218,7 +223,8 @@ let orderApiFun = function(vm){
otherUser
,
otherUser
,
checkAddCustomer
,
checkAddCustomer
,
fileLabel
,
fileLabel
,
fileList
fileList
,
completeNextStep
}
}
return
orderApi
return
orderApi
}
}
...
...
src/components/complete-check/complete-check.vue
View file @
27e28742
...
@@ -9,38 +9,49 @@
...
@@ -9,38 +9,49 @@
mode=
"center"
mode=
"center"
width=
"690rpx"
>
width=
"690rpx"
>
<view
class=
"slot-content"
>
<view
class=
"slot-content"
>
<view
class=
"check-status"
>
<view
v-if=
"confirmButtonText !== '确定'"
>
<u-image
width=
"224rpx"
height=
"224rpx"
:src=
"statusImage"
></u-image>
<view
class=
"check-status"
>
<text
:class=
"['status-txt',
{ 'pass-color': pass }]">
{{
statusTxt
}}
</text>
<u-image
width=
"224rpx"
height=
"224rpx"
:src=
"statusImage"
></u-image>
</view>
<text
:class=
"['status-txt',
{ 'pass-color': pass }]">
{{
statusTxt
}}
</text>
<view
class=
"check-list"
>
<view
class=
"u-flex u-row-between list-title"
>
<view
class=
"left-txt"
>
验证项
</view>
<view>
已提交/需提交
</view>
<view
class=
"right-txt"
>
结果
</view>
</view>
</view>
<view
class=
"u-flex u-row-between list-item"
<view
class=
"check-list"
>
v-for=
"(item, index) in listData"
:key=
"index"
>
<view
class=
"u-flex u-row-between list-title"
>
<view
class=
"item-txt left-txt"
style=
"width: 160rpx;text-align: left;"
>
<view
class=
"left-txt"
>
验证项
</view>
<u-icon
<view>
已提交/需提交
</view>
:name=
"item.pass ? passIcon : noPassIcon"
<view
class=
"right-txt"
>
结果
</view>
:label=
"item.label"
margin-left=
"12"
label-color=
"#333333"
label-size=
"28"
size=
"32"
></u-icon>
</view>
</view>
<view
class=
"item-txt"
>
{{
item
.
submitted
}}
/
{{
item
.
required
}}
</view>
<view
class=
"u-flex u-row-between list-item"
<view
v-for=
"(item, index) in listData"
:key=
"index"
>
:class=
"['item-txt', 'right-txt', item.pass ? 'pass-color' : 'no-pass-color']"
<view
class=
"item-txt left-txt"
style=
"width: 200rpx;text-align: left;"
>
style=
"width: 160rpx;text-align: right;"
>
<u-icon
{{
item
.
pass
?
"通过"
:
"未通过"
}}
:name=
"item.pass ? passIcon : noPassIcon"
:label=
"item.label"
margin-left=
"12"
label-color=
"#333333"
label-size=
"28"
size=
"32"
></u-icon>
</view>
<view
class=
"item-txt"
>
{{
item
.
submitted
}}
/
{{
item
.
required
}}
</view>
<view
:class=
"['item-txt', 'right-txt', item.pass ? 'pass-color' : 'no-pass-color']"
style=
"width: 160rpx;text-align: right;"
>
{{
item
.
pass
?
"通过"
:
"未通过"
}}
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view
v-else
>
<view
class=
"check-status"
>
<text
class=
'status-txt'
style=
"color: #333;"
>
确认安装结果
</text>
</view>
<view
class=
"u-flex no-install"
>
<text
class=
"tips"
>
提交信息,确认安装结论为不安装
</text>
</view>
</view>
<view
class=
"check-bottom"
>
<view
class=
"check-bottom"
>
<view
class=
"button cancel"
v-show=
"
!pass"
@
tap=
"cancel"
>
取消
</view>
<view
class=
"button cancel"
v-show=
"
cancelButtonText !== ''"
@
tap=
"cancel"
>
{{
cancelButtonText
}}
</view>
<view
class=
"button confirm"
@
tap=
"confirm"
>
{{
confirmText
}}
</view>
<view
class=
"button confirm"
@
tap=
"confirm"
>
{{
confirmButtonText
}}
</view>
</view>
</view>
</view>
</view>
</u-popup>
</u-popup>
...
@@ -79,6 +90,14 @@
...
@@ -79,6 +90,14 @@
{
label
:
'安装信息'
,
submitted
:
15
,
required
:
20
,
pass
:
false
}
{
label
:
'安装信息'
,
submitted
:
15
,
required
:
20
,
pass
:
false
}
]
]
}
}
},
confirmButtonText
:
{
type
:
String
,
default
:
'确定'
},
cancelButtonText
:
{
type
:
String
,
default
:
''
}
}
},
},
data
()
{
data
()
{
...
@@ -104,9 +123,6 @@
...
@@ -104,9 +123,6 @@
statusTxt
()
{
statusTxt
()
{
return
this
.
pass
?
"完工校验已通过"
:
"完工校验未通过"
return
this
.
pass
?
"完工校验已通过"
:
"完工校验未通过"
},
},
confirmText
()
{
return
this
.
pass
?
"确定"
:
"去处理"
},
passIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/pass.png'
},
passIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/pass.png'
},
noPassIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/no-pass.png'
},
noPassIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/no-pass.png'
},
},
},
...
@@ -115,14 +131,7 @@
...
@@ -115,14 +131,7 @@
this
.
$emit
(
'close'
)
this
.
$emit
(
'close'
)
},
},
confirm
()
{
confirm
()
{
if
(
this
.
pass
)
{
this
.
$emit
(
'confirm'
)
this
.
$emit
(
'change'
)
}
else
{
let
data
=
this
.
listData
.
find
((
item
,
index
)
=>
{
return
item
.
pass
==
false
;
})
this
.
$emit
(
'handle'
,
data
)
}
}
}
},
},
...
@@ -161,6 +170,15 @@
...
@@ -161,6 +170,15 @@
margin-bottom
:
40rpx
;
margin-bottom
:
40rpx
;
}
}
}
}
.no-install
{
justify-content
:
center
;
align-items
:
center
;
height
:
200rpx
;
border-top
:
2rpx
solid
#F4F5F7
;
.tips
{
font-size
:
28rpx
;
}
}
.check-bottom
{
.check-bottom
{
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
...
@@ -194,7 +212,7 @@
...
@@ -194,7 +212,7 @@
line-height
:
32rpx
;
line-height
:
32rpx
;
}
}
.left-txt
{
.left-txt
{
width
:
16
0rpx
;
width
:
20
0rpx
;
text-align
:
left
;
text-align
:
left
;
}
}
.right-txt
{
.right-txt
{
...
...
src/components/createCom/XhCheckbox.vue
View file @
27e28742
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
display
:
flex
;
display
:
flex
;
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
line-height
:
50rpx
;
line-height
:
50rpx
;
max-width
:
46%
;
max-width
:
46%
;
align-items
:
center
;
align-items
:
center
;
&
.active
{
&
.active
{
background-color
:
#2272FF
;
background-color
:
#2272FF
;
...
...
src/components/createCom/XhFiles.vue
View file @
27e28742
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<view
class=
"file-box"
>
<view
class=
"file-box"
>
<view
class=
"pics u-flex u-flex-wrap"
>
<view
class=
"pics u-flex u-flex-wrap"
>
<view
class=
"img-list"
v-for=
"(item,index) in imgList"
:key=
"index"
>
<view
class=
"img-list"
v-for=
"(item,index) in imgList"
:key=
"index"
>
<u-image
class=
"pic"
width=
"160"
height=
"160"
:src=
"item.path ? item.path : item.src + '?imageView2/1/w/100/h/100/q/75'"
:border-radius=
"10"
@
click
.
stop=
"prviewImage(item,index)"
></u-image>
<u-image
class=
"pic"
width=
"160"
height=
"160"
:src=
"item.path ? item.path : item.src + '?imageView2/1/w/100/h/100/q/75'"
:border-radius=
"10"
@
click
.
stop=
"prviewImage(item,index)"
fade
lazy-load
></u-image>
<view
class=
"icon-del-box"
@
click
.
stop=
"delFile(index)"
>
<view
class=
"icon-del-box"
@
click
.
stop=
"delFile(index)"
>
<view
class=
"icon-del"
></view>
<view
class=
"icon-del"
></view>
<view
class=
"icon-del rotate"
></view>
<view
class=
"icon-del rotate"
></view>
...
...
src/components/createCom/XhInput.vue
View file @
27e28742
...
@@ -2,7 +2,10 @@
...
@@ -2,7 +2,10 @@
<
template
>
<
template
>
<view
:style=
"
{'width': fieldsWidth}">
<view
:style=
"
{'width': fieldsWidth}">
<u-input
:type=
"type"
class=
"input-item"
v-model=
"dataValue"
@
input=
"valueChange"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
<u-input
:type=
"type"
class=
"input-item"
v-model=
"dataValue"
@
input=
"valueChange"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
:custom-style=
"customStyle"
:clearable=
"false"
:border=
"border"
border-color=
"#ECECEC"
:maxlength=
"maxlength"
:cursor-spacing=
"10"
hold-keyboard
/>
:custom-style=
"customStyle"
:clearable=
"false"
:border=
"border"
border-color=
"#ECECEC"
:maxlength=
"maxlength"
:cursor-spacing=
"10"
:disabled=
"isDisabled"
hold-keyboard
/>
<view
class=
"content"
v-if=
"slotContent"
>
<text
class=
"txt"
>
{{
slotContent
}}
</text>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -26,42 +29,18 @@
...
@@ -26,42 +29,18 @@
type
:
{
type
:
{
type
:
String
,
type
:
String
,
default
:
'text'
default
:
'text'
},
slotContent
:
{
type
:
String
,
default
:
''
}
}
// width: { // 例如:454rpx
// type: String,
// default: '100%'
// }
},
},
data
()
{
data
()
{
return
{
return
{
inputType
:
'text'
,
inputType
:
'text'
// type: 'text'
}
}
},
},
computed
:
{
computed
:
{
// type() {
// if (this.item) {
// let ty = this.item.fieldsType.toLocaleLowerCase()
// switch (ty) {
// case 'text':
// return 'textarea'
// case 'password':
// return this.item.fieldsType
// case 'decimal':
// case 'number':
// case 'double':
// case 'integer':
// this.maxlength = 9
// return 'digit'
// case 'textarea':
// default:
// return 'text'
// }
// } else {
// return 'text'
// }
// },
maxlength
()
{
maxlength
()
{
return
this
.
type
==
'digit'
?
9
:
140
return
this
.
type
==
'digit'
?
9
:
140
},
},
...
@@ -89,6 +68,9 @@
...
@@ -89,6 +68,9 @@
},
},
backgroundColor
()
{
backgroundColor
()
{
return
this
.
textarea
?
'transparent'
:
'#F4F5F7'
return
this
.
textarea
?
'transparent'
:
'#F4F5F7'
},
isDisabled
()
{
return
this
.
item
.
function
?
true
:
false
}
}
},
},
watch
:
{},
watch
:
{},
...
@@ -97,8 +79,16 @@
...
@@ -97,8 +79,16 @@
}
}
</
script
>
</
script
>
<
style
scoped
>
<
style
lang=
"scss"
scoped
>
.input-item
{
.input-item
{
background
:
#F4F5F7
;
background
:
#F4F5F7
;
}
}
.content
{
padding-top
:
20rpx
;
line-height
:
45rpx
;
.txt
{
font-size
:
24rpx
;
color
:
#999
;
}
}
</
style
>
</
style
>
src/pages/order/complete.vue
View file @
27e28742
This diff is collapsed.
Click to expand it.
src/pages/order/detail.vue
View file @
27e28742
...
@@ -722,6 +722,7 @@
...
@@ -722,6 +722,7 @@
+
"&inGuaranteePeriod="
+
this
.
order
.
inGuaranteePeriod
+
"&inGuaranteePeriod="
+
this
.
order
.
inGuaranteePeriod
+
"&partnerCompanyId="
+
this
.
order
.
partnerCompanyId
+
"&partnerCompanyId="
+
this
.
order
.
partnerCompanyId
+
'&partnerCompanyName='
+
this
.
order
.
partnerCompanyName
+
'&partnerCompanyName='
+
this
.
order
.
partnerCompanyName
+
'&maintainStep='
+
this
.
order
.
maintainStep
})
})
},
},
rejectOrder
()
{
// 拒单
rejectOrder
()
{
// 拒单
...
...
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