From 2d78a8d19b959182249199f47309784e75c92701 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 18 Jul 2025 10:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                |   4 +-
 pages.json                   |  10 +++
 pages/common/mater-list.vue  |   7 +-
 pages/common/mater-list2.vue | 128 +++++++++++++++++++++++++++++++++++
 pages/entry/mater-group2.vue |   2 +-
 utils/getData3.js            |   9 ++-
 6 files changed, 149 insertions(+), 11 deletions(-)
 create mode 100644 pages/common/mater-list2.vue

diff --git a/manifest.json b/manifest.json
index e057204..a7bee51 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "欧伦",
     "appid" : "__UNI__DE2F207",
     "description" : "欧伦WMS手持系统",
-    "versionName" : "1.0.6",
-    "versionCode" : 106,
+    "versionName" : "1.0.8",
+    "versionCode" : 108,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 5ca5e11..ab0930d 100644
--- a/pages.json
+++ b/pages.json
@@ -213,6 +213,16 @@
                 "onReachBottomDistance": 50
             }
             
+        }
+        ,{
+            "path" : "pages/common/mater-list2",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
         }
         ,{
             "path" : "pages/mode/pick",
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
index 929611e..1cd0fb6 100644
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -81,12 +81,7 @@
 				this._getMaterialList()
 			},
 			async _getMaterialList () {
-				alert(this.$route.query.code + 666)
-				// uni.showToast({
-				// 	title: this.$route.query.code,
-				// 	icon: 'none'
-				// })
-				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '', this.$route.query.code)
+				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
 				// this.dataList = res.data
 				this.totalCount = res.totalElements
 				if (res.totalElements > 0) {
diff --git a/pages/common/mater-list2.vue b/pages/common/mater-list2.vue
new file mode 100644
index 0000000..6fc43c3
--- /dev/null
+++ b/pages/common/mater-list2.vue
@@ -0,0 +1,128 @@
+<template>
+	<view class="zd_container">
+		<!-- 查询物料 -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>物料名称</th>
+								<th>物料规格</th>
+								<th>物料编码</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {iosOutgetMaterialList} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._iosOutgetMaterialList()
+			},
+			async _iosOutgetMaterialList () {
+				let res = await iosOutgetMaterialList( this.val1, 'YZHJ', this.pageNum + '', this.pageSize + '')
+				// 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._iosOutgetMaterialList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/entry/mater-group2.vue b/pages/entry/mater-group2.vue
index 48057f4..5242cd1 100644
--- a/pages/entry/mater-group2.vue
+++ b/pages/entry/mater-group2.vue
@@ -119,7 +119,7 @@
 		methods: {
 			toJump () {
 				uni.navigateTo({
-					url: '/pages/common/mater-list?title=查询物料&code=YZHJ'
+					url: '/pages/common/mater-list2?title=查询物料'
 				})
 			},
 			toEmpty () {
diff --git a/utils/getData3.js b/utils/getData3.js
index 4eb5d29..a4466b8 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -33,9 +33,9 @@ export const getRegion = (region, page, size) => request({
 	data: {region: region, page: page, size: size}
 })
 // 获取物料列表
-export const getMaterialList = (search, page, size, region) => request({
+export const getMaterialList = (search, page, size) => request({
 	url:'api/pda/iosIn/getMaterialList',
-	data: {search: search, page: page, size: size, region: region}
+	data: {search: search, page: page, size: size}
 })
 
 // 入库管理
@@ -81,6 +81,11 @@ export const getReturnPoint = (page, size) => request({
 	url:'api/pda/iosOut/getReturnPoint',
 	data: {page: '1', size: '100'}
 })
+// 预装管理组盘获取物料
+export const iosOutgetMaterialList = (search, region, page, size) => request({
+	url:'api/pda/iosOut/getMaterialList',
+	data: {search: search, region: region, page: page, size: size}
+})
 // 线边仓出库确认
 export const materialConfirm = (sid, siteCode, obj) => request({
 	url:'api/pda/iosOut/materialConfirm',