From ea0d0074ae2dabd8b796e3b179259e1ff889da3f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 30 Jan 2026 16:39:23 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                 |   7 +
 pages/home/home.vue                        |   3 +-
 pages/manage/empty-carrier-warehousing.vue | 207 +++++++++++++++++++++
 static/image/menu/RF13.png                 | Bin 0 -> 3870 bytes
 utils/getData2.js                          |   6 +
 5 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 pages/manage/empty-carrier-warehousing.vue
 create mode 100644 static/image/menu/RF13.png

diff --git a/pages.json b/pages.json
index 2ffbe9e..bcdb87d 100644
--- a/pages.json
+++ b/pages.json
@@ -111,6 +111,13 @@
         	{
         		"navigationStyle": "custom"
         	}
+        },
+        {
+        	"path" : "pages/manage/empty-carrier-warehousing",
+        	"style" : 
+        	{
+        		"navigationStyle": "custom"
+        	}
         }
     ],
 	"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 25fa48e..5f1f941 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,7 +43,8 @@
 					{title: '呼叫物料', icon: 'RF09', path: '/pages/manage/call-mater'},
 					{title: '补空框', icon: 'RF10', path: '/pages/manage/fill-empty'},
 					{title: '合托', icon: 'RF11', path: '/pages/manage/merge-pallet'},
-					{title: '物料扣减', icon: 'RF12', path: '/pages/manage/mater-update'}
+					{title: '物料扣减', icon: 'RF12', path: '/pages/manage/mater-update'},
+					{title: '空载具入库', icon: 'RF13', path: '/pages/manage/empty-carrier-warehousing'}
 				],
 				show: false,
 				secM: []
diff --git a/pages/manage/empty-carrier-warehousing.vue b/pages/manage/empty-carrier-warehousing.vue
new file mode 100644
index 0000000..70ca158
--- /dev/null
+++ b/pages/manage/empty-carrier-warehousing.vue
@@ -0,0 +1,207 @@
+<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>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="point"
+						@handleChange="handlePointChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="vehicle"
+						@handleChange="handleVehicleChange"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table class="table">
+						<thead>
+							<tr>
+								<th>点位</th>
+								<th>载具编码</th>
+								<th>删除</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.point_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td><view class="delete-btn" @tap="deleteItem(i)">删除</view></td>
+							</tr>
+							<tr v-if="uncompletedItem" class="uncompleted-row">
+								<td>{{uncompletedItem.point_code || '待扫描'}}</td>
+								<td>{{uncompletedItem.vehicle_code || '待扫描'}}</td>
+								<td>
+									<view class="clear-btn" @tap="clearUncompleted">清空</view>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+					<view v-if="dataList.length === 0 && !uncompletedItem" class="tip">请扫描点位和载具编码</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-24 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_emptyVehicleWarehousing">提交</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {emptyVehicleWarehousing} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				point: '',
+				vehicle: '',
+				uncompletedItem: null,
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handlePointChange(value) {
+				if (value) {
+					setTimeout(() => { this.point = '' }, 500)
+					if (!this.uncompletedItem) {
+						this.uncompletedItem = { point_code: value }
+					} else {
+						this.uncompletedItem.point_code = value
+					}
+					this.checkAndAddToList()
+				}
+			},
+			handleVehicleChange(value) {
+				if (value) {
+					setTimeout(() => { this.vehicle = '' }, 500)
+					if (!this.uncompletedItem) {
+						this.uncompletedItem = { vehicle_code: value }
+					} else {
+						this.uncompletedItem.vehicle_code = value
+					}
+					this.checkAndAddToList()
+				}
+			},
+			checkAndAddToList() {
+				if (!this.uncompletedItem) return
+				const { point_code, vehicle_code } = this.uncompletedItem
+				if (point_code && vehicle_code) {
+					const exists = this.dataList.some(item => 
+						item.point_code === point_code && item.vehicle_code === vehicle_code
+					)
+					if (!exists) {
+						this.dataList.push({
+							point_code,
+							vehicle_code
+						})
+						this.uncompletedItem = null
+					} else {
+						uni.showToast({
+							title: '该组合已存在',
+							icon: 'none'
+						})
+						this.uncompletedItem = null
+					}
+				}
+			},
+			clearUncompleted() {
+				this.uncompletedItem = null
+			},
+			deleteItem(index) {
+				this.dataList.splice(index, 1)
+			},
+			async _emptyVehicleWarehousing () {
+				this.disabled = true
+				if (!this.dataList.length) {
+						this.disabled = false
+						return
+					}
+				try {
+					let res = await emptyVehicleWarehousing(this.dataList)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					console.log(e)
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.point = ''
+				this.vehicle = ''
+				this.uncompletedItem = null
+				this.disabled = false
+				this.dataList = []
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.table
+	width 100%
+	border-spacing 0
+	.uncompleted-row
+		td
+			background-color #fffaf0
+			color #333
+			font-style italic
+	td
+		line-height 36rpx
+		padding 20rpx 10rpx
+		white-space pre-wrap
+		word-break break-all
+.tip
+	font-size 32rpx
+	text-align: center;
+	padding: 40rpx 0;
+	color: #ff6a00;
+.delete-btn
+	_font(34rpx, 50rpx, #4e6ef2,,center)
+	padding 10rpx 20rpx
+	background-color #fff
+	border-radius 8rpx
+	display inline-block
+	border 1rpx solid #4e6ef2
+	&:active
+		color #fff
+		background-color #4e6ef2
+
+.clear-btn
+	_font(34rpx, 50rpx, #ff6a00,,center)
+	padding 10rpx 20rpx
+	background-color #fff
+	border-radius 8rpx
+	display inline-block
+	border 1rpx solid #ff6a00
+	&:active
+		color #fff
+		background-color #ff6a00
+</style>
diff --git a/static/image/menu/RF13.png b/static/image/menu/RF13.png
new file mode 100644
index 0000000000000000000000000000000000000000..6053e878270fb66550b526ed97950287b1d6e8d2
GIT binary patch
literal 3870
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%0DJOeHqa-h8LuVpoK$1jh-Kja_{4&-
zU5ORMrNMX~1$N)GXVc@O$2}6$c7}>Wq;PP1xkCNkdKc(gnQdv5({^iq6QLDR+a)R_
zG-<9O`?}B})$3+8>vl`50GBo=#*QL(1E*ccFo`;RzpU<A4dE2SmolZCM?O0|qu-%~
zug&6BC?=?F@$&>27&jri1ZmaGd}6kdUzNKw(AQDHZluS@`B~F3LC`HKruGPE?3-$Q
z!hR3q3{vw3L^$Hld`b#7(Umw0%E~E?br~cQ(oVxx%SL1yZ~%B^znHii>1DvnWX5eP
z>*4GWQlXaQXNy?b1XUOInBdSmUbT7jPH~zs3~(-X8mNPmVWx+acpBIaOPmhh<u$=H
zyIQvTc~aGREoS^o*!_)O_&jjMlGX9PIzg#XS_@G17vf{_<~`YA;MJpq!&K^Mrm(R{
z)k+tOk!1f4x={JOm8~r$i!VX{!V!IdCyOFn@y+Fa0lF9XK{JZF+T0*_6xFXi4+WUH
zHn*K@GO)6xukn*if0yrnWNj<u>cU1bi8{P<itkkrj9JhW%zlWttMnYt;liu&jH1Dd
zEh#oZt*5N*a>e`$GTz=73@=ucWujVLJ+H6*sm)kBWiPaJ&)YBCeEc0_M8#z4aMx{l
zn!k!xMtK%y7lY0mM%vtKvl<{OMcOUO{LFGn5!5rFRm_fg0fTo5b|79ipn%&9eceh!
zQIPRu(X~8;z)QXQZ(*ww1T~d9hO8EP=P5aw|0}?wmN<WSSY7!sx@VqVwayoR&(Xq;
z06Pu+SD~P1fNO!T2wvCPu^SRPh;#t4aLMs>V8Rx>iNwN^Q_vArTCuCZ&d+3PJlj!R
z4cN;KY;3PhVrk*Gf!F7Dszc(!zPFXs7T`-5yPw0;sSRP`35$!ixeLvv`7;CQDQL#B
zS#mEOj=@5)yn*rhhcxBJN>2?;1cGNwyb*XH^mZ%Q0rIBhv}64JXd0Ip9GBU4ql8Bd
z$ZlQ9XWs#?H{*{am7Ssc93fagWFbGwqMJ_7wr22;f`e_!!W|Ri7-ApB0mK!h;;q1e
z+g8^0-L!Y}!7*bWi=}4le?z?F2%yBb6YN4Q7F^;U7b~%vP<L688c(Jk7WgH_{Lf0f
znzpGBq|{uu<d+lGUz${?HvuWxHlzbdT+!0)xWsF3+_U+ClMeD^0(-tLIhJ<6WYrgK
zW-?oN_ftbS&w04x`JCotL`bQB<E_Sc$D^l>;<1!3renhP0f*dffVLui@niR`Zy7WG
zF_;#Qt~W)w1NdeXO7lC4fUI~B-K!ClBBDFCj;Jn}3$}2xYTFB8lX_FXHmzg8HG;=N
z-(LjnzpePc#wd<%!*&;rUxHo(>;o<nI;(`I|I?~qii75{DCco#J1|#A-;(>oQkjMF
zp55)Eh2Io^+`=RoJPqsxeFoTtbnAPr-1PLA@z0nsW5$dbGiJ<~F=NJz88c?gm@#9<
gj2Sa#%s3tRADk0Wb9O$=ga7~l07*qoM6N<$f>24HQ2+n{

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index 5e4c13e..c728bb0 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -134,4 +134,10 @@ export const getGroupByVehicleCode = (code) => request({
 export const materialUpdate = (code, arr) => request({
 	url:'api/handheld/materialUpdate',
 	data: {vehicle_code: code, materials: arr}
+})
+
+// 空载具入库
+export const emptyVehicleWarehousing = (list) => request({
+	url:'api/handheld/emptyVehicleWarehousing',
+	data: {vehicleList: list}
 })
\ No newline at end of file