|
@@ -101,7 +101,7 @@
|
101
|
101
|
</el-table-column>
|
102
|
102
|
<el-table-column prop="customer.name" label="订单客户" width="300" show-overflow-tooltip header-align="center">
|
103
|
103
|
</el-table-column>
|
104
|
|
- <el-table-column prop="customer.name" label="客户名称" width="300" show-overflow-tooltip header-align="center">
|
|
104
|
+ <el-table-column prop="fkComponyId" label="客户名称" width="300" show-overflow-tooltip header-align="center">
|
105
|
105
|
</el-table-column>
|
106
|
106
|
<el-table-column prop="receiveAddress" label="收货地址" width="300" show-overflow-tooltip header-align="center">
|
107
|
107
|
</el-table-column>
|
|
@@ -238,6 +238,7 @@
|
238
|
238
|
plateNo: '',
|
239
|
239
|
wareId:'',
|
240
|
240
|
inRecordDate:[],
|
|
241
|
+ fkcustmerName:'',
|
241
|
242
|
},
|
242
|
243
|
multipleSelection: [],
|
243
|
244
|
tableData: [],
|
|
@@ -427,6 +428,7 @@
|
427
|
428
|
plateNo: this.query.plateNo,
|
428
|
429
|
fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"), //date类型
|
429
|
430
|
toDate :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
|
|
431
|
+ fkcustmerName : this.query.fkcustmerName,
|
430
|
432
|
}
|
431
|
433
|
axios.get(url, param).then(response => {
|
432
|
434
|
if (response.data.code == 0) {
|
|
@@ -721,8 +723,8 @@
|
721
|
723
|
}
|
722
|
724
|
var url = 'WareStore/queryStore.do'
|
723
|
725
|
var param = {
|
724
|
|
- page: this.currentPage,
|
725
|
|
- rows: this.pageSize,
|
|
726
|
+ page: -1,
|
|
727
|
+ rows: -1,
|
726
|
728
|
wareName: this.query.wareName,
|
727
|
729
|
stackName: this.query.stackName,
|
728
|
730
|
model: this.query.model,
|
|
@@ -732,13 +734,14 @@
|
732
|
734
|
plateNo: this.query.plateNo,
|
733
|
735
|
fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"), //date类型
|
734
|
736
|
toDate :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
|
|
737
|
+ fkcustmerName : this.query.fkcustmerName,
|
735
|
738
|
}
|
736
|
739
|
|
737
|
740
|
|
738
|
741
|
axios.get(url, param).then(response => {
|
739
|
|
-
|
|
742
|
+ console.log(response);
|
740
|
743
|
if (response.data.code == 0) {
|
741
|
|
- var imptData = response.data.data.list;
|
|
744
|
+ var imptData = response.data.data;
|
742
|
745
|
if (imptData.length == 0) {
|
743
|
746
|
this.$alert('无法导出,没有库存', '提示', {
|
744
|
747
|
confirmButtonText: '确定',
|
|
@@ -790,7 +793,7 @@
|
790
|
793
|
,"ordNo"
|
791
|
794
|
,"contractNo"
|
792
|
795
|
,"customerName"
|
793
|
|
- ,"customerName"
|
|
796
|
+ ,"fkComponyId"
|
794
|
797
|
,"receiveAddress"
|
795
|
798
|
,"productionPlace"
|
796
|
799
|
,"remark"
|