From ec6c6e358cade7ac1c09953b840f34af61bf61c5 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 5 Mar 2026 10:54:09 +0800
Subject: [PATCH] change

---
 manifest.json                                 |   4 +-
 pages.json                                    |  16 +-
 .../{xlx-in-store.vue => other-in-store.vue}  |  29 +---
 pages/Material/shouhuo-in-store.vue           | 163 ++++++++++++++++++
 pages/Material/tuiliao-in-store.vue           | 163 ++++++++++++++++++
 pages/home/home.vue                           |   4 +-
 6 files changed, 352 insertions(+), 27 deletions(-)
 rename pages/Material/{xlx-in-store.vue => other-in-store.vue} (85%)
 create mode 100644 pages/Material/shouhuo-in-store.vue
 create mode 100644 pages/Material/tuiliao-in-store.vue

diff --git a/manifest.json b/manifest.json
index 139d080..6d13359 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "徐州汉云",
     "appid" : "__UNI__CB08719",
     "description" : "徐州汉云WMS手持系统",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 9d89d0e..f030dbf 100644
--- a/pages.json
+++ b/pages.json
@@ -46,7 +46,21 @@
             }
         }
         ,{
-            "path" : "pages/Material/xlx-in-store",
+            "path" : "pages/Material/shouhuo-in-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/Material/tuiliao-in-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/Material/other-in-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
diff --git a/pages/Material/xlx-in-store.vue b/pages/Material/other-in-store.vue
similarity index 85%
rename from pages/Material/xlx-in-store.vue
rename to pages/Material/other-in-store.vue
index 761dfcd..fe9710e 100644
--- a/pages/Material/xlx-in-store.vue
+++ b/pages/Material/other-in-store.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="zd_container">
-		<!-- 小料箱入库 -->
+		<!-- 其他入库 -->
 		<nav-bar :title="title"></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>
+						<span class="filter_label filter_input_disabled">入库类型</span>
 					</view>
 					<view class="zd-col-24 filter_select">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index" :localdata="options" disabled></uni-data-select>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -88,7 +88,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryInBillType, queryGroupInfo, pdaSmallBoxconfirmIn} from '@/utils/getData1.js'
+	import {queryGroupInfo, pdaSmallBoxconfirmIn} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -97,8 +97,8 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
+				options: [{text:'其他入库', value: '0009'}],
+				index: '0009',
 				val1: '',
 				val2: '',
 				pkId: '',
@@ -109,7 +109,6 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryInBillType()
 		},
 		methods: {
 			toCheck (e) {
@@ -118,22 +117,6 @@
 				this.val1 = e.storagevehicle_code
 				this.searchList()
 			},
-			async _queryInBillType () {
-				try {
-					let res = await queryInBillType()
-					if (res) {
-						this.options = res.data
-						this.index = this.options[0].value
-					} else {
-						this.options = []
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
 			searchList () {
 				this.dataList = []
 				this._queryGroupInfo()
diff --git a/pages/Material/shouhuo-in-store.vue b/pages/Material/shouhuo-in-store.vue
new file mode 100644
index 0000000..969461d
--- /dev/null
+++ b/pages/Material/shouhuo-in-store.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="zd_container">
+		<!-- 收货入库 -->
+		<nav-bar :title="title"></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 filter_input_disabled">入库类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" disabled></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>载具号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批次</th>
+								<th>重量(kg)</th>
+								<th>生产日期</th>
+								<th>供应商编码</th>
+								<th>供应商名称</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>有效期(天)</th>
+								<th>执行标准</th>
+								<th>品质类型</th>
+								<th>烘干次数</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.storagevehicle_code === pkId}" @tap="toCheck(e)">
+								<td>{{i+1}}</td>
+								<td>{{e.storagevehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.produce_time}}</td>
+								<td>{{e.supp_code}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.quality_time_day}}</td>
+								<td>{{e.execution_stand}}</td>
+								<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
+								<td>{{e.bake_num}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !index || !val2 || !dataList.length}" :disabled="disabled" @tap="_pdaSmallBoxconfirmIn">确认入库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryGroupInfo, pdaSmallBoxconfirmIn} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [{text:'收货入库', value: '0001'}],
+				index: '0001',
+				val1: '',
+				val2: '',
+				pkId: '',
+				pkObj: {},
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.storagevehicle_code ? '' : e.storagevehicle_code
+				this.pkObj = this.pkId === e.storagevehicle_code ? e : {}
+				this.val1 = e.storagevehicle_code
+				this.searchList()
+			},
+			searchList () {
+				this.dataList = []
+				this._queryGroupInfo()
+			},
+			async _queryGroupInfo () {
+				try {
+					let res = await queryGroupInfo(this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.dataList = []
+				this.disabled = false
+			},
+			async _pdaSmallBoxconfirmIn () {
+				this.disabled = true
+				if (!this.index || !this.val2 || !this.dataList.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaSmallBoxconfirmIn(this.index, this.val2, this.dataList)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					}
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/Material/tuiliao-in-store.vue b/pages/Material/tuiliao-in-store.vue
new file mode 100644
index 0000000..2f6ec76
--- /dev/null
+++ b/pages/Material/tuiliao-in-store.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="zd_container">
+		<!-- 退料入库 -->
+		<nav-bar :title="title"></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 filter_input_disabled">入库类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" disabled></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>载具号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批次</th>
+								<th>重量(kg)</th>
+								<th>生产日期</th>
+								<th>供应商编码</th>
+								<th>供应商名称</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>有效期(天)</th>
+								<th>执行标准</th>
+								<th>品质类型</th>
+								<th>烘干次数</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.storagevehicle_code === pkId}" @tap="toCheck(e)">
+								<td>{{i+1}}</td>
+								<td>{{e.storagevehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.produce_time}}</td>
+								<td>{{e.supp_code}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.quality_time_day}}</td>
+								<td>{{e.execution_stand}}</td>
+								<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
+								<td>{{e.bake_num}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !index || !val2 || !dataList.length}" :disabled="disabled" @tap="_pdaSmallBoxconfirmIn">确认入库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryGroupInfo, pdaSmallBoxconfirmIn} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [{text:'退料入库', value: '0002'}],
+				index: '0002',
+				val1: '',
+				val2: '',
+				pkId: '',
+				pkObj: {},
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.storagevehicle_code ? '' : e.storagevehicle_code
+				this.pkObj = this.pkId === e.storagevehicle_code ? e : {}
+				this.val1 = e.storagevehicle_code
+				this.searchList()
+			},
+			searchList () {
+				this.dataList = []
+				this._queryGroupInfo()
+			},
+			async _queryGroupInfo () {
+				try {
+					let res = await queryGroupInfo(this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.dataList = []
+				this.disabled = false
+			},
+			async _pdaSmallBoxconfirmIn () {
+				this.disabled = true
+				if (!this.index || !this.val2 || !this.dataList.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaSmallBoxconfirmIn(this.index, this.val2, this.dataList)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					}
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4fd226c..c10e995 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -53,7 +53,9 @@
 					{title: '小料箱功能', path: 'RF03', sonTree: [
 						{title: '空载具出库', path: '/pages/Material/kzj-out-store'},
 						{title: '空载具入库', path: '/pages/Material/kzj-in-store'},
-						{title: '小料箱入库', path: '/pages/Material/xlx-in-store'}
+						{title: '收货入库', path: '/pages/Material/shouhuo-in-store'},
+						{title: '退料入库', path: '/pages/Material/tuiliao-in-store'},
+						{title: '其他入库', path: '/pages/Material/other-in-store'},
 					]},
 					{title: '大料箱功能', path: 'RF04', sonTree: [
 						{title: '空载具出入库', path: '/pages/Material/kzj-inout-store'},