From 35affebf36d975f2f19d01f09a114c99155e03c3 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 14 四月 2024 19:36:46 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationDetl.vue |   22 ++++++++---
 manifest.json                            |    2 
 pages.json                               |    9 ++++
 pages/phyz/checkLocDetl/checkLocDetl.vue |   59 +++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0f6aee5..e2044f6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__DA5854D",
     "description" : "",
     "versionName" : "20240412A",
-    "versionCode" : "100",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index b3f73fb..d334e2a 100644
--- a/pages.json
+++ b/pages.json
@@ -613,6 +613,15 @@
         		"enablePullDownRefresh" : false
         	}
         }
+        ,{
+            "path" : "pages/phyz/checkLocDetl/checkLocDetl",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "鐩樼偣",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/phyz/checkLocDetl/checkLocDetl.vue b/pages/phyz/checkLocDetl/checkLocDetl.vue
new file mode 100644
index 0000000..7aa4687
--- /dev/null
+++ b/pages/phyz/checkLocDetl/checkLocDetl.vue
@@ -0,0 +1,59 @@
+<template>
+	<view>
+		<view>
+			{{locNo}}
+		</view>
+		<view style="display: flex;">
+			<view class="dropdown" @click="toggleDropdown()">
+				<input type="text" style="flex: 1;" v-model="containerType"  placeholder="璇烽�夋嫨鎺�">
+				<uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
+				<scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
+					<view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
+				</scroll-view>
+			</view>
+			<view class="dropdown" @click="toggleDropdown()">
+				<input type="text" style="flex: 1;" v-model="containerType"  placeholder="璇烽�夋嫨鍒�">
+				<uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
+				<scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
+					<view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
+				</scroll-view>
+			</view>
+			<view class="dropdown" @click="toggleDropdown()">
+				<input type="text" style="flex: 1;" v-model="containerType"  placeholder="璇烽�夋嫨灞�">
+				<uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
+				<scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
+					<view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
+				</scroll-view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				locNo: '123123'
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+	@import url('../../../static/css/common/order.css');
+	.dropdown {
+		border: 1px solid #a7a7a7;
+		margin: 2px;
+		padding: 6px;
+	}
+	.dropdown:first-child {
+		margin-left: 2px;
+	}
+	.dropdown:last-child {
+		margin-right: 2px;
+	}
+</style>
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 9fa6b9d..ec31cef 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -19,11 +19,12 @@
 		<!-- 宸ヤ綔妗� -->
 		<view class="wrkMast" v-if="wrkMast">
 			<view class="wrkMast-wrkNo">
-				<view style="flex:3">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
-				<view style="flex:2;text-align: right;">{{wrkMast.ioTitle}}</view>
+				<view style="flex:5">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
+				<view style="flex:3;text-align: right;">{{wrkMast.ioTitle}}</view>
 			</view>
 			<view>宸ヤ綔绫诲瀷: {{wrkMast.ioType$}}</view>
 			<view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
+			<view>璐ф灦鐮�: {{wrkMast.barcode}}</view>
 		</view>
 		
 		<!-- 鏄庣粏 -->
@@ -140,9 +141,9 @@
 		<view class="buttom">
 			<button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">绌烘澘鍏ュ簱</button>
 			<button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">鍛煎彨绌烘澘</button>
-			<button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out' && station.locSts == 'F'">纭鍑哄簱</button>
-			<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick' && station.locSts == 'F'">宸叉嫞鏂欏洖搴�</button>
-			<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start' && station.locSts == 'F'">鍚姩鍏ュ簱</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="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
 		</view>
 	</view>
 </template>
@@ -200,6 +201,15 @@
 							} else {
 								_this.btnType = 'working' 
 							}
+							// if (res.data.records[0].locSts == 'O') {
+							// 	res.data.records[0].locSts$ = '娌℃湁璐ф灦'
+							// } else if (res.data.records[0].locSts == 'F') {
+							// 	res.data.records[0].locSts$ = '璐ф灦鍦ㄥ簱'
+							// } else if (res.data.records[0].locSts == 'S') {
+							// 	res.data.records[0].locSts$ = '璐ф灦杩涘叆涓�'
+							// } else if (res.data.records[0].locSts == 'R') {
+							// 	res.data.records[0].locSts$ = '璐ф灦绂诲紑涓�'
+							// }
 							
 							setTimeout(()=>{
 								for  (let k of res.data.records) {
@@ -583,7 +593,7 @@
 		padding: 24rpx;
 	}
 	.wrkMast-wrkNo {
-		font-size: 32px;
+		font-size: 30px;
 		font-weight: bold;
 		padding: 24rpx 0;
 		display: flex;

--
Gitblit v1.9.1