Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
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
lanbaoming
jiedao-app-operator-master
Commits
8a274223
Commit
8a274223
authored
May 03, 2023
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
是否显示待确认商品,不传默认不显示
parent
c960d245
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
index.vue
src/components/ProductSelector/index.vue
+6
-1
Warehouse.vue
src/views/ecw/order/warehousing/components/Warehouse.vue
+2
-2
No files found.
src/components/ProductSelector/index.vue
View file @
8a274223
...
@@ -34,6 +34,11 @@ export default {
...
@@ -34,6 +34,11 @@ export default {
lang
:
{
lang
:
{
type
:
String
,
type
:
String
,
default
:
'
Zh
'
default
:
'
Zh
'
},
// 是否显示待确认商品,不传默认不显示
determined
:
{
type
:
Boolean
,
default
:
false
}
}
},
},
data
(){
data
(){
...
@@ -85,7 +90,7 @@ export default {
...
@@ -85,7 +90,7 @@ export default {
remoteMethod
(
keyword
){
remoteMethod
(
keyword
){
let
params
=
{
let
params
=
{
pageSize
:
keyword
?
100000
:
10
,
pageSize
:
keyword
?
100000
:
10
,
filter
:
false
filter
:
!
this
.
determined
}
}
if
(
this
.
productType
){
if
(
this
.
productType
){
params
.
typeId
=
this
.
productType
params
.
typeId
=
this
.
productType
...
...
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @
8a274223
...
@@ -13,14 +13,14 @@
...
@@ -13,14 +13,14 @@
<el-descriptions-item>
<el-descriptions-item>
<template
slot=
"label"
><span
style=
"color: red"
>
*
</span>
{{
$t
(
'
中文品名
'
)
}}
</
template
>
<template
slot=
"label"
><span
style=
"color: red"
>
*
</span>
{{
$t
(
'
中文品名
'
)
}}
</
template
>
<span
style=
"min-width: 200px;margin-right: 15px;display: inline-block"
>
<span
style=
"min-width: 200px;margin-right: 15px;display: inline-block"
>
<product-selector
v-if=
"!order.parentOrderId && !isAdd"
v-model=
"form.prodId"
@
change=
"onProductChange"
/>
<product-selector
v-if=
"!order.parentOrderId && !isAdd"
v-model=
"form.prodId"
@
change=
"onProductChange"
determined
/>
<span
v-else
>
{{ warehousing.prodTitleZh }}
</span>
<span
v-else
>
{{ warehousing.prodTitleZh }}
</span>
</span>
</span>
<el-button
v-if=
"!order.parentOrderId && !isAdd"
type=
"text"
@
click=
"isShowProduct = true"
>
添加新商品
</el-button>
<el-button
v-if=
"!order.parentOrderId && !isAdd"
type=
"text"
@
click=
"isShowProduct = true"
>
添加新商品
</el-button>
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item>
<el-descriptions-item>
<
template
slot=
"label"
><span
style=
"color: red"
>
*
</span>
{{
$t
(
'
英文品名
'
)
}}
</
template
>
<
template
slot=
"label"
><span
style=
"color: red"
>
*
</span>
{{
$t
(
'
英文品名
'
)
}}
</
template
>
<product-selector
v-if=
"!order.parentOrderId && !isAdd"
lang=
"En"
v-model=
"form.prodId"
@
change=
"onProductChange"
/>
<product-selector
v-if=
"!order.parentOrderId && !isAdd"
lang=
"En"
v-model=
"form.prodId"
@
change=
"onProductChange"
determined
/>
<span
v-else
>
{{ warehousing.prodTitleEn }}
</span>
<span
v-else
>
{{ warehousing.prodTitleEn }}
</span>
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('品牌')"
>
<el-descriptions-item
:label=
"$t('品牌')"
>
...
...
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