|
@@ -46,14 +46,14 @@
|
|
|
|
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-form-item label="仓库" prop="correspondId">
|
|
<el-form-item label="仓库" prop="correspondId">
|
|
- <el-select v-model="screenForm.correspondId" multiple style="width: 100%" placeholder="请选择仓库" size="mini" filterable clearable>
|
|
|
|
|
|
+ <el-select v-model="screenForm.correspondId" multiple style="width: 100%" placeholder="请选择仓库" size="mini" filterable clearable>
|
|
<el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
|
|
<el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
- <el-form-item label="存货类别" >
|
|
|
|
- <el-select v-model="screenForm.categoryId" style="width: 100%" placeholder="选择存货类别" filterable clearable>
|
|
|
|
|
|
+ <el-form-item label="存货类别" prop="categoryId">
|
|
|
|
+ <el-select v-model="screenForm.categoryId" style="width: 100%" placeholder="选择存货类别" filterable clearable multiple>
|
|
<el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
|
|
<el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -70,7 +70,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="mymain-container">
|
|
<div class="mymain-container">
|
|
<div class="btn-group clearfix">
|
|
<div class="btn-group clearfix">
|
|
- <div >
|
|
|
|
|
|
+ <div>
|
|
<ExportButton
|
|
<ExportButton
|
|
:ex-url="'/stock/manager/exportStockToDay'"
|
|
:ex-url="'/stock/manager/exportStockToDay'"
|
|
:ex-params="exParams"
|
|
:ex-params="exParams"
|
|
@@ -94,7 +94,7 @@
|
|
min-width="100"
|
|
min-width="100"
|
|
show-overflow-tooltip
|
|
show-overflow-tooltip
|
|
/>
|
|
/>
|
|
- <el-table-column
|
|
|
|
|
|
+ <el-table-column
|
|
align="left"
|
|
align="left"
|
|
label="存货类别"
|
|
label="存货类别"
|
|
prop="categoryName"
|
|
prop="categoryName"
|
|
@@ -204,7 +204,7 @@ export default {
|
|
dataList: null, // 列表数据
|
|
dataList: null, // 列表数据
|
|
listLoading: false, // 列表加载loading
|
|
listLoading: false, // 列表加载loading
|
|
screenForm: {
|
|
screenForm: {
|
|
- categoryId: '',
|
|
|
|
|
|
+ categoryId: [],
|
|
correspondId: [],
|
|
correspondId: [],
|
|
materialName: '',
|
|
materialName: '',
|
|
materialNumber: '',
|
|
materialNumber: '',
|
|
@@ -220,7 +220,7 @@ export default {
|
|
computed: {
|
|
computed: {
|
|
exParams() {
|
|
exParams() {
|
|
return {
|
|
return {
|
|
- categoryId: this.screenForm.categoryId,
|
|
|
|
|
|
+ categoryId: this.screenForm.categoryId.join(','),
|
|
correspondId: this.screenForm.correspondId.join(','),
|
|
correspondId: this.screenForm.correspondId.join(','),
|
|
materialName: this.screenForm.materialName,
|
|
materialName: this.screenForm.materialName,
|
|
materialNumber: this.screenForm.materialNumber,
|
|
materialNumber: this.screenForm.materialNumber,
|
|
@@ -238,7 +238,7 @@ export default {
|
|
const params = {
|
|
const params = {
|
|
pageNum: this.currentPage,
|
|
pageNum: this.currentPage,
|
|
pageSize: this.pageSize,
|
|
pageSize: this.pageSize,
|
|
- categoryId: this.screenForm.categoryId,
|
|
|
|
|
|
+ categoryId: this.screenForm.categoryId.join(','),
|
|
correspondId: this.screenForm.correspondId.join(','),
|
|
correspondId: this.screenForm.correspondId.join(','),
|
|
materialName: this.screenForm.materialName,
|
|
materialName: this.screenForm.materialName,
|
|
materialNumber: this.screenForm.materialNumber,
|
|
materialNumber: this.screenForm.materialNumber,
|