From 1e40a94e41a811a30b49150b5feabe9b7797948a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 08:23:06 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationDetl.vue |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 7d5a4f1..a4d6060 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -23,6 +23,7 @@
 				<view style="flex:3;text-align: right;">{{wrkMast.ioTitle}}</view>
 			</view>
 			<view>宸ヤ綔绫诲瀷: {{wrkMast.ioType$}}</view>
+			<view>宸ヤ綔鐘舵��: {{wrkMast.wrkSts$}}</view>
 			<view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
 			<view>璐ф灦鐮�: {{wrkMast.barcode}}</view>
 		</view>
@@ -35,7 +36,7 @@
 				<view>鍟嗗搧缂栫爜:{{wrkDetl.matnr}}</view>
 				<view>閿�鍞鍗曞彿:{{wrkDetl.threeCode ? wrkDetl.threeCode : ' --'}}</view>
 				<view>鑷敱椤�:{{wrkDetl.deadTime ? wrkDetl.deadTime : ' --'}}</view>
-				<view>鏁伴噺:{{wrkDetl.anfme}}</view>
+				<view>鍑哄簱鏁伴噺:{{wrkDetl.anfme}}</view>
 			</view>
 		</view>
 		
@@ -162,6 +163,7 @@
 			<button size="mini" type="primary" @click="doContainerMoveOut2()" v-if="btnType == 'out'">璐ф灦绂诲満</button>
 			<button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
 			<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
+			<button size="mini" type="primary" @click="doPickIn2()" v-if="btnType == 'pick'">鍐嶆鎷f枡</button>
 			<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
 		</view>
 	</view>
@@ -338,7 +340,7 @@
 					method: 'POST',
 					header: { 'token': uni.getStorageSync('token') },
 					success(res) {
-						var res = result.data
+						var res = res.data
 						if (res.code === 200) {
 							setTimeout(()=> {
 								_this.containerType = ''
@@ -552,6 +554,25 @@
 					}
 				})
 			},
+			// 鍐嶆鎷f枡
+			doPickIn2() {
+				let _this = this
+				let item = this.wrkMast
+				uni.navigateTo({
+					url: './pickAgain',
+					success(res) {
+						res.eventChannel.emit('item', {
+							item: item,
+							wrkDetls: _this.wrkDetls,
+						})
+					},
+					events: {
+						acceptDataFromOpenedPage: function(data) {
+							_this.reloadStation()
+						}
+					}
+				})
+			},
 			// 鎷f枡鍑哄簱 纭鍚庡洖搴�
 			doPickIn() {
 				this.$refs.doPickIn.open()
@@ -616,13 +637,13 @@
 	@import url('../../../static/css/common/order.css');
 	
 	.station {
-		font-size: 18px;
-		padding: 24rpx;
+		font-size: 15px;
+		padding: 18rpx;
 	}
 	.station-title {
-		font-size: 32px;
+		font-size: 28px;
 		font-weight: bold;
-		padding: 24rpx 0;
+		padding: 18rpx 0;
 	}
 	.station-barcode {
 		font-size: 24px;

--
Gitblit v1.9.1