From ad1e4e950a4e961a41344e5847d47f91dabd0c29 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 15:58:22 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app

---
 pages/AGV/CallEmptyCar.vue |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pages/AGV/CallEmptyCar.vue b/pages/AGV/CallEmptyCar.vue
index 72ad6b3..d8292fc 100644
--- a/pages/AGV/CallEmptyCar.vue
+++ b/pages/AGV/CallEmptyCar.vue
@@ -2,7 +2,11 @@
 	<view>
 		<view class="code">
 			<view class="item">
-				<view class="code-decs">鍏ュ簱鍖�:</view>
+				<view class="code-decs">璧峰鍖�:</view>
+				<uni-combox :candidates="staList" placeholder="璇烽�夋嫨绔欑偣" v-model="orgSite"></uni-combox>
+			</view>
+			<view class="item">
+				<view class="code-decs">缁堢偣绔�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="tarSite" :focus="barcodeFocus">
 			</view>
 
@@ -70,7 +74,7 @@
 				locNo: "",
 				orgSite: '',
 				tarSite: '',
-				staList: ["e"],
+				staList: ["SO", "EO"],
 			}
 		},
 		onLoad() {
@@ -88,7 +92,7 @@
 			this.token = uni.getStorageSync('token');
 		},
 		mounted() {
-			this.tarSite = uni.getStorageSync('tarSite')
+			// this.tarSite = uni.getStorageSync('tarSite')
 		},
 		methods: {
 			messageToggle(type) {
@@ -284,11 +288,16 @@
 				this.$refs.combConfirm.close()
 			},
 			comb() {
-				uni.setStorageSync('tarSite', this.tarSite);
+				// uni.setStorageSync('tarSite', this.tarSite);
 				uni.vibrateShort();
 				let that = this;
+				if (that.orgSite === '') {
+					this.messageText = "璧峰鍖轰负绌�"
+					this.messageToggle('error')
+					return;
+				}
 				if (that.tarSite === '') {
-					this.messageText = "鍏ュ簱鍖轰负绌�"
+					this.messageText = "缁堢偣绔欎负绌�"
 					this.messageToggle('error')
 					return;
 				}
@@ -343,7 +352,7 @@
 			resst() {
 				this.orgSite = ''
 				this.dataList = []
-
+				this.tarSite = ''
 
 			},
 		}

--
Gitblit v1.9.1