From 176aa7e9ef2002158bcf5c1a8deb5423875f6aa0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 03 四月 2024 09:20:03 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationManage.vue |   36 +++++++++++++++--
 pages/tzsk/AGV/AGVPakinBing.vue            |    7 +--
 pages/phyz/AGV/AGVPakin3.vue               |   17 ++++++--
 static/css/wms.css/wms.css                 |    4 +-
 4 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/pages/phyz/AGV/AGVPakin3.vue b/pages/phyz/AGV/AGVPakin3.vue
index 6269cb3..5e8dac6 100644
--- a/pages/phyz/AGV/AGVPakin3.vue
+++ b/pages/phyz/AGV/AGVPakin3.vue
@@ -33,13 +33,19 @@
 						<view class="desc">No锛�</view>
 						<view class="left-item">{{i + 1}}</view>
 					</view>
-					<!-- <view class="list-left-item">
-						<view class="desc">绠辩爜锛�</view>
+					<view class="list-left-item">
+						<view class="desc">璁㈠崟鍙凤細</view>
 						<view class="left-item">
-							<input type="text" v-model="item.containerCode">
-							<uni-tag :text="item.containerCode" type="primary"></uni-tag>
+							<input type="text" v-model="item.csocode">
+							<!-- <uni-tag :text="item.csocode" type="primary"></uni-tag> -->
 						</view>
-					</view> -->
+					</view>
+					<view class="list-left-item">
+						<view class="desc">鑷敱椤癸細</view>
+						<view class="left-item">
+							<input type="text" v-model="item.isoseq">
+						</view>
+					</view>
 					<view class="list-left-item">
 						<view class="desc">缂栫爜锛�</view>
 						<view class="left-item">
@@ -67,6 +73,7 @@
 				</view>
 				<view class="list-right">
 					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+					<view style="width: 10rpx;"></view>
 					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
 				</view>
 			</view>
diff --git a/pages/phyz/stationManage/stationManage.vue b/pages/phyz/stationManage/stationManage.vue
index e458353..e1e6d04 100644
--- a/pages/phyz/stationManage/stationManage.vue
+++ b/pages/phyz/stationManage/stationManage.vue
@@ -41,7 +41,7 @@
 			</view>
 		</view>
 		
-		<view class="list" style="background-color: #fda800;color: #fff;" v-for="wrkMast in waitPakins">
+		<view class="list" style="background-color: #fda800;color: #fff;" v-if="!wrkDetls" v-for="wrkMast in waitPakins">
 			<view class="list-left">
 				<view>鐗╂枡鍙凤細{{wrkMast.matnr}}</view>
 				<view>鐗╂枡鍚嶇О锛歿{wrkMast.maktx}}</view>
@@ -227,6 +227,19 @@
 					data: {devNo: e},
 					method: 'POST',
 					success(res) {
+						res = res.data 
+						if (res.code === 200) {
+							_this.searchValue = ''
+							setTimeout(()=> {
+								_this.getBasDevp()
+							},100)  
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' }) 
+							setTimeout(()=> {
+								_this.searchValue = ''
+								_this.getBasDevp()
+							},2000)
+						}
 					}
 				})
 			},
@@ -240,7 +253,19 @@
 					data: JSON.stringify(devNo),
 					method: 'POST',
 					success(res) {
-						
+						res = res.data
+						if (res.code === 200) {
+							_this.searchValue = ''
+							setTimeout(()=> {
+								_this.getBasDevp()
+							},100)
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' }) 
+							setTimeout(()=> {
+								_this.searchValue = ''
+								_this.getBasDevp()
+							},2000)
+						}
 					}
 				})
 			},
@@ -269,6 +294,10 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
+							setTimeout(()=> {
+								that.searchValue = ''
+								that.getBasDevp()
+							},300)
 							uni.showToast({
 								title: res.msg,
 								icon: "none",
@@ -303,9 +332,6 @@
 			reviseConfirm() {
 				this.startPakin('empty')
 				this.$refs.revise.close()
-				setTimeout(()=> {
-					this.getBasDevp()
-				},300)
 			}
 		}
 	}
diff --git a/pages/tzsk/AGV/AGVPakinBing.vue b/pages/tzsk/AGV/AGVPakinBing.vue
index 8db7e37..b81b91c 100644
--- a/pages/tzsk/AGV/AGVPakinBing.vue
+++ b/pages/tzsk/AGV/AGVPakinBing.vue
@@ -201,7 +201,7 @@
 			stationCodeInput() {
 				setTimeout(() => {
 					var len = this.stationCode.length
-					if (len != 15) {
+					if (len != 7) {
 						this.stationCode = ''
 						this.stationCodeFocus = true
 						uni.showToast({
@@ -217,12 +217,9 @@
 			// barcode input 浜嬩欢
 			barcodeInput() {
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
-				if (this.barcode.split('_')[1]) {
-					this.barcode = this.barcode.split('_')[1]
-				} 
 				setTimeout(() => {
 					var len = this.barcode.length
-					if (len != 10) {
+					if (len != 6) {
 						uni.showToast({
 							title: '鏂欑鐮佹湁璇閲嶈瘯',
 							icon: "none",
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index ad6e288..ee54200 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -39,10 +39,10 @@
 }
 .list-right {
 	display: flex;
-	width: 20vw;
+	/* width: 20vw; */
 	justify-content: space-between;
 	align-items: center;
-	margin-right: 20rpx;
+	/* margin-right: 20rpx; */
 }
 .buttom {
 	width: 100%;

--
Gitblit v1.9.1