Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
上
上药订单生命周期升级
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
sph
上药订单生命周期升级
Commits
8ff2eaf1
Commit
8ff2eaf1
authored
Mar 11, 2021
by
xiejb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改高级搜索输入框样式
parent
7608d8d6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
86 additions
and
20 deletions
+86
-20
src/views/myInvoice/components/HighSearch.vue
src/views/myInvoice/components/HighSearch.vue
+4
-2
src/views/myOrder/clearance/HighSearch.vue
src/views/myOrder/clearance/HighSearch.vue
+50
-5
src/views/myOrder/components/HighSearch.vue
src/views/myOrder/components/HighSearch.vue
+4
-1
src/views/myOrder/orderInvoice/components/HighSearch.vue
src/views/myOrder/orderInvoice/components/HighSearch.vue
+27
-11
src/views/myOrder/orderInvoice/index.vue
src/views/myOrder/orderInvoice/index.vue
+1
-1
No files found.
src/views/myInvoice/components/HighSearch.vue
View file @
8ff2eaf1
...
@@ -334,7 +334,8 @@ export default {
...
@@ -334,7 +334,8 @@ export default {
// height: 40PX;
// height: 40PX;
margin
:
10
PX
auto
;
margin
:
10
PX
auto
;
border-radius
:
5
PX
;
border-radius
:
5
PX
;
border
:
0
.5px
solid
#bbbbbb
;
border
:
0
.5px
solid
#eeeeee
;
background-color
:
#EFF5F9
;
min-height
:
35
PX
;
min-height
:
35
PX
;
line-height
:
24px
;
line-height
:
24px
;
outline
:
0
;
outline
:
0
;
...
@@ -350,7 +351,8 @@ export default {
...
@@ -350,7 +351,8 @@ export default {
// height: 40PX;
// height: 40PX;
margin
:
10
PX
auto
;
margin
:
10
PX
auto
;
border-radius
:
5
PX
;
border-radius
:
5
PX
;
border
:
0
.5px
solid
#bbbbbb
;
border
:
0
.5px
solid
#eeeeee
;
background-color
:
#EFF5F9
;
min-height
:
35
PX
;
min-height
:
35
PX
;
line-height
:
24px
;
line-height
:
24px
;
outline
:
0
;
outline
:
0
;
...
...
src/views/myOrder/clearance/HighSearch.vue
View file @
8ff2eaf1
...
@@ -18,13 +18,20 @@
...
@@ -18,13 +18,20 @@
<input
:value=
"orderNo"
class=
"input"
type=
"text"
>
<input
:value=
"orderNo"
class=
"input"
type=
"text"
>
</div>
</div>
<div
class=
"high-info"
@
click=
"showPost('goods')"
>
<div
class=
"high-info"
@
click=
"showPost('goods')"
>
<div
class=
"title font-bold font-16"
>
商品
</div>
<div
class=
"title font-bold font-16"
>
商品
信息
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
goods
}}
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
goods
}}
</div>
</div>
</div>
<div
class=
"high-info"
>
<div
class=
"high-info"
>
<div
class=
"title font-bold font-16"
>
来源商品编码
</div>
<div
class=
"title font-bold font-16"
>
来源商品编码
</div>
<input
:value=
"sourceGoodNo"
class=
"input"
type=
"text"
>
<input
:value=
"sourceGoodNo"
class=
"input"
type=
"text"
>
</div>
</div>
<div
class=
"high-info"
>
<div
class=
"title font-bold font-16"
>
请货单类型
</div>
<div
class=
"infoBtn"
>
<van-button
@
click=
"clearanceTypeAction(item)"
:class=
"item.type !== clickBtnType ? 'btnNow btn': 'selectbtn btn'"
v-for=
"(item, index) in btnList"
:key=
"index"
type=
"default"
>
{{
item
.
title
}}
</van-button>
</div>
</div>
<!--
<div
class=
"high-info"
@
click=
"showPost('consignor')"
>
<!--
<div
class=
"high-info"
@
click=
"showPost('consignor')"
>
<div
class=
"title font-bold font-16"
>
货主
</div>
<div
class=
"title font-bold font-16"
>
货主
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
consignor
}}
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
consignor
}}
</div>
...
@@ -149,7 +156,13 @@ export default {
...
@@ -149,7 +156,13 @@ export default {
chinfo
:
{
chinfo
:
{
goodsId
:
''
,
goodsId
:
''
,
supplier
:
''
supplier
:
''
}
},
btnList
:
[
{
title
:
'
全部
'
,
type
:
'
all
'
,
action
:
true
},
{
title
:
'
B2C腹透液
'
,
type
:
'
permeable
'
,
action
:
false
},
{
title
:
'
药事所
'
,
type
:
'
pharmacy
'
,
action
:
false
},
],
clickBtnType
:
'
all
'
}
}
},
},
computed
:
{
computed
:
{
...
@@ -227,6 +240,10 @@ export default {
...
@@ -227,6 +240,10 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
/// 请货单类型按钮选择
clearanceTypeAction
(
model
)
{
this
.
clickBtnType
=
model
.
type
},
timeConfirm
(
data
)
{
timeConfirm
(
data
)
{
this
.
time
=
data
this
.
time
=
data
},
},
...
@@ -321,7 +338,27 @@ export default {
...
@@ -321,7 +338,27 @@ export default {
overflow-y
:
auto
;
overflow-y
:
auto
;
.high-info
{
.high-info
{
margin
:
0
PX
15
PX
;
margin
:
0
PX
15
PX
;
font-size
:
14
PX
;
font-size
:
12
PX
;
.infoBtn
{
display
:
flex
;
width
:
100%
;
margin
:
5
PX
;
.btn
{
line-height
:
35
PX
;
height
:
35
PX
;
width
:
33%
;
margin
:
5
PX
;
font-size
:
12
PX
;
padding
:
0
;
}
.btnNow
{
color
:
#888888
;
background-color
:
#EFF5F9
;
}
.selectbtn
{
border
:
0
.02667rem
solid
#1989fa
;
color
:
#1989fa
;
}
}
.title
{
.title
{
margin
:
auto
margin
:
auto
}
}
...
@@ -332,7 +369,6 @@ export default {
...
@@ -332,7 +369,6 @@ export default {
// height: 40PX;
// height: 40PX;
margin
:
10
PX
auto
;
margin
:
10
PX
auto
;
border-radius
:
5
PX
;
border-radius
:
5
PX
;
border
:
0
.5px
solid
#bbbbbb
;
min-height
:
35
PX
;
min-height
:
35
PX
;
line-height
:
24px
;
line-height
:
24px
;
outline
:
0
;
outline
:
0
;
...
@@ -340,15 +376,23 @@ export default {
...
@@ -340,15 +376,23 @@ export default {
overflow-x
:
hidden
;
overflow-x
:
hidden
;
overflow-y
:
auto
;
overflow-y
:
auto
;
padding
:
5
PX
;
padding
:
5
PX
;
font-size
:
12
PX
;
border
:
0
.5px
solid
#eeeeee
;
background-color
:
#EFF5F9
;
}
.inputInfo
:empty::before
{
content
:
attr
(
placeholder
);
color
:
#999999
;
}
}
.input
{
.input
{
font-size
:
12
PX
;
color
:
#666666
;
color
:
#666666
;
width
:
100%
;
width
:
100%
;
max-height
:
100%
;
max-height
:
100%
;
// height: 40PX;
// height: 40PX;
margin
:
10
PX
auto
;
margin
:
10
PX
auto
;
border-radius
:
5
PX
;
border-radius
:
5
PX
;
border
:
0
.5px
solid
#
bbbbbb
;
border
:
0
.5px
solid
#
eeeeee
;
min-height
:
35
PX
;
min-height
:
35
PX
;
line-height
:
24px
;
line-height
:
24px
;
outline
:
0
;
outline
:
0
;
...
@@ -356,6 +400,7 @@ export default {
...
@@ -356,6 +400,7 @@ export default {
overflow-x
:
hidden
;
overflow-x
:
hidden
;
overflow-y
:
auto
;
overflow-y
:
auto
;
padding
:
5
PX
;
padding
:
5
PX
;
background-color
:
#EFF5F9
;
}
}
}
}
}
}
...
...
src/views/myOrder/components/HighSearch.vue
View file @
8ff2eaf1
...
@@ -326,6 +326,8 @@ export default {
...
@@ -326,6 +326,8 @@ export default {
overflow-x
:
hidden
;
overflow-x
:
hidden
;
overflow-y
:
auto
;
overflow-y
:
auto
;
padding
:
5
PX
;
padding
:
5
PX
;
border
:
0
.5px
solid
#eeeeee
;
background-color
:
#EFF5F9
;
}
}
.input
{
.input
{
color
:
#666666
;
color
:
#666666
;
...
@@ -334,7 +336,8 @@ export default {
...
@@ -334,7 +336,8 @@ export default {
// height: 40PX;
// height: 40PX;
margin
:
10
PX
auto
;
margin
:
10
PX
auto
;
border-radius
:
5
PX
;
border-radius
:
5
PX
;
border
:
0
.5px
solid
#bbbbbb
;
border
:
0
.5px
solid
#eeeeee
;
background-color
:
#EFF5F9
;
min-height
:
35
PX
;
min-height
:
35
PX
;
line-height
:
24px
;
line-height
:
24px
;
outline
:
0
;
outline
:
0
;
...
...
src/views/myOrder/orderInvoice/components/HighSearch.vue
View file @
8ff2eaf1
...
@@ -5,31 +5,35 @@
...
@@ -5,31 +5,35 @@
class=
"more-search"
class=
"more-search"
position=
"right"
position=
"right"
:style=
"
{ width: '75%',height: '100%', overflow: 'hidden' }">
:style=
"
{ width: '75%',height: '100%', overflow: 'hidden' }">
<div
class=
"title font-bold font-16"
>
下单
时间
</div>
<div
class=
"title font-bold font-16"
>
发票
时间
</div>
<time-choose
:startTime=
"moreSearchInfo.time.start"
:endTime=
"moreSearchInfo.time.end"
@
confirm=
"timeConfirm"
></time-choose>
<time-choose
:startTime=
"moreSearchInfo.time.start"
:endTime=
"moreSearchInfo.time.end"
@
confirm=
"timeConfirm"
></time-choose>
<div
class=
"high-info-list"
>
<div
class=
"high-info-list"
>
<div
class=
"high-info"
@
click=
"showPost('consignor')"
>
<
!--
<
div
class=
"high-info"
@
click=
"showPost('consignor')"
>
<div
class=
"title font-bold font-16"
>
货主
</div>
<div
class=
"title font-bold font-16"
>
货主
</div>
<
!--
<textarea
:value=
"consignor"
class=
"inputInfo"
type=
"text"
></textarea>
--
>
<
textarea
:value=
"consignor"
class=
"inputInfo"
type=
"text"
></textarea
>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
consignor
}}
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
consignor
}}
</div>
</div>
-->
<div
class=
"high-info"
@
click=
"showPost('supplier')"
>
<div
class=
"title font-bold font-16"
>
供应商
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
supplier
}}
</div>
</div>
</div>
<div
class=
"high-info"
>
<div
class=
"high-info"
>
<div
class=
"title font-bold font-16"
>
请输入
订单号
</div>
<div
class=
"title font-bold font-16"
>
订单号
</div>
<!--
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
orderNo
}}
</div>
-->
<!--
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
orderNo
}}
</div>
-->
<input
:value=
"orderNo"
class=
"input"
type=
"text"
>
<input
:value=
"orderNo"
class=
"input"
type=
"text"
>
</div>
</div>
<div
class=
"high-info"
@
click=
"showPost('supplier')"
>
<div
class=
"high-info"
>
<div
class=
"title font-bold font-16"
>
供应商
</div>
<div
class=
"title font-bold font-16"
>
发票号
</div>
<
div
contenteditable=
"true"
class=
"inputInfo"
>
{{
supplier
}}
</div
>
<
input
:value=
"invoiceNo"
class=
"input"
type=
"text"
>
</div>
</div>
<div
class=
"high-info"
@
click=
"showPost('goods')"
>
<div
class=
"high-info"
@
click=
"showPost('goods')"
>
<div
class=
"title font-bold font-16"
>
商品
</div>
<div
class=
"title font-bold font-16"
>
商品
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
goods
}}
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
goods
}}
</div>
</div>
</div>
<div
class=
"high-info"
@
click=
"showPost('client')"
>
<
!--
<
div
class=
"high-info"
@
click=
"showPost('client')"
>
<div
class=
"title font-bold font-16"
>
客户
</div>
<div
class=
"title font-bold font-16"
>
客户
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
client
}}
</div>
<div
contenteditable=
"true"
class=
"inputInfo"
>
{{
client
}}
</div>
</div>
</div>
-->
</div>
</div>
<!--
<van-cell-group
class=
"high-info"
>
<!--
<van-cell-group
class=
"high-info"
>
<van-cell
class=
"flex4"
is-link
<van-cell
class=
"flex4"
is-link
...
@@ -137,6 +141,7 @@ export default {
...
@@ -137,6 +141,7 @@ export default {
goods
:
''
,
// 商品
goods
:
''
,
// 商品
client
:
''
,
// 客户
client
:
''
,
// 客户
orderNo
:
''
,
// 订单号
orderNo
:
''
,
// 订单号
invoiceNo
:
''
,
// 发票号
time
:
{
time
:
{
start
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
),
start
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
),
end
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
)
end
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
)
...
@@ -193,6 +198,14 @@ export default {
...
@@ -193,6 +198,14 @@ export default {
}
else
{
}
else
{
return
''
return
''
}
}
},
// 发票号
invoiceNo
()
{
if
(
this
.
moreSearchInfo
.
invoiceNo
)
{
return
!
this
.
moreSearchInfo
.
invoiceNo
?
''
:
this
.
moreSearchInfo
.
invoiceNo
}
else
{
return
''
}
}
}
},
},
props
:
{
props
:
{
...
@@ -230,6 +243,7 @@ export default {
...
@@ -230,6 +243,7 @@ export default {
goods
:
''
,
// 商品
goods
:
''
,
// 商品
client
:
''
,
// 客户
client
:
''
,
// 客户
orderNo
:
''
,
orderNo
:
''
,
invoiceNo
:
''
,
// 发票号
time
:
{
time
:
{
start
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
),
start
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
),
end
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
)
end
:
getFormateDate
(
new
Date
(),
'
yyyy-MM-dd
'
)
...
@@ -319,7 +333,8 @@ export default {
...
@@ -319,7 +333,8 @@ export default {
// height: 40PX;
// height: 40PX;
margin
:
10
PX
auto
;
margin
:
10
PX
auto
;
border-radius
:
5
PX
;
border-radius
:
5
PX
;
border
:
0
.5px
solid
#bbbbbb
;
border
:
0
.5px
solid
#eeeeee
;
background-color
:
#EFF5F9
;
min-height
:
35
PX
;
min-height
:
35
PX
;
line-height
:
24px
;
line-height
:
24px
;
outline
:
0
;
outline
:
0
;
...
@@ -335,7 +350,8 @@ export default {
...
@@ -335,7 +350,8 @@ export default {
// height: 40PX;
// height: 40PX;
margin
:
10
PX
auto
;
margin
:
10
PX
auto
;
border-radius
:
5
PX
;
border-radius
:
5
PX
;
border
:
0
.5px
solid
#bbbbbb
;
border
:
0
.5px
solid
#eeeeee
;
background-color
:
#EFF5F9
;
min-height
:
35
PX
;
min-height
:
35
PX
;
line-height
:
24px
;
line-height
:
24px
;
outline
:
0
;
outline
:
0
;
...
...
src/views/myOrder/orderInvoice/index.vue
View file @
8ff2eaf1
...
@@ -52,7 +52,7 @@ export default {
...
@@ -52,7 +52,7 @@ export default {
show
:
true
,
show
:
true
,
leftArrow
:
true
,
leftArrow
:
true
,
rightIcon
:
true
,
rightIcon
:
true
,
title
:
'
发票
'
,
title
:
'
发票
查询
'
,
leftText
:
''
,
leftText
:
''
,
leftClick
:
this
.
onBrowserBack
,
leftClick
:
this
.
onBrowserBack
,
rightClick
:
this
.
onMoreSearch
rightClick
:
this
.
onMoreSearch
...
...
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