Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
03cd3525
Commit
03cd3525
authored
Sep 23, 2021
by
季圣华
Browse files
给订单去除仓库
parent
cbfdb3b8
Changes
5
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/views/bill/PurchaseOrderList.vue
View file @
03cd3525
...
...
@@ -39,15 +39,6 @@
</a-select>
</a-form-item>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"仓库名称"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"请选择仓库"
showSearch
optionFilterProp=
"children"
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
{{
depot
.
depotName
}}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"操作员"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择操作员"
showSearch
optionFilterProp=
"children"
v-model=
"queryParam.creator"
>
...
...
@@ -206,7 +197,6 @@
},
created
()
{
this
.
initSupplier
()
this
.
getDepotData
()
this
.
initUser
()
},
computed
:
{
...
...
jshERP-web/src/views/bill/SaleOrderList.vue
View file @
03cd3525
...
...
@@ -40,15 +40,6 @@
</a-select>
</a-form-item>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"仓库名称"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"请选择仓库"
showSearch
optionFilterProp=
"children"
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
{{
depot
.
depotName
}}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"操作员"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择操作员"
showSearch
optionFilterProp=
"children"
v-model=
"queryParam.creator"
>
...
...
@@ -206,7 +197,6 @@
},
created
()
{
this
.
initCustomer
()
this
.
getDepotData
()
this
.
initUser
()
},
computed
:
{
...
...
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @
03cd3525
...
...
@@ -998,7 +998,6 @@
{
title
:
'
备注
'
,
dataIndex
:
'
remark
'
,
width
:
'
5%
'
}
],
purchaseOrderColumns
:
[
{
title
:
'
仓库名称
'
,
dataIndex
:
'
depotName
'
,
width
:
'
8%
'
},
{
title
:
'
条码
'
,
dataIndex
:
'
barCode
'
,
width
:
'
10%
'
},
{
title
:
'
名称
'
,
dataIndex
:
'
name
'
,
width
:
'
8%
'
},
{
title
:
'
规格
'
,
dataIndex
:
'
standard
'
,
width
:
'
5%
'
},
...
...
@@ -1062,7 +1061,6 @@
{
title
:
'
备注
'
,
dataIndex
:
'
remark
'
,
width
:
'
5%
'
}
],
saleOrderColumns
:
[
{
title
:
'
仓库名称
'
,
dataIndex
:
'
depotName
'
,
width
:
'
8%
'
},
{
title
:
'
条码
'
,
dataIndex
:
'
barCode
'
,
width
:
'
10%
'
},
{
title
:
'
名称
'
,
dataIndex
:
'
name
'
,
width
:
'
8%
'
},
{
title
:
'
规格
'
,
dataIndex
:
'
standard
'
,
width
:
'
5%
'
},
...
...
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View file @
03cd3525
...
...
@@ -112,9 +112,6 @@
loading
:
false
,
dataSource
:
[],
columns
:
[
{
title
:
'
仓库名称
'
,
key
:
'
depotId
'
,
width
:
'
7%
'
,
type
:
FormTypes
.
select
,
placeholder
:
'
请选择${title}
'
,
options
:
[],
allowSearch
:
true
,
validateRules
:
[{
required
:
true
,
message
:
'
${title}不能为空
'
}]
},
{
title
:
'
条码
'
,
key
:
'
barCode
'
,
width
:
'
8%
'
,
type
:
FormTypes
.
popupJsh
,
multi
:
true
,
validateRules
:
[{
required
:
true
,
message
:
'
${title}不能为空
'
}]
},
...
...
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View file @
03cd3525
...
...
@@ -115,9 +115,6 @@
loading
:
false
,
dataSource
:
[],
columns
:
[
{
title
:
'
仓库名称
'
,
key
:
'
depotId
'
,
width
:
'
7%
'
,
type
:
FormTypes
.
select
,
placeholder
:
'
请选择${title}
'
,
options
:
[],
allowSearch
:
true
,
validateRules
:
[{
required
:
true
,
message
:
'
${title}不能为空
'
}]
},
{
title
:
'
条码
'
,
key
:
'
barCode
'
,
width
:
'
8%
'
,
type
:
FormTypes
.
popupJsh
,
multi
:
true
,
validateRules
:
[{
required
:
true
,
message
:
'
${title}不能为空
'
}]
},
...
...
Write
Preview
Supports
Markdown
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