From da1490e1b6a7966b39661438927b38113e9f8be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 23 Mar 2026 11:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=88=B9=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E4=BD=9C=E5=BA=9F=E6=A0=87=E8=AF=86=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue             |  6 +++++-
 pages.json          | 16 ++++++++--------
 pages/pallet/ck.vue |  3 ++-
 pages/pallet/js.vue |  7 ++++++-
 pages/pallet/ps.vue |  5 +++++
 pages/pallet/xp.vue |  7 ++++++-
 pages/pallet/yz.vue | 13 +++++++++++--
 7 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/App.vue b/App.vue
index 3f67d8a..bac8507 100644
--- a/App.vue
+++ b/App.vue
@@ -13,6 +13,9 @@
 			
 			var token= uni.getStorageSync("token");
 			if(token){
+				uni.redirectTo({
+					url: '/pages/index/index'
+				});
 				return false;
 			}
 			
@@ -91,8 +94,9 @@
 								uni.setStorageSync('user', JSON.stringify(datas.user));
 								uni.setStorageSync('menu', JSON.stringify(datas.user.btns)); 
 								this.getdept();
+								console.log('1');
 								// 跳转 首页
-								uni.switchTab({
+								uni.redirectTo({
 									url: '/pages/index/index'
 								});
 							}else{
diff --git a/pages.json b/pages.json
index 77eb23f..16c8692 100644
--- a/pages.json
+++ b/pages.json
@@ -13,6 +13,14 @@
     ]
   },
   "pages": [
+	  {
+	    "path": "pages/login/index",
+	    "style": {
+	      "app-plus": {
+	        "titleNView": false
+	      }
+	    }
+	  },
 	{
 	  "path": "pages/index/index",
 	  "style": {
@@ -20,14 +28,6 @@
 	    "navigationBarTitleText": "工装托盘管理平台"
 	  }
 	},
-    {
-      "path": "pages/login/index",
-      "style": {
-        "app-plus": {
-          "titleNView": false
-        }
-      }
-    },
     {
       "path": "pages/me/index",
       "style": {
diff --git a/pages/pallet/ck.vue b/pages/pallet/ck.vue
index 30da871..5484bdd 100644
--- a/pages/pallet/ck.vue
+++ b/pages/pallet/ck.vue
@@ -311,6 +311,7 @@
 						this.ifsm = false;
 						this.trayInfo=res.data;
 						if(this.trayInfo.loadId){
+              console.log(1)
 							// 查询托盘明细
 							this.getYpDetail()
 						}
@@ -347,7 +348,7 @@
 					title: '数据加载中...'
 				});
 				// 查询 托盘基本信息
-				const {data: res} = await uni.$http.get('/searchInstdetail',{
+				const {data: res} = await uni.$http.get('/getInstdetail',{
 					palletNo:this.rmbm
 				});
 				if(res.success){
diff --git a/pages/pallet/js.vue b/pages/pallet/js.vue
index c25ba6d..3362563 100644
--- a/pages/pallet/js.vue
+++ b/pages/pallet/js.vue
@@ -71,11 +71,12 @@
 			<view class="input-group">
 			  <view class="label">编号</view>
 			  <view class="input-container">
-			    <input
+			    <u-input
 			      v-model="palletNo"
 			      class="input-field"
 			      placeholder="请输入"
 			      maxlength="50"
+				  @input="toUpperCase"
 			    />
 				<view class="scan-btn" @click="scanPallet">
 				  <uni-icons type="scan" size="20" color="#007AFF"></uni-icons>
@@ -214,6 +215,10 @@ export default {
 		this.getTypes();
 	},
 	methods: {
+		toUpperCase(e){
+			this.palletNo = e.toUpperCase()
+			this.$forceUpdate();
+		},
 		// 选择接收地址
 		showaddress(e) {
 			this.$refs.clsel._show();
diff --git a/pages/pallet/ps.vue b/pages/pallet/ps.vue
index 46627c7..13b0d7e 100644
--- a/pages/pallet/ps.vue
+++ b/pages/pallet/ps.vue
@@ -189,6 +189,7 @@
 			      class="input-field"
 			      placeholder="请输入"
 			      maxlength="50"
+            @input="toUpperCase"
 			    />
 				<view class="scan-btn" @click="scanPallet">
 				  <uni-icons type="scan" size="20" color="#007AFF"></uni-icons>
@@ -431,6 +432,10 @@ export default {
 		// #endif
 	},
 	methods: {
+    toUpperCase(e){
+      this.palletNo = e.toUpperCase()
+      this.$forceUpdate();
+    },
 		// 选择接收地址
 		showaddress(e) {
 			this.$refs.clsel._show();
diff --git a/pages/pallet/xp.vue b/pages/pallet/xp.vue
index 308b222..c86b5b4 100644
--- a/pages/pallet/xp.vue
+++ b/pages/pallet/xp.vue
@@ -79,11 +79,12 @@
     		<view class="input-group">
     		  <text class="label">编号</text>
     		  <view class="input-container">
-    		    <input
+    		    <u-input
     		      v-model="palletNo"
     		      class="input-field"
     		      placeholder="请输入"
     		      maxlength="50"
+				  @input="toUpperCase"
     		    />
     			<view class="scan-btn" @click="scanPallet">
     			  <uni-icons type="scan" size="20" color="#007AFF"></uni-icons>
@@ -250,6 +251,10 @@ export default {
 		this.$refs.uForm.setRules(this.rules);
 	},
 	methods: {
+		toUpperCase(e){
+			this.palletNo = e.toUpperCase()
+			this.$forceUpdate();
+		},
 		/**
 		 * h5扫码返回
 		*/
diff --git a/pages/pallet/yz.vue b/pages/pallet/yz.vue
index 42eb677..eecd451 100644
--- a/pages/pallet/yz.vue
+++ b/pages/pallet/yz.vue
@@ -88,7 +88,7 @@
 					</view>
 				</u-form-item>
 				<u-form-item label="托盘表号" label-width="140rpx" label-position="left" prop="loadInst">
-					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.loadInst" type="text" maxlength="200"></u-input>
+					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.loadInst" type="text" maxlength="200" @input=toUpperCase1></u-input>
 				</u-form-item>
 				<u-form-item label="装盘数量" label-width="140rpx" label-position="left" prop="loadQty">
 					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.loadQty" type="number" maxlength="200"></u-input>
@@ -138,11 +138,12 @@
 			<view class="input-group">
 			  <text class="label">编号</text>
 			  <view class="input-container">
-			    <input
+			    <u-input
 			      v-model="palletNo"
 			      class="input-field"
 			      placeholder="请输入"
 			      maxlength="50"
+				  @input="toUpperCase"
 			    />
 				<view class="scan-btn" @click="scanPallet">
 				  <uni-icons type="scan" size="20" color="#007AFF"></uni-icons>
@@ -308,6 +309,14 @@ export default {
 		this.$refs.uForm.setRules(this.rules);
 	},
 	methods: {
+		toUpperCase(e){
+			this.palletNo = e.toUpperCase()
+			this.$forceUpdate();
+		},
+		toUpperCase1(e){
+			this.itemList.loadInst = e.toUpperCase()
+			this.$forceUpdate();
+		},
 		/**
 		 * h5扫码返回
 		*/