Browse Source

导出限制取消/客户查询/导出模板

LiuCheng 3 months ago
parent
commit
a09ee03c26
1 changed files with 9 additions and 6 deletions
  1. 9
    6
      src/view/ware/storechange.vue

+ 9
- 6
src/view/ware/storechange.vue View File

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

Loading…
Cancel
Save