|
@@ -438,6 +438,7 @@
|
438
|
438
|
materialName: this.query.materialName,
|
439
|
439
|
standard: this.query.standard,
|
440
|
440
|
customerName: this.query.customerName,
|
|
441
|
+ fkcustmerName: this.query.fkcustmerName,
|
441
|
442
|
plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
|
442
|
443
|
ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
|
443
|
444
|
remark1: this.query.remark1
|
|
@@ -724,14 +725,15 @@
|
724
|
725
|
var imptData = [];
|
725
|
726
|
var url = 'WareStore/queryStore.do'
|
726
|
727
|
var param = {
|
727
|
|
- page: this.currentPage,
|
728
|
|
- rows: this.pageSize,
|
|
728
|
+ page: -1,
|
|
729
|
+ rows: -1,
|
729
|
730
|
wareName: this.query.wareName,
|
730
|
731
|
stackName: this.query.stackName,
|
731
|
732
|
model: this.query.model,
|
732
|
733
|
materialName: this.query.materialName,
|
733
|
734
|
standard: this.query.standard,
|
734
|
735
|
customerName: this.query.customerName,
|
|
736
|
+ fkcustmerName: this.query.fkcustmerName,
|
735
|
737
|
plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
|
736
|
738
|
ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
|
737
|
739
|
remark1: this.query.remark1
|
|
@@ -741,7 +743,8 @@
|
741
|
743
|
axios.get(url, param).then(response => {
|
742
|
744
|
|
743
|
745
|
if (response.data.code == 0) {
|
744
|
|
- var imptData = response.data.data.list;
|
|
746
|
+ console.log(response);
|
|
747
|
+ var imptData = response.data.data;
|
745
|
748
|
if (imptData.length == 0) {
|
746
|
749
|
this.$alert('无法导出,没有库存', '提示', {
|
747
|
750
|
confirmButtonText: '确定',
|