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
29c2edb1
Commit
29c2edb1
authored
Jun 28, 2021
by
Morson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://git.banshouhui.com/lijundan/self-support
into dev
# Conflicts: # src/pages/order/detail.vue
parents
46b7c5ec
e59d6a50
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
77 additions
and
42 deletions
+77
-42
.env.js
.env.js
+2
-3
index.vue
src/components/order/index.vue
+25
-3
appliedPartsCell.vue
src/components/parts/appliedPartsCell.vue
+3
-3
spareCell.vue
src/components/parts/spareCell.vue
+11
-2
index.vue
src/components/submit-bar/index.vue
+2
-2
pages.json
src/pages.json
+1
-1
order.vue
src/pages/index/order.vue
+4
-1
index.vue
src/pages/mine/warehouse/index.vue
+26
-24
partsDetail.vue
src/pages/mine/warehouse/partsDetail.vue
+1
-1
records.vue
src/pages/mine/warehouse/records.vue
+1
-1
detail.vue
src/pages/order/detail.vue
+1
-1
No files found.
.env.js
View file @
29c2edb1
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
}
else
if
(
NODE_ENV
===
'prod'
)
{
}
else
if
(
NODE_ENV
===
'prod'
)
{
ENV_VAR
=
require
(
'./.env.prod.js'
);
ENV_VAR
=
require
(
'./.env.prod.js'
);
}
}
ENV_VAR
[
'bmapAK'
]
=
'G1wPip2Oj62NnoUctXhiE1faZVHbeo2A'
;
}
else
if
(
process
.
env
.
NODE_ENV
===
"production"
)
{
}
else
if
(
process
.
env
.
NODE_ENV
===
"production"
)
{
if
(
NODE_ENV
===
'test'
)
{
if
(
NODE_ENV
===
'test'
)
{
ENV_VAR
=
require
(
'./.env.test.js'
);
ENV_VAR
=
require
(
'./.env.test.js'
);
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
process
.
uniEnv
=
{};
process
.
uniEnv
=
{};
process
.
uniEnv
[
'node_env'
]
=
NODE_ENV
;
process
.
uniEnv
[
'node_env'
]
=
NODE_ENV
;
process
.
uniEnv
[
'version_number'
]
=
VERSION_NUMBER
;
process
.
uniEnv
[
'version_number'
]
=
VERSION_NUMBER
;
process
.
uniEnv
[
'bmapAK'
]
=
'lF1HoyXdiv4uZx6TrGQEZs48F5y8kEHI'
;
for
(
let
key
in
ENV_VAR
)
{
for
(
let
key
in
ENV_VAR
)
{
process
.
uniEnv
[
key
]
=
ENV_VAR
[
key
];
process
.
uniEnv
[
key
]
=
ENV_VAR
[
key
];
}
}
...
...
src/components/order/index.vue
View file @
29c2edb1
...
@@ -112,6 +112,15 @@
...
@@ -112,6 +112,15 @@
return
this
.
typeTexts
[
this
.
orderType
]
return
this
.
typeTexts
[
this
.
orderType
]
},
},
buttonStyle
()
{
// 按钮样式
buttonStyle
()
{
// 按钮样式
/** orderType
0 待接单、
1 待预约、
2 待签到、
3 待完工、
4 审核中、
5 异常单、
6 已完工
*/
switch
(
this
.
orderType
)
{
switch
(
this
.
orderType
)
{
case
0
:
case
0
:
if
(
!
this
.
isCompetition
)
{
if
(
!
this
.
isCompetition
)
{
...
@@ -198,6 +207,12 @@
...
@@ -198,6 +207,12 @@
showDistance
()
{
showDistance
()
{
return
this
.
orderType
==
0
&&
this
.
location
.
length
>=
2
&&
(
this
.
orderData
.
contactAddressLatitud
||
this
.
orderData
.
contactAddressLongitud
)
return
this
.
orderType
==
0
&&
this
.
location
.
length
>=
2
&&
(
this
.
orderData
.
contactAddressLatitud
||
this
.
orderData
.
contactAddressLongitud
)
},
},
isWaitFinish
()
{
return
this
.
orderType
==
3
},
isException
()
{
return
this
.
orderType
==
5
},
types
()
{
types
()
{
return
{
return
{
'waitAccept'
:
0
,
// 待接单、
'waitAccept'
:
0
,
// 待接单、
...
@@ -269,10 +284,17 @@
...
@@ -269,10 +284,17 @@
methods
:
{
methods
:
{
// title:标题,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
// title:标题,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
handleClick
()
{
handleClick
()
{
// if (this.buttonDisabled) return
var
func
=
'click'
if
(
this
.
isWaitFinish
||
this
.
isException
)
{
// 不是待完工、不是异常单点按钮算点cell
func
=
'action'
}
this
.
$emit
(
'action'
,
this
.
orderData
,
this
.
type
,
this
.
showCountTime
?
'show'
:
''
)
this
.
$emit
(
'action'
,
this
.
orderData
,
this
.
type
,
this
.
showCountTime
?
'show'
:
''
)
},
},
handleClickCell
()
{
handleClickCell
()
{
var
func
=
'click'
if
(
this
.
isException
)
{
// 异常单点cell算点按钮
func
=
'action'
}
this
.
$emit
(
'click'
,
this
.
orderData
,
this
.
type
,
this
.
showCountTime
?
'show'
:
''
)
this
.
$emit
(
'click'
,
this
.
orderData
,
this
.
type
,
this
.
showCountTime
?
'show'
:
''
)
},
},
handleChange
(
timestamp
)
{
handleChange
(
timestamp
)
{
...
...
src/components/parts/appliedPartsCell.vue
View file @
29c2edb1
...
@@ -114,15 +114,15 @@
...
@@ -114,15 +114,15 @@
},
},
titleColor
()
{
titleColor
()
{
switch
(
String
(
this
.
info
.
status
))
{
switch
(
String
(
this
.
info
.
status
))
{
case
'-
1
'
:
// 审核未通过
case
'-
2
'
:
// 审核未通过
return
'#FA5A49'
return
'#FA5A49'
case
'1'
:
// 已取消
case
'
-
1'
:
// 已取消
return
'#333333'
return
'#333333'
default
:
default
:
return
'#2272FF'
return
'#2272FF'
}
}
},
},
// 待签收 15
变 已签收 20; 10 待审核 1 变
已取消 -1
// 待签收 15
-> 已签收 20; 待审核 1 ->
已取消 -1
willStatuses
()
{
willStatuses
()
{
return
{
return
{
'1'
:
'-1'
,
'1'
:
'-1'
,
...
...
src/components/parts/spareCell.vue
View file @
29c2edb1
...
@@ -8,7 +8,12 @@
...
@@ -8,7 +8,12 @@
<view>
{{
remarkText
}}
</view>
<view>
{{
remarkText
}}
</view>
</view>
</view>
</view>
</view>
<view
class=
"count-view"
>
x
{{
item
.
quantity
||
0
}}
</view>
<view
class=
"count-view"
>
<view
v-if=
"showChecked"
>
<u-number-box
v-model=
"item.quantity"
:min=
"item.min || 0"
:max=
"item.max || item.quantity"
@
change=
"numChange"
></u-number-box>
</view>
<text
v-else
>
x
{{
item
.
quantity
||
0
}}
</text>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -51,7 +56,11 @@
...
@@ -51,7 +56,11 @@
methods
:
{
methods
:
{
handleChange
()
{
handleChange
()
{
this
.
$emit
(
'change'
)
this
.
$emit
(
'change'
)
}
},
numChange
(
event
)
{
console
.
log
(
event
.
value
)
this
.
$emit
(
'numChange'
,
event
.
value
)
},
}
}
}
}
</
script
>
</
script
>
...
...
src/components/submit-bar/index.vue
View file @
29c2edb1
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
align-items
:
center
;
align-items
:
center
;
}
}
.bottom-left
{
.bottom-left
{
margin-left
:
30rpx
;
//
margin-left: 30rpx;
.left-list
{
.left-list
{
width
:
100%
;
width
:
100%
;
&
:nth-of-type
(
1
)
{
&
:nth-of-type
(
1
)
{
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
}
}
.bottom-right
{
.bottom-right
{
width
:
360rpx
;
width
:
360rpx
;
margin-right
:
20rpx
;
//
margin-right: 20rpx;
.btn
{
.btn
{
width
:
100%
;
width
:
100%
;
padding
:
30rpx
;
padding
:
30rpx
;
...
...
src/pages.json
View file @
29c2edb1
...
@@ -314,7 +314,7 @@
...
@@ -314,7 +314,7 @@
"path"
:
"warehouse/records"
,
"path"
:
"warehouse/records"
,
"style"
:
{
"style"
:
{
"navigationStyle"
:
"custom"
,
"navigationStyle"
:
"custom"
,
"navigationBarTitleText"
:
"出
入
库记录"
,
"navigationBarTitleText"
:
"出库记录"
,
"enablePullDownRefresh"
:
false
,
"enablePullDownRefresh"
:
false
,
"disableScroll"
:
true
"disableScroll"
:
true
}
}
...
...
src/pages/index/order.vue
View file @
29c2edb1
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<template
v-else
>
<template
v-else
>
<view
v-for=
"(item, index) in orderList"
:key=
"item.orderId"
>
<view
v-for=
"(item, index) in orderList"
:key=
"item.orderId"
>
<OrderCell
:orderData=
"item"
:type=
"orderType"
:location=
"dataValue"
@
click=
"handleClick"
<OrderCell
:orderData=
"item"
:type=
"orderType"
:location=
"dataValue"
@
click=
"handleClick"
@
action=
"handleClick"
>
</OrderCell>
@
action=
"handleClick
CellButton
"
>
</OrderCell>
</view>
</view>
<view
class=
"load-more-view"
>
<view
class=
"load-more-view"
>
<u-loadmore
v-show=
"(pageNumber == 1 && loaded) || pageNumber > 2"
:status=
"loadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<u-loadmore
v-show=
"(pageNumber == 1 && loaded) || pageNumber > 2"
:status=
"loadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
...
@@ -231,6 +231,9 @@
...
@@ -231,6 +231,9 @@
}
}
});
});
},
},
handleClickCellButton
(
item
)
{
this
.
filish
(
item
)
},
handleClick
(
item
,
type
,
showCountTime
)
{
// type:类型,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
handleClick
(
item
,
type
,
showCountTime
)
{
// type:类型,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
if
(
item
.
orderStatus
===
86
||
item
.
orderStatus
===
88
){
if
(
item
.
orderStatus
===
86
||
item
.
orderStatus
===
88
){
this
.
filish
(
item
)
this
.
filish
(
item
)
...
...
src/pages/mine/warehouse/index.vue
View file @
29c2edb1
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
bar-width=
"44"
:offset=
"[0,0]"
:list=
"list"
count=
"total"
:current=
"currentIndex"
@
change=
"change"
bar-width=
"44"
:offset=
"[0,0]"
:list=
"list"
count=
"total"
:current=
"currentIndex"
@
change=
"change"
:is-scroll=
"false"
font-size=
"28"
bold
></u-tabs>
:is-scroll=
"false"
font-size=
"28"
bold
></u-tabs>
</view>
</view>
<view
class=
"tab-view"
>
<scroll-view
scroll-y
style=
"height: 100%;width: 100%;"
@
scrolltolower=
"reachBottom"
scroll-anchoring
<scroll-view
scroll-y
style=
"height: 100%;width: 100%;"
@
scrolltolower=
"reachBottom"
scroll-anchoring
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
scroll=
"scroll"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
scroll=
"scroll"
:scroll-top=
"scrollTop"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
:scroll-top=
"scrollTop"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
...
@@ -33,6 +34,7 @@
...
@@ -33,6 +34,7 @@
</view>
</view>
</
template
>
</
template
>
</scroll-view>
</scroll-view>
</view>
<view
class=
"fixed-button"
>
<view
class=
"fixed-button"
>
<ApplyButton
:type=
"buttonType"
@
click=
"handleClickApply"
/>
<ApplyButton
:type=
"buttonType"
@
click=
"handleClickApply"
/>
</view>
</view>
...
@@ -279,9 +281,9 @@
...
@@ -279,9 +281,9 @@
margin-bottom
:
30rpx
;
margin-bottom
:
30rpx
;
}
}
//
.tab-view {
.tab-view
{
//
height: 100%;
height
:
100%
;
//
overflow: auto;
overflow
:
auto
;
.load-more-view
{
.load-more-view
{
margin-bottom
:
20rpx
;
margin-bottom
:
20rpx
;
...
@@ -295,7 +297,7 @@
...
@@ -295,7 +297,7 @@
margin-top
:
300rpx
;
margin-top
:
300rpx
;
position
:
absolute
;
position
:
absolute
;
}
}
//
}
}
.fixed-button
{
.fixed-button
{
position
:
fixed
;
position
:
fixed
;
...
...
src/pages/mine/warehouse/partsDetail.vue
View file @
29c2edb1
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
'orderNumber'
:
'申请单号:'
,
'orderNumber'
:
'申请单号:'
,
'createTime'
:
'申请时间:'
,
'createTime'
:
'申请时间:'
,
'deliveryTime'
:
'发货时间:'
,
'deliveryTime'
:
'发货时间:'
,
'applyRemark'
:
'备注'
'applyRemark'
:
'备注
:
'
}
}
},
},
operateTypes
()
{
operateTypes
()
{
...
...
src/pages/mine/warehouse/records.vue
View file @
29c2edb1
<
template
>
<
template
>
<view
class=
"ware-wrap"
>
<view
class=
"ware-wrap"
>
<u-navbar
back-icon-color=
"#333333"
background=
"#FFFFFF"
title=
"出
入
库记录"
titleColor=
"#333333"
<u-navbar
back-icon-color=
"#333333"
background=
"#FFFFFF"
title=
"出库记录"
titleColor=
"#333333"
:border-bottom=
"false"
title-bold
></u-navbar>
:border-bottom=
"false"
title-bold
></u-navbar>
<!--
<view
class=
"content"
>
<!--
<view
class=
"content"
>
<view
class=
"panel"
>
<view
class=
"panel"
>
...
...
src/pages/order/detail.vue
View file @
29c2edb1
...
@@ -215,7 +215,7 @@
...
@@ -215,7 +215,7 @@
{
{
label
:
'配件申请'
,
label
:
'配件申请'
,
type
:
'image'
,
type
:
'image'
,
image
:
'
xiancahngpaizhao
.png'
,
image
:
'
peijian
.png'
,
show
:
this
.
allowFeedback
,
show
:
this
.
allowFeedback
,
disabled
:
false
,
disabled
:
false
,
count
:
3
,
count
:
3
,
...
...
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