1

src/view/store-manage/store-report/store-report.vue

@@ -276,13 +276,18 @@ export default {
 				},
 				{
 					title: '单位',
-					key: 'untilName',
+					key: 'stockUnitID',
 					minWidth: 150,
 				},
 				{
 					title: '应收数量',
 					key: 'quantity',
 					minWidth: 150,
+					render:(h,p)=>{
+						return h('span',{},
+							p.row.quantity * 1
+						)
+					}
 				},
 				{
 					title: '单价',
@@ -291,18 +296,28 @@ export default {
 				},
 				{
 					title: '到货日期',
-					key: 'arriveTime',
+					key: 'createTime',
 					minWidth: 150,
 				},
 				{
 					title: '到货数量',
-					key: 'arriveQty',
+					key: 'changeNum',
 					minWidth: 150,
+					render:(h,p)=>{
+						return h('span',{},
+							p.row.changeNum * 1
+						)
+					}
 				},
 				{
 					title: '金额',
 					key: 'amount',
 					minWidth: 150,
+					render:(h,p)=>{
+						return h('span',{},
+							p.row.amount * 1
+						)
+					}
 				},
 			],
 			materialTypeList:['直喷','热转','打纸','墨水','其他'],
@@ -949,6 +964,7 @@ export default {
 				pageIndex: 1,
 				pageSize: 20,
 				total: 0,
+				keyword:null,
 			},
 			params3: {
 				pageNum: 1,
@@ -1206,19 +1222,34 @@ export default {
 							}
 						})
 					} else if (this.tabName === '2') {
-						GetStockInDocumentList({
-							...this.params2,
-							pageIndex: 1,
-							pageSize: 99999,
-						}).then((res) => {
-							if (res.code === 0) {
+						axios
+							.post('/cloudApi/stockWater/receiptSequence', {
+								pageNum:1,
+								pageSize:999999,
+								search: this.params2.keyword,
+								date:this.params2.yearMonth
+							})
+							.then((res) => {
+								console.log(res)
 								exportExcel(
 									this[`columns${this.tabName}`],
-									res.result.list,
+									res.data.data.records,
 									'入库序时簿'
 								)
-							}
-						})
+							})
+						// GetStockInDocumentList({
+						// 	...this.params2,
+						// 	pageIndex: 1,
+						// 	pageSize: 99999,
+						// }).then((res) => {
+						// 	if (res.code === 0) {
+						// 		exportExcel(
+						// 			this[`columns${this.tabName}`],
+						// 			res.result.list,
+						// 			'入库序时簿'
+						// 		)
+						// 	}
+						// })
 					} else if (this.tabName === '3') {
 						GetStockTakeDocumentList({
 							...this.params3,
@@ -1296,12 +1327,29 @@ export default {
 					}
 				})
 			} else if (this.tabName === '2') {
-				GetStockInDocumentList(this.params2).then((res) => {
-					if (res.code === 0) {
-						this.data2 = res.result.list
-						this.params2.total = res.result.totalCount
-					}
-				})
+				const v = this
+				v.$Spin.show();
+				axios
+					.post('/cloudApi/stockWater/receiptSequence', {
+						pageNum:v.params2.pageIndex,
+						pageSize:v.params2.pageSize,
+						keyword: v.params2.workKey,
+						date:v.params2.yearMonth,
+					})
+					.then((res) => {
+						console.log(res)
+						this.data2 = res.data.data.records
+						this.params2.total = res.data.data.total
+						setTimeout(() => {
+							v.$Spin.hide();
+						}, 1000);
+					})
+				// GetStockInDocumentList(this.params2).then((res) => {
+				// 	if (res.code === 0) {
+				// 		this.data2 = res.result.list
+				// 		this.params2.total = res.result.totalCount
+				// 	}
+				// })
 			} else if (this.tabName === '3') {
 				
 				// GetStockTakeDocumentList(this.params3).then((res) => {