From 4144492ad3f2157a512e4c47b2e35c9f43b8982f Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 8 Sep 2025 09:47:21 +0800
Subject: [PATCH] change

---
 pages/ftdl/line-down-mater.vue | 43 +---------------------------------
 pages/ftdl/man-load-goods.vue  |  1 +
 utils/getData4.js              |  5 ++++
 3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/pages/ftdl/line-down-mater.vue b/pages/ftdl/line-down-mater.vue
index 9fa0489..ca50348 100644
--- a/pages/ftdl/line-down-mater.vue
+++ b/pages/ftdl/line-down-mater.vue
@@ -93,16 +93,6 @@
 				currentData: {},
 				options: [],
 				index: '',
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10,
 				disabled: false
 			};
 		},
@@ -116,6 +106,7 @@
 				this.dataList.map((item) => {
 					if (this.pkObj.mid === item.mid) {
 						item.material_name = this.currentData.material_name
+						item.material_code = this.currentData.material_code
 						item.measure_unit_id = this.currentData.measure_unit_id
 					}
 				})
@@ -242,38 +233,6 @@
 				this.dataList = []
 				this.disabled = false
 			},
-			searchList () {
-				this.dataList = []
-				this.pageNum = 1
-				this._selectMaterials()
-			},
-			async _selectMaterials () {
-				let res = await selectMaterials(this.val1)
-				this.dataList = res.data
-				// this.totalCount = res.totalElements
-				// if (res.totalElements > 0) {
-				// 	const dataMap = res.data
-				// 	this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
-				// 	this.reload = false
-				// } else {
-				// 	this.dataList = []
-				// }
-				// if (this.totalCount == this.dataList.length) {
-				// 	this.reload = false
-				// 	this.status = 'noMore'
-				// }
-			},
-			onReachBottom () {
-				if (this.totalCount > this.dataList.length) {
-					this.status = 'loading'
-					setTimeout(() => {
-						this.pageNum++
-						this._selectMaterials()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
 			async _blanking () {
 				this.disabled = true
 				if (!this.val1 || !this.dataList.length || !this.index) {
diff --git a/pages/ftdl/man-load-goods.vue b/pages/ftdl/man-load-goods.vue
index d7f1544..66a79e1 100644
--- a/pages/ftdl/man-load-goods.vue
+++ b/pages/ftdl/man-load-goods.vue
@@ -107,6 +107,7 @@
 				this.dataList.map((item) => {
 					if (this.pkObj.mid === item.mid) {
 						item.material_name = this.currentData.material_name
+						item.material_code = this.currentData.material_code
 						item.measure_unit_id = this.currentData.measure_unit_id
 					}
 				})
diff --git a/utils/getData4.js b/utils/getData4.js
index ab07782..48f9a6c 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -41,6 +41,11 @@ export const loading = (pcode, rcode, mcode, num) => request({
 })
 
 // 产线下料
+// 1.1查询物料信息
+export const selectMaterials = (blurry, page, size) => request({
+	url:'api/hand/selectMaterials',
+	data: {blurry: blurry, page: page, size: size}
+})
 // 1.2查询所有区域
 export const getRegions = () => request({
 	url:'api/hand/getRegions',