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
3d175aa5
Commit
3d175aa5
authored
May 07, 2021
by
Damon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完工信息-校验
parent
3455a3d2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
11 deletions
+19
-11
complete-check.vue
src/components/complete-check/complete-check.vue
+1
-1
XhSelect.vue
src/components/createCom/XhSelect.vue
+5
-2
XhServiceMeasure.vue
src/components/createCom/XhServiceMeasure.vue
+5
-2
complete.vue
src/pages/order/complete.vue
+8
-6
No files found.
src/components/complete-check/complete-check.vue
View file @
3d175aa5
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
},
},
confirm
()
{
confirm
()
{
if
(
this
.
pass
)
{
if
(
this
.
pass
)
{
this
.
$emit
(
'c
onfirm
'
)
this
.
$emit
(
'c
hange
'
)
}
else
{
}
else
{
let
data
=
this
.
listData
.
find
((
item
,
index
)
=>
{
let
data
=
this
.
listData
.
find
((
item
,
index
)
=>
{
return
item
.
pass
==
false
;
return
item
.
pass
==
false
;
...
...
src/components/createCom/XhSelect.vue
View file @
3d175aa5
<!-- ******************* 单个下拉选择 ******************* -->
<!-- ******************* 单个下拉选择 ******************* -->
<
template
>
<
template
>
<view
class=
"xh-select"
>
<view
class=
"xh-select"
:style=
"
{'width': fieldsWidth}"
>
<u-input
:value=
"text"
disabled
@
click=
"show=true"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
<u-input
:value=
"text"
disabled
@
click=
"show=true"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
:custom-style=
"customStyle"
:clearable=
"false"
></u-input>
:custom-style=
"customStyle"
:clearable=
"false"
></u-input>
<u-select
:list=
"settings"
v-model=
"show"
@
confirm=
"actionSheetCallback"
safe-area-inset-bottom
></u-select>
<u-select
:list=
"settings"
v-model=
"show"
@
confirm=
"actionSheetCallback"
safe-area-inset-bottom
></u-select>
...
@@ -68,7 +68,10 @@
...
@@ -68,7 +68,10 @@
'font-size'
:
'26rpx'
,
'font-size'
:
'26rpx'
,
'height'
:
'76rpx'
'height'
:
'76rpx'
}
}
}
},
fieldsWidth
()
{
return
this
.
item
.
fieldsWidth
?
(
this
.
item
.
fieldsWidth
+
'rpx'
)
:
'100%'
},
},
},
watch
:
{},
watch
:
{},
mounted
()
{},
mounted
()
{},
...
...
src/components/createCom/XhServiceMeasure.vue
View file @
3d175aa5
<!-- ******************* 单级/多级 选择 ******************* -->
<!-- ******************* 单级/多级 选择 ******************* -->
<
template
>
<
template
>
<view
class=
"picker-box"
>
<view
class=
"picker-box"
:style=
"
{'width': fieldsWidth}"
>
<view
class=
"u-flex u-row-between text-view"
@
click=
"openPicker"
>
<view
class=
"u-flex u-row-between text-view"
@
click=
"openPicker"
>
<view
class=
"txt u-flex-1 text-title"
>
{{
text
||
''
}}
</view>
<view
class=
"txt u-flex-1 text-title"
>
{{
text
||
''
}}
</view>
<u-icon
class=
"input-icon"
color=
"#2272FF"
:name=
"showPicker ? 'arrow-up' : 'arrow-down'"
></u-icon>
<u-icon
class=
"input-icon"
color=
"#2272FF"
:name=
"showPicker ? 'arrow-up' : 'arrow-down'"
></u-icon>
...
@@ -68,7 +68,10 @@
...
@@ -68,7 +68,10 @@
val
=
data
[
0
].
measureTypeName
+
"-"
+
data
[
0
].
measureName
val
=
data
[
0
].
measureTypeName
+
"-"
+
data
[
0
].
measureName
}
}
return
val
return
val
}
},
fieldsWidth
()
{
return
this
.
item
.
fieldsWidth
?
(
this
.
item
.
fieldsWidth
+
'rpx'
)
:
'100%'
},
},
},
watch
:
{
watch
:
{
specificationId
(
val
,
oldVal
){
specificationId
(
val
,
oldVal
){
...
...
src/pages/order/complete.vue
View file @
3d175aa5
<
template
>
<
template
>
<view
class=
"com-content"
>
<view
class=
"com-content"
>
<complete-check
:show=
"completeCheckStatus"
:list-data=
"completeCheckResult"
@
close=
"closeCheckResult"
@
handle=
"handerProgrom"
@
change=
"confirm"
></complete-check>
<complete-check
:show=
"completeCheckStatus"
:list-data=
"completeCheckResult"
:pass=
"pass"
@
close=
"closeCheckResult"
@
handle=
"handerProgrom"
@
change=
"confirm"
></complete-check>
<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="32" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-tabs-swiper
class=
"order-tabs"
ref=
"tabs"
:current=
"tabIndex"
name=
"panelName"
:list=
"list"
@
change=
"tabsChange"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"80"
font-size=
"32"
></u-tabs-swiper>
<u-tabs-swiper
class=
"order-tabs"
ref=
"tabs"
:current=
"tabIndex"
name=
"panelName"
:list=
"list"
@
change=
"tabsChange"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"80"
font-size=
"32"
></u-tabs-swiper>
...
@@ -167,7 +167,8 @@
...
@@ -167,7 +167,8 @@
completeCheckResult
:
[],
completeCheckResult
:
[],
waitHandlerPanelIndex
:
0
,
waitHandlerPanelIndex
:
0
,
waitHandlerGroupIndex
:
0
,
waitHandlerGroupIndex
:
0
,
waitHandlerEleIndex
:
0
,
waitHandlerEleIndex
:
0
,
pass
:
false
}
}
},
},
components
:
{
components
:
{
...
@@ -317,9 +318,9 @@
...
@@ -317,9 +318,9 @@
self
.
completeCheckResult
=
checkResult
self
.
completeCheckResult
=
checkResult
return
pass
return
pass
},
},
confirm
(){
// 检查结果窗口 确认回调
confirm
(){
// 检查结果窗口 确认回调
uni
.
navigateTo
({
uni
.
switchTab
({
url
:
'pages/order/index'
url
:
'
/
pages/order/index'
})
})
},
},
closeCheckResult
(){
// 检查结果窗口取消回调
closeCheckResult
(){
// 检查结果窗口取消回调
...
@@ -344,7 +345,8 @@
...
@@ -344,7 +345,8 @@
if
(
!
pass
){
if
(
!
pass
){
self
.
completeCheckStatus
=
true
self
.
completeCheckStatus
=
true
}
else
{
}
else
{
console
.
log
(
"完工"
);
console
.
log
(
"完工"
);
this
.
pass
=
pass
if
(
self
.
inGuaranteePeriod
===
'Y'
){
if
(
self
.
inGuaranteePeriod
===
'Y'
){
self
.
$u
.
api
.
inOrderFinish
(
self
.
orderId
).
then
((
res
)
=>
{
self
.
$u
.
api
.
inOrderFinish
(
self
.
orderId
).
then
((
res
)
=>
{
console
.
log
(
res
)
console
.
log
(
res
)
...
...
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