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
fe29b1a7
Commit
fe29b1a7
authored
Nov 15, 2021
by
季圣华
Browse files
优化报表查询,将仓库之类的参数改为非必传
parent
7b33aba0
Changes
12
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/views/report/AllocationDetail.vue
View file @
fe29b1a7
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"调出仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"调出仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotIdF"
>
v-model=
"queryParam.depotIdF"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"调入仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"调入仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
...
jshERP-web/src/views/report/BuyInReport.vue
View file @
fe29b1a7
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</a-col>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"商品信息"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"商品信息"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-input
placeholder=
"条码
、
名称
、
规格
、
型号"
v-model=
"queryParam.materialParam"
></a-input>
<a-input
placeholder=
"条码
/
名称
/
规格
/
型号"
v-model=
"queryParam.materialParam"
></a-input>
</a-form-item>
</a-form-item>
</a-col>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-col
:md=
"6"
:sm=
"24"
>
...
...
jshERP-web/src/views/report/CustomerAccount.vue
View file @
fe29b1a7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"客户"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"客户"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择客户"
v-model=
"queryParam.organId"
<a-select
placeholder=
"选择客户"
v-model=
"queryParam.organId"
:dropdownMatchSelectWidth=
"false"
showSearch
optionFilterProp=
"children"
>
:dropdownMatchSelectWidth=
"false"
showSearch
allow-clear
optionFilterProp=
"children"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
{{
item
.
supplier
}}
{{
item
.
supplier
}}
</a-select-option>
</a-select-option>
...
...
jshERP-web/src/views/report/InDetail.vue
View file @
fe29b1a7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"供应商"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"供应商"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择供应商"
v-model=
"queryParam.organId"
<a-select
placeholder=
"选择供应商"
v-model=
"queryParam.organId"
:dropdownMatchSelectWidth=
"false"
showSearch
optionFilterProp=
"children"
>
:dropdownMatchSelectWidth=
"false"
showSearch
allow-clear
optionFilterProp=
"children"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
{{
item
.
supplier
}}
{{
item
.
supplier
}}
</a-select-option>
</a-select-option>
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
...
jshERP-web/src/views/report/InMaterialCount.vue
View file @
fe29b1a7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"供应商"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"供应商"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择供应商"
v-model=
"queryParam.organId"
<a-select
placeholder=
"选择供应商"
v-model=
"queryParam.organId"
:dropdownMatchSelectWidth=
"false"
showSearch
optionFilterProp=
"children"
>
:dropdownMatchSelectWidth=
"false"
showSearch
allow-clear
optionFilterProp=
"children"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
{{
item
.
supplier
}}
{{
item
.
supplier
}}
</a-select-option>
</a-select-option>
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
...
jshERP-web/src/views/report/InOutStockReport.vue
View file @
fe29b1a7
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
...
jshERP-web/src/views/report/MaterialStock.vue
View file @
fe29b1a7
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
<a-col
:md=
"3"
:sm=
"24"
>
<a-col
:md=
"3"
:sm=
"24"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
...
jshERP-web/src/views/report/OutDetail.vue
View file @
fe29b1a7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"客户"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"客户"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择客户"
v-model=
"queryParam.organId"
<a-select
placeholder=
"选择客户"
v-model=
"queryParam.organId"
:dropdownMatchSelectWidth=
"false"
showSearch
optionFilterProp=
"children"
>
:dropdownMatchSelectWidth=
"false"
showSearch
allow-clear
optionFilterProp=
"children"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
{{
item
.
supplier
}}
{{
item
.
supplier
}}
</a-select-option>
</a-select-option>
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
...
jshERP-web/src/views/report/OutMaterialCount.vue
View file @
fe29b1a7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"客户"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"客户"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择客户"
v-model=
"queryParam.organId"
<a-select
placeholder=
"选择客户"
v-model=
"queryParam.organId"
:dropdownMatchSelectWidth=
"false"
showSearch
optionFilterProp=
"children"
>
:dropdownMatchSelectWidth=
"false"
showSearch
allow-clear
optionFilterProp=
"children"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
{{
item
.
supplier
}}
{{
item
.
supplier
}}
</a-select-option>
</a-select-option>
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
...
jshERP-web/src/views/report/SaleOutReport.vue
View file @
fe29b1a7
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</a-col>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"商品信息"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"商品信息"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-input
placeholder=
"条码
、
名称
、
规格
、
型号"
v-model=
"queryParam.materialParam"
></a-input>
<a-input
placeholder=
"条码
/
名称
/
规格
/
型号"
v-model=
"queryParam.materialParam"
></a-input>
</a-form-item>
</a-form-item>
</a-col>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-col
:md=
"6"
:sm=
"24"
>
...
...
jshERP-web/src/views/report/StockWarningReport.vue
View file @
fe29b1a7
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
<a-col
:md=
"6"
:sm=
"24"
>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"仓库"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
<a-select
showSearch
optionFilterProp=
"children"
optionFilterProp=
"children"
style=
"width: 100%"
showSearch
allow-clear
style=
"width: 100%"
placeholder=
"请选择仓库"
placeholder=
"请选择仓库"
v-model=
"queryParam.depotId"
>
v-model=
"queryParam.depotId"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
<a-select-option
v-for=
"(depot,index) in depotList"
:value=
"depot.id"
>
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
</a-col>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-col
:md=
"6"
:sm=
"24"
>
<a-form-item
label=
"商品信息"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"商品信息"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-input
placeholder=
"条码
、
名称
、
规格
、
型号"
v-model=
"queryParam.materialParam"
></a-input>
<a-input
placeholder=
"条码
/
名称
/
规格
/
型号"
v-model=
"queryParam.materialParam"
></a-input>
</a-form-item>
</a-form-item>
</a-col>
</a-col>
<a-col
:md=
"6"
:sm=
"24"
>
<a-col
:md=
"6"
:sm=
"24"
>
...
...
jshERP-web/src/views/report/VendorAccount.vue
View file @
fe29b1a7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<a-col
:md=
"4"
:sm=
"24"
>
<a-col
:md=
"4"
:sm=
"24"
>
<a-form-item
label=
"供应商"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-form-item
label=
"供应商"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<a-select
placeholder=
"选择供应商"
v-model=
"queryParam.organId"
<a-select
placeholder=
"选择供应商"
v-model=
"queryParam.organId"
:dropdownMatchSelectWidth=
"false"
showSearch
optionFilterProp=
"children"
>
:dropdownMatchSelectWidth=
"false"
showSearch
allow-clear
optionFilterProp=
"children"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
<a-select-option
v-for=
"(item,index) in supList"
:key=
"index"
:value=
"item.id"
>
{{
item
.
supplier
}}
{{
item
.
supplier
}}
</a-select-option>
</a-select-option>
...
...
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