purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化报表查询，将仓库之类的参数改为非必传

Browse Source
This commit is contained in:
季圣华
2021-11-15 00:18:50 +08:00
parent 7b33aba0d6
commit fe29b1a7c2
12 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-web/src/views/report/AllocationDetail.vue
View File

@@ -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 @@
<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">

2
jshERP-web/src/views/report/BuyInReport.vue
View File

@@ -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">

2
jshERP-web/src/views/report/CustomerAccount.vue
View File

@@ -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>

6
jshERP-web/src/views/report/InDetail.vue
View File

@@ -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 @@
<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">

6
jshERP-web/src/views/report/InMaterialCount.vue
View File

@@ -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 @@
<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">

4
jshERP-web/src/views/report/InOutStockReport.vue
View File

@@ -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">

4
jshERP-web/src/views/report/MaterialStock.vue
View File

@@ -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">

6
jshERP-web/src/views/report/OutDetail.vue
View File

@@ -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 @@
<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">

6
jshERP-web/src/views/report/OutMaterialCount.vue
View File

@@ -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 @@
<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">

2
jshERP-web/src/views/report/SaleOutReport.vue
View File

@@ -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">

6
jshERP-web/src/views/report/StockWarningReport.vue
View File

@@ -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 @@
</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">

2
jshERP-web/src/views/report/VendorAccount.vue
View File

@@ -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>