111

src/view/record/changerecord.vue

@@ -204,13 +204,13 @@
 			},
 			handleSizeChange(val) {
 				console.log(`每页 ${val} 条`);
-				this.pageSizeAll = val
+				this.pageSize = val
 				this.getTableData()
 			},
 			// 修改当前页事件
 			handleCurrentChange(val) {
 				console.log(`当前页: ${val}`);
-				this.currentPageAll = val
+				this.currentPage = val
 				this.getTableData()
 			},
 			handleSearch() {
@@ -275,8 +275,8 @@
 					this.query.RecordDate = [false,false];
 				}
 				var param = {
-					page: this.currentPage,
-					rows: this.pageSize,
+					page: -1,
+					rows: -1,
 					wareName: this.query.wareName,
 					stackName: this.query.stackName,
 					model: this.query.model,
@@ -292,7 +292,7 @@
 				axios.get(url, param).then(response => {
 					// alert(JSON.stringify(response))
 					if (response.data.code == 0) {
-						var imptData = response.data.data.list;
+						var imptData = response.data.data;
 						if (imptData.length == 0) {
 							this.$alert('无法导出，选择时间段无记录', '提示', {
 								confirmButtonText: '确定',

src/view/ware/storechange.vue

@@ -957,7 +957,7 @@
 			handleChangeCUSTSave(){ //“批量修改”弹窗中“保存”按钮对应的函数
 				var url = 'WareStore/changeAll.do'
 				var param = {
-					json: JSON.stringify(this.multipleSelection),
+					json: JSON.stringify(this.selectRows),
 					newCustomername: this.newCustomername,
 					newFKCustomername: this.newFKCustomername,
 					newContractno: this.newContractno,
@@ -992,7 +992,7 @@
 				var url = 'WareStore/changeStack.do'
 				var param = {
 
-					json: JSON.stringify(this.multipleSelection),
+					json: JSON.stringify(this.selectRows),
 					newWare: this.newWare,
 					newStack: this.newStack,
 					newRemark1: this.newRemark1,