From 11c52061e55be42d4cd630a49fa2fbde82650f52 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 18 十二月 2025 19:33:49 +0800
Subject: [PATCH] #

---
 pages/stock/stockQuery.vue    |  535 +++++++--
 pages/home/home.vue           |  529 +++++-----
 pages/order/orderList.vue     |  453 +++++--
 pages/login/login.vue         |    5 
 pages/order/orderPakin2.vue   | 1032 +++++++++++++------
 pages.json                    |    2 
 pages/order/orderDetlList.vue |  526 ++++++++-
 7 files changed, 2,107 insertions(+), 975 deletions(-)

diff --git a/pages.json b/pages.json
index ebaff47..154ebe2 100644
--- a/pages.json
+++ b/pages.json
@@ -273,7 +273,7 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "鍗曟嵁鍒楄〃",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
             
         },
diff --git a/pages/home/home.vue b/pages/home/home.vue
index b5c48ac..1be4e6c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,17 +1,44 @@
 <template>
-	<view>
-		<scroll-view scroll-y class="page">
-			<view class="nav-list">
-				<navigator hover-class='none' :url="'/pages' + item.url" class="nav-li" navigateTo
-					:class="'bg-'+item.color" :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]"
-					v-for="(item,index) in elements" :key="index">
-					<view class="nav-title">{{item.title}}</view>
-					<view class="nav-name">{{item.name}}</view>
-					<text :class="'cuIcon-' + item.cuIcon"></text>
-				</navigator>
+	<view class="page-container">
+		<!-- 澶撮儴娆㈣繋鍖哄煙 -->
+		<view class="header-section">
+			<view class="header-bg"></view>
+			<view class="header-content">
+				<view class="welcome-text">
+					<text class="greeting">娆㈣繋浣跨敤</text>
+					<text class="app-name">WMS 浠撳偍绠＄悊绯荤粺</text>
+				</view>
+				<view class="header-icon">
+					<uni-icons type="home" size="40" color="#ffffff"></uni-icons>
+				</view>
 			</view>
-			<view class="cu-tabbar-height"></view>
-		</scroll-view>
+		</view>
+		
+		<!-- 鍔熻兘鑿滃崟 -->
+		<view class="menu-section">
+			<view class="menu-grid">
+				<view class="menu-item" v-for="(item, index) in elements" :key="index" 
+					@click="navigateTo(item)" :style="{animationDelay: (index * 0.1) + 's'}">
+					<view class="menu-card" :class="'card-' + item.color">
+						<view class="card-icon">
+							<uni-icons :type="getIconType(item)" size="32" color="#ffffff"></uni-icons>
+						</view>
+						<view class="card-info">
+							<text class="card-title">{{item.title}}</text>
+							<text class="card-desc">{{item.name}}</text>
+						</view>
+						<view class="card-arrow">
+							<uni-icons type="right" size="16" color="rgba(255,255,255,0.6)"></uni-icons>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 搴曢儴鐗堟潈 -->
+		<view class="footer">
+			<text class="footer-text">WMS Mobile v1.0</text>
+		</view>
 	</view>
 </template>
 
@@ -24,178 +51,27 @@
 				icon: '',
 				elements: [],
 				elements2: [
-					// {
-					// 	title: '缁勬墭',
-					// 	name: 'pakin',
-					// 	color: 'cyan',
-					// 	cuIcon: 'pullup',
-					// 	url: '/pakin/pakin'
-					// },
+					{
+						title: '缁勬墭',
+						name: 'pakin',
+						color: 'cyan',
+						cuIcon: 'pullup',
+						url: '/pakin/pakin'
+					},
 					{
 						title: '璁㈠崟鍏ュ簱',
 						name: 'orderPakin',
-						color: 'red',
+						color: 'purple',
 						cuIcon: '',
 						url: '/order/orderList'
 					},
 					{
-						title: '鎷ｆ枡绔欏埌绔�',
-						name: 'leftover',
-						color: 'orange',
-						cuIcon: 'pullup',
-						url: '/pakin/leftovers'
-					},
-
-					// {
-					// 	title: '骞冲簱鍏ュ簱',
-					// 	name: 'POrderPakin',
-					// 	color: 'purple',
-					// 	cuIcon: '',
-					// 	url: '/pingku/POrderList'
-					// },
-					// {
-					// 	title: '骞冲簱鍑哄簱',
-					// 	name: 'POrderPakin',
-					// 	color: 'cyan',
-					// 	cuIcon: '',
-					// 	url: '/pingku/POrderListOut'
-					// },
-					// {
-					// 	title: '骞冲簱搴撳瓨璋冩暣',
-					// 	name: 'oo',
-					// 	color: 'olive',
-					// 	cuIcon: '',
-					// 	url: '/pingku/PInventoryAdjustment'
-					// },
-
-					{
-						title: '鍛煎彨Agv',
-						name: 'AGVStart',
-						color: 'cyan',
+						title: '搴撳瓨鏌ヨ',
+						name: 'stockQuery',
+						color: 'green',
 						cuIcon: '',
-						url: '/AGV/AGVStart'
+						url: '/stock/stockQuery'
 					},
-					// {
-					// 	title: 'Agv鎷嗘墭鍛煎彨',
-					// 	name: 'AGVDismantle',
-					// 	color: 'cyan',
-					// 	cuIcon: '',
-					// 	url: '/AGV/AGVDismantle'
-					// },
-					{
-						title: 'Agv鍌ㄤ綅瑙ｇ粦',
-						name: 'AGVUnbind',
-						color: 'orange',
-						cuIcon: '',
-						url: '/AGV/AGVUnbind'
-					},
-					// {
-					// 	title: 'Agv鍌ㄤ綅缁戝畾',
-					// 	name: 'AGVBind',
-					// 	color: 'purple',
-					// 	cuIcon: '',
-					// 	url: '/AGV/AGVBind'
-					// },
-					// {
-					// 	title: '绔欑粦瀹�',
-					// 	name: 'AGVStaBind',
-					// 	color: 'red',
-					// 	cuIcon: '',
-					// 	url: '/AGV/AGVStaBind'
-					// },
-					// {
-					// 	title: '浜х嚎鍙枡',
-					// 	name: 'AGVSiteList',
-					// 	color: 'red',
-					// 	cuIcon: '',
-					// 	url: '/AGV/AGVSiteList'
-					// },
-					// {
-					// 	title: '浜х嚎鍙枡2',
-					// 	name: 'AGVSiteList2',
-					// 	color: 'red',
-					// 	cuIcon: '',
-					// 	url: '/AGV/AGVSiteList2'
-					// },
-					// {
-					// 	title: '鎴愬搧鍛煎彨',
-					// 	name: 'AGVFinishedCall',
-					// 	color: 'orange',
-					// 	cuIcon: '',
-					// 	url: '/AGV/AGVFinishedCall'
-					// },
-					// {
-					// 	title: '鎴愬搧鍛煎彨2',
-					// 	name: 'AGV_2F',
-					// 	color: 'purple',
-					// 	cuIcon: '',
-					// 	url: '/AGV/AGV2F'
-					// },
-					// {
-					// 	title: '缁勬墭涓婃灦',
-					// 	name: 'putOn',
-					// 	color: 'orange',
-					// 	cuIcon: 'pullup',
-					// 	url: '/pakin/putOn'
-					// },
-					// {
-					// 	title: '鎵撳嵃',
-					// 	name: 'print',
-					// 	color: 'purple',
-					// 	cuIcon: 'text',
-					// 	url: '/print/print'
-					// },
-					// {
-					// 	title: '璁㈠崟涓婃灦',
-					// 	name: 'orderPutOn',
-					// 	color: 'yellow',
-					// 	cuIcon: 'pullup',
-					// 	url: '/order/orderPutOn'
-					// },
-					// {
-					// 	title: '璁㈠崟涓嬫灦',
-					// 	name: 'orderPutDown',
-					// 	color: 'olive',
-					// 	cuIcon: 'pulldown',
-					// 	url: '/order/orderPutDown'
-					// },
-					// {
-					// 	title: '搴撳瓨鏌ヨ',
-					// 	name: 'stockQuery',
-					// 	color: 'green',
-					// 	cuIcon: '',
-					// 	url: '/stock/stockQuery'
-					// },
-					// {
-
-					// {
-					// 	title: '鍟嗗搧鎵撳嵃',
-					// 	name: 'matList',
-					// 	color: 'orange',
-					// 	cuIcon: 'post',
-					// 	url: '/mat/matList'
-					// },
-					// {
-					// 	title: '琛ヨ揣',
-					// 	name: 'restock',
-					// 	color: 'yellow',
-					// 	cuIcon: 'punch',
-					// 	url: '/stock/restock'
-					// },
-					// {
-					// 	title: '杞叏鏉�',
-					// 	name: 'piking',
-					// 	color: 'olive',
-					// 	cuIcon: 'order',
-					// 	url: '/pakin/piking'
-					// },
-					// {
-					// 	title: '鎹㈡澘缁戝畾',
-					// 	name: 'changePallet',
-					// 	color: 'green',
-					// 	cuIcon: 'order',
-					// 	url: '/stock/changePallet'
-					// },
 					{
 						title: '閫�鍑虹櫥褰�',
 						name: 'logOut',
@@ -203,21 +79,39 @@
 						cuIcon: 'exit',
 						url: '/login/logOut'
 					},
-
 				],
-				colorList: ['cyan', 'blue', 'mauve', 'pink', 'brown', 'red', 'orange', 'yellow', 'olive', 'olive', 'green',
-					'grey'
-				]
+				colorList: ['cyan', 'purple', 'blue', 'pink', 'orange', 'green', 'mauve', 'brown', 'olive', 'red', 'yellow', 'grey'],
+				// 鍥炬爣鏄犲皠
+				iconMap: {
+					'pakin': 'upload',
+					'orderPakin': 'list',
+					'stockQuery': 'search',
+					'logOut': 'redo',
+					'orderPutOn': 'top',
+					'orderPutDown': 'bottom',
+					'restock': 'refresh',
+					'stockCheck': 'checkbox',
+				}
 			};
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			this.getAuth()
+			this.getAuth();
 		},
 		methods: {
+			// 鑾峰彇鍥炬爣绫诲瀷
+			getIconType(item) {
+				return this.iconMap[item.name] || 'circle';
+			},
+			// 璺宠浆椤甸潰
+			navigateTo(item) {
+				uni.navigateTo({
+					url: '/pages' + item.url
+				});
+			},
 			getAuth() {
-				let that = this
+				let that = this;
 				uni.request({
 					url: that.baseUrl + '/menu/pda/auth',
 					data: {},
@@ -226,25 +120,25 @@
 					},
 					method: 'POST',
 					success(res) {
-						res = res.data
-						that.elements = []
+						res = res.data;
+						that.elements = [];
 						if (res.code === 200) {
 							if (res.data == undefined || res.data == null || res.data == "") {
-								that.elements = that.elements2
-								return
+								that.elements = that.elements2;
+								return;
 							}
 							for (var i = 0; i < res.data.length; i++) {
 								if (res.data.length < 0) {
 									break;
 								}
-								that.getIcon(res.data[i].title)
+								that.getIcon(res.data[i].title);
 								that.elements.unshift({
 									title: res.data[i].name,
 									name: res.data[i].title,
-									color: that.colorList[i],
+									color: that.colorList[i % that.colorList.length],
 									cuIcon: that.icon,
 									url: res.data[i].action
-								})
+								});
 							}
 							that.elements.push({
 								title: '閫�鍑虹櫥褰�',
@@ -252,42 +146,38 @@
 								color: 'grey',
 								cuIcon: 'exit',
 								url: '/login/logOut'
-							})
+							});
 						} else if (res.code === 403) {
 							uni.showToast({
 								title: res.msg,
 								icon: "none",
 								position: 'top'
-							})
+							});
 							setTimeout(() => {
 								uni.reLaunch({
 									url: '../login/login'
 								});
 							}, 1000);
 						} else if (res.status === 404) {
-							that.elements = that.elements2
-							// uni.showToast({
-							// 	title: '榛樿涓婚〉',
-							// 	icon: "none",
-							// 	position: 'top'
-							// })
+							that.elements = that.elements2;
 						} else {
 							uni.showToast({
 								title: res.msg,
 								icon: "none",
 								position: 'top'
-							})
+							});
 						}
 					},
 					fail(err) {
 						console.log(err);
+						that.elements = that.elements2;
 					}
-				})
+				});
 			},
 			getIcon(e) {
-				const ways = ['pakin', 'orderPakin', 'orderPutOn']
+				const ways = ['pakin', 'orderPakin', 'orderPutOn'];
 				if (ways.includes(e)) {
-					this.icon = 'pullup'
+					this.icon = 'pullup';
 				}
 			}
 		}
@@ -295,82 +185,201 @@
 </script>
 
 <style>
-	.page {
-		height: 100vh;
+	page {
+		background: #f5f7fa;
 	}
-
-	.bg-red {
-		background-color: #e54d42;
+	
+	.page-container {
+		min-height: 100vh;
+		background: linear-gradient(180deg, #f5f7fa 0%, #e8ebed 100%);
+	}
+	
+	/* 澶撮儴鍖哄煙 */
+	.header-section {
+		position: relative;
+		height: 280rpx;
+		overflow: hidden;
+	}
+	
+	.header-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 320rpx;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		border-radius: 0 0 60rpx 60rpx;
+	}
+	
+	.header-content {
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 60rpx 40rpx 40rpx;
+	}
+	
+	.welcome-text {
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.greeting {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.8);
+	}
+	
+	.app-name {
+		font-size: 40rpx;
 		color: #ffffff;
+		font-weight: 600;
+		margin-top: 12rpx;
 	}
-
-	.bg-orange {
-		background-color: #f37b1d;
+	
+	.header-icon {
+		width: 100rpx;
+		height: 100rpx;
+		background: rgba(255, 255, 255, 0.2);
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	/* 鑿滃崟鍖哄煙 */
+	.menu-section {
+		padding: 0 24rpx;
+		margin-top: -60rpx;
+		position: relative;
+	}
+	
+	.menu-grid {
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.menu-item {
+		margin-bottom: 20rpx;
+		animation: slideUp 0.5s ease forwards;
+		opacity: 0;
+		transform: translateY(20rpx);
+	}
+	
+	@keyframes slideUp {
+		to {
+			opacity: 1;
+			transform: translateY(0);
+		}
+	}
+	
+	.menu-card {
+		display: flex;
+		align-items: center;
+		padding: 28rpx 24rpx;
+		border-radius: 20rpx;
+		box-shadow: 0 8rpx 30rpx rgba(0, 0, 0, 0.12);
+		transition: transform 0.2s ease, box-shadow 0.2s ease;
+	}
+	
+	.menu-card:active {
+		transform: scale(0.98);
+		box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.15);
+	}
+	
+	.card-icon {
+		width: 80rpx;
+		height: 80rpx;
+		background: rgba(255, 255, 255, 0.25);
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 24rpx;
+	}
+	
+	.card-info {
+		flex: 1;
+	}
+	
+	.card-title {
+		font-size: 32rpx;
 		color: #ffffff;
+		font-weight: 600;
+		display: block;
 	}
-
-	.bg-yellow {
-		background-color: #fbbd08;
-		color: #333333;
+	
+	.card-desc {
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.7);
+		display: block;
+		margin-top: 6rpx;
 	}
-
-	.bg-olive {
-		background-color: #8dc63f;
-		color: #ffffff;
+	
+	.card-arrow {
+		width: 40rpx;
+		height: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
-
-	.bg-green {
-		background-color: #39b54a;
-		color: #ffffff;
+	
+	/* 鍗＄墖棰滆壊 */
+	.card-cyan {
+		background: linear-gradient(135deg, #1cbbb4 0%, #16a085 100%);
 	}
-
-	.bg-cyan {
-		background-color: #1cbbb4;
-		color: #ffffff;
+	
+	.card-purple {
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
 	}
-
-	.bg-blue {
-		background-color: #0081ff;
-		color: #ffffff;
+	
+	.card-blue {
+		background: linear-gradient(135deg, #0081ff 0%, #00bcd4 100%);
 	}
-
-	.bg-purple {
-		background-color: #6739b6;
-		color: #ffffff;
+	
+	.card-green {
+		background: linear-gradient(135deg, #39b54a 0%, #8dc63f 100%);
 	}
-
-	.bg-mauve {
-		background-color: #9c26b0;
-		color: #ffffff;
+	
+	.card-orange {
+		background: linear-gradient(135deg, #f37b1d 0%, #fbbd08 100%);
 	}
-
-	.bg-pink {
-		background-color: #e03997;
-		color: #ffffff;
+	
+	.card-red {
+		background: linear-gradient(135deg, #e54d42 0%, #f37b1d 100%);
 	}
-
-	.bg-brown {
-		background-color: #a5673f;
-		color: #ffffff;
+	
+	.card-pink {
+		background: linear-gradient(135deg, #e03997 0%, #f37b1d 100%);
 	}
-
-	.bg-grey {
-		background-color: #8799a3;
-		color: #ffffff;
+	
+	.card-mauve {
+		background: linear-gradient(135deg, #9c26b0 0%, #667eea 100%);
 	}
-
-	.bg-gray {
-		background-color: #f0f0f0;
-		color: #333333;
+	
+	.card-brown {
+		background: linear-gradient(135deg, #a5673f 0%, #8799a3 100%);
 	}
-
-	.bg-black {
-		background-color: #333333;
-		color: #ffffff;
+	
+	.card-olive {
+		background: linear-gradient(135deg, #8dc63f 0%, #39b54a 100%);
 	}
-
-	.bg-white {
-		background-color: #ffffff;
-		color: #666666;
+	
+	.card-yellow {
+		background: linear-gradient(135deg, #fbbd08 0%, #f37b1d 100%);
+	}
+	
+	.card-grey {
+		background: linear-gradient(135deg, #8799a3 0%, #606266 100%);
+	}
+	
+	/* 搴曢儴 */
+	.footer {
+		padding: 40rpx 0 60rpx;
+		text-align: center;
+	}
+	
+	.footer-text {
+		font-size: 24rpx;
+		color: #c0c4cc;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a754947..e83f129 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -180,10 +180,11 @@
 							title: '璇锋眰澶辫触'
 						})
 					},
-					data: {
+					data: JSON.stringify({
 						username: that.user.userName,
 						password: md5.hex_md5(that.user.password)
-					},
+					}),
+					method:'POST',
 					header: {
 						"content-type": "application/json"
 					},
diff --git a/pages/order/orderDetlList.vue b/pages/order/orderDetlList.vue
index 85b849d..8e3be5b 100644
--- a/pages/order/orderDetlList.vue
+++ b/pages/order/orderDetlList.vue
@@ -1,17 +1,102 @@
 <template>
-	<view>
+	<view class="page-container">
+		<!-- 璁㈠崟淇℃伅澶撮儴 -->
+		<view class="order-header" v-if="order">
+			<view class="header-content">
+				<view class="header-row">
+					<text class="header-label">鍗曟嵁鍙�</text>
+					<text class="header-value">{{order.orderNo}}</text>
+				</view>
+				<view class="header-row">
+					<text class="header-label">鍗曟嵁绫诲瀷</text>
+					<text class="header-value">{{order.docType$ || '-'}}</text>
+				</view>
+			</view>
+		</view>
+		
 		<!-- 鎼滅储妗� -->
 		<view class="search-bar">
-			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @input="search" />
-		</view>	
-		<view class="card" v-show="item.enableQty >0" v-for="item in menuList" @click="chose(item)">
-			<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
-			<view class="tag-item">鐗╂枡鐮侊細 {{item.matnr}}</view>
-			<view class="tag-item">鐗╂枡鍚嶇О锛� {{item.maktx}}</view>
-			<view class="tag-item">瑙勬牸锛� {{item.specs}}</view>
-			<view class="tag-item">鎵规锛� {{item.batch}}</view>
-			<view class="tag-item">鏁伴噺锛� {{item.anfme}}</view>
-			<view class="tag-item">鍓╀綑鏁伴噺锛� {{item.enableQty}}</view>
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆鐗╂枡" bgColor="#F5F5F5" @confirm="search" @cancel="onCancelSearch" />
+		</view>
+		
+		<!-- 鏄庣粏鍒楄〃 -->
+		<view class="detl-list">
+			<view class="detl-card" v-for="(item, index) in filterList" :key="index" @click="chose(item)">
+				<!-- 鍗＄墖澶撮儴 -->
+				<view class="card-header">
+					<view class="mat-info">
+						<text class="mat-code">{{item.matnr}}</text>
+						<text class="mat-name">{{item.maktx || '-'}}</text>
+					</view>
+					<view class="qty-badge" :class="item.enableQty > 0 ? 'badge-active' : 'badge-done'">
+						<text class="qty-text">鍓╀綑 {{item.enableQty}}</text>
+					</view>
+				</view>
+				
+				<!-- 鍗＄墖鍐呭 -->
+				<view class="card-body">
+					<view class="info-grid">
+						<view class="info-item">
+							<text class="info-label">瑙勬牸</text>
+							<text class="info-value">{{item.specs || '-'}}</text>
+						</view>
+						<view class="info-item">
+							<text class="info-label">鎵规</text>
+							<text class="info-value">{{item.batch || '-'}}</text>
+						</view>
+						<view class="info-item">
+							<text class="info-label">璁㈠崟鏁伴噺</text>
+							<text class="info-value highlight">{{item.anfme}}</text>
+						</view>
+						<view class="info-item">
+							<text class="info-label">宸插畬鎴�</text>
+							<text class="info-value">{{item.anfme - item.enableQty}}</text>
+						</view>
+					</view>
+					
+					<!-- 杩涘害鏉� -->
+					<view class="progress-wrap">
+						<view class="progress-bar">
+							<view class="progress-fill" :style="{width: getProgress(item) + '%'}"></view>
+						</view>
+						<text class="progress-text">{{getProgress(item)}}%</text>
+					</view>
+				</view>
+				
+				<!-- 鍗＄墖搴曢儴 -->
+				<view class="card-footer" v-if="item.enableQty > 0">
+					<text class="action-text">鐐瑰嚮缁勬墭鍏ュ簱</text>
+					<uni-icons type="right" size="14" color="#667eea"></uni-icons>
+				</view>
+				<view class="card-footer card-footer-done" v-else>
+					<text class="done-text">宸插畬鎴�</text>
+					<uni-icons type="checkmarkempty" size="14" color="#28a745"></uni-icons>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 绌虹姸鎬� -->
+		<view class="empty-state" v-if="filterList.length === 0 && !loading">
+			<uni-icons type="info" size="60" color="#CCCCCC"></uni-icons>
+			<text class="empty-text">鏆傛棤鏄庣粏鏁版嵁</text>
+		</view>
+		
+		<!-- 缁熻淇℃伅 -->
+		<view class="stats-bar" v-if="menuList.length > 0">
+			<view class="stats-item">
+				<text class="stats-value">{{menuList.length}}</text>
+				<text class="stats-label">鎬绘槑缁�</text>
+			</view>
+			<view class="stats-divider"></view>
+			<view class="stats-item">
+				<text class="stats-value">{{pendingCount}}</text>
+				<text class="stats-label">寰呭鐞�</text>
+			</view>
+			<view class="stats-divider"></view>
+			<view class="stats-item">
+				<text class="stats-value">{{completedCount}}</text>
+				<text class="stats-label">宸插畬鎴�</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -20,93 +105,158 @@
 	export default {
 		data() {
 			return {
-				data:'',	
-				condition:'',
+				data: '',
+				condition: '',
 				menuList: [],
-				order:'',
+				order: '',
 				baseUrl: '',
 				token: '',
+				loading: false,
+			}
+		},
+		computed: {
+			// 杩囨护鍚庣殑鍒楄〃锛堜紭鍏堟樉绀烘湁鍓╀綑鏁伴噺鐨勶級
+			filterList() {
+				if (!this.condition.trim()) {
+					// 鎺掑簭锛氭湁鍓╀綑鏁伴噺鐨勬帓鍓嶉潰
+					return [...this.menuList].sort((a, b) => {
+						if (a.enableQty > 0 && b.enableQty <= 0) return -1;
+						if (a.enableQty <= 0 && b.enableQty > 0) return 1;
+						return 0;
+					});
+				}
+				const keyword = this.condition.toLowerCase();
+				return this.menuList.filter(item => {
+					return (item.matnr && item.matnr.toLowerCase().includes(keyword)) ||
+						   (item.maktx && item.maktx.toLowerCase().includes(keyword)) ||
+						   (item.batch && item.batch.toLowerCase().includes(keyword));
+				});
+			},
+			// 寰呭鐞嗘暟閲�
+			pendingCount() {
+				return this.menuList.filter(item => item.enableQty > 0).length;
+			},
+			// 宸插畬鎴愭暟閲�
+			completedCount() {
+				return this.menuList.filter(item => item.enableQty <= 0).length;
 			}
 		},
 		onLoad() {
-			let that = this
+			let that = this;
 			const eventChannel = this.getOpenerEventChannel();
-			eventChannel.on('data', function(data) {
-				that.order = data.data
-				that.getOrderNoList(that.order)
-			});
+			if (eventChannel) {
+				eventChannel.on('data', function(data) {
+					that.order = data.data;
+					that.getOrderNoList(that.order);
+				});
+			}
 		},
 		onShow() {
-			let that = this
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			that.getOrderNoList(that.order)
+			if (this.order) {
+				this.getOrderNoList(this.order);
+			}
 		},
 		methods: {
-			search(){
-				let that = this
+			// 璁＄畻杩涘害
+			getProgress(item) {
+				if (!item.anfme || item.anfme === 0) return 0;
+				const progress = ((item.anfme - item.enableQty) / item.anfme * 100).toFixed(0);
+				return Math.min(100, Math.max(0, progress));
+			},
+			// 鎼滅储
+			search() {
+				if (!this.condition.trim()) {
+					this.getOrderNoList(this.order);
+					return;
+				}
+				let that = this;
+				that.loading = true;
 				uni.request({
-				    url: that.baseUrl + '/orderDetl/search/pda/auth',
-				    data: {
+					url: that.baseUrl + '/orderDetl/search/pda/auth',
+					data: {
 						condition: that.condition,
 						order: that.order.orderNo
-				    },
-					// method:"GET",
-				    header: {
-						'token':uni.getStorageSync('token'),
-				    },
+					},
+					header: {
+						'token': uni.getStorageSync('token'),
+					},
 					success(result) {
-						console.log(result);
-						var res = result.data
-						if (res.code === 200 ) {
-							that.menuList = res.data
-							// that.save()
-						} else if (res.code == 403) {
-							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+						var res = result.data;
+						if (res.code === 200) {
+							that.menuList = res.data || [];
+						} else if (res.code === 403) {
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
+								uni.reLaunch({ url: '../login/login' });
 							}, 1000);
 						} else {
-							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 						}
+					},
+					fail() {
+						uni.showToast({ title: '鎼滅储璇锋眰澶辫触', icon: "none", position: 'top' });
+					},
+					complete() {
+						that.loading = false;
 					}
 				});
 			},
+			// 鍙栨秷鎼滅储
+			onCancelSearch() {
+				this.condition = '';
+				this.getOrderNoList(this.order);
+			},
+			// 鑾峰彇璁㈠崟鏄庣粏鍒楄〃
 			getOrderNoList(order) {
-				let that = this
+				if (!order || !order.orderNo) return;
+				let that = this;
+				that.loading = true;
 				uni.request({
-					url: uni.getStorageSync('baseUrl') + '/orderDetl/list/pda/auth',
+					url: uni.getStorageSync('baseUrl') + '/order/pakin/orderDetl/list/pda/auth',
 					method: 'POST',
-					data: {						
+					header: {
+						'token': uni.getStorageSync('token'),
+					},
+					data: {
 						orderNo: order.orderNo
 					},
 					success(res) {
-						res = res.data
-						that.menuList = res.data
+						res = res.data;
+						if (res.code === 200) {
+							that.menuList = res.data || [];
+						} else {
+							that.menuList = res.data || [];
+						}
+					},
+					fail() {
+						uni.showToast({ title: '鑾峰彇鏄庣粏澶辫触', icon: "none", position: 'top' });
+					},
+					complete() {
+						that.loading = false;
 					}
-				})
+				});
 			},
+			// 閫夋嫨鏄庣粏杩涜缁勬墭
 			chose(item) {
-				let that = this
+				if (item.enableQty <= 0) {
+					uni.showToast({ title: '璇ユ槑缁嗗凡瀹屾垚', icon: "none", position: 'top' });
+					return;
+				}
+				let that = this;
 				uni.navigateTo({
 					url: "../order/orderPakin2",
 					success: function(res) {
-						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 						res.eventChannel.emit('orderItem', {
 							item: item
-						})
+						});
 					},
 					events: {
-						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 						acceptDataFromOpenedPage: function(data) {
-							// that.matnr = data.data
-							// that.input(that.matnr)
+							// 杩斿洖鍚庡埛鏂版暟鎹�
 						},
 					},
-				
-				
 				});
 			}
 		}
@@ -114,19 +264,261 @@
 </script>
 
 <style>
-	.card {
-		margin: 20rpx;
-		padding: 30rpx;
-		background-color: #157ec1;
-		border-radius: 20rpx;
-		color: #FFF;
+	.page-container {
+		min-height: 100vh;
+		background: linear-gradient(135deg, #f5f7fa 0%, #e4e8eb 100%);
+		padding-bottom: 120rpx;
 	}
-	.tag-item {
-		width: 100%;
-		min-height: 60rpx;
-		line-height: 2;
-		padding-left: 50rpx;
+	
+	/* 璁㈠崟澶撮儴 */
+	.order-header {
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		padding: 16rpx 20rpx;
+	}
+	
+	.header-content {
+		background: rgba(255, 255, 255, 0.15);
+		border-radius: 10rpx;
+		padding: 12rpx 16rpx;
+	}
+	
+	.header-row {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 4rpx 0;
+	}
+	
+	.header-label {
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.7);
+	}
+	
+	.header-value {
+		font-size: 26rpx;
 		color: #ffffff;
-		font-size: 14px;
+		font-weight: 500;
+	}
+	
+	/* 鎼滅储鏍� */
+	.search-bar {
+		padding: 0rpx 14rpx;
+		background: #ffffff;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+	}
+	
+	/* 鏄庣粏鍒楄〃 */
+	.detl-list {
+		padding: 0 20rpx;
+	}
+	
+	.detl-card {
+		background: #ffffff;
+		border-radius: 12rpx;
+		margin-top: 12rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
+		overflow: hidden;
+		transition: transform 0.2s ease;
+	}
+	
+	.detl-card:active {
+		transform: scale(0.98);
+	}
+	
+	/* 鍗＄墖澶撮儴 */
+	.card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-start;
+		padding: 14rpx 16rpx;
+		border-bottom: 1rpx solid #f0f0f0;
+	}
+	
+	.mat-info {
+		flex: 1;
+		padding-right: 12rpx;
+	}
+	
+	.mat-code {
+		font-size: 26rpx;
+		color: #303133;
+		font-weight: 600;
+		display: block;
+	}
+	
+	.mat-name {
+		font-size: 22rpx;
+		color: #909399;
+		margin-top: 4rpx;
+		display: block;
+	}
+	
+	.qty-badge {
+		padding: 4rpx 12rpx;
+		border-radius: 16rpx;
+		flex-shrink: 0;
+	}
+	
+	.badge-active {
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+	}
+	
+	.badge-done {
+		background: #e8f5e9;
+	}
+	
+	.qty-text {
+		font-size: 20rpx;
+		font-weight: 500;
+		color: #ffffff;
+	}
+	
+	.badge-done .qty-text {
+		color: #28a745;
+	}
+	
+	/* 鍗＄墖鍐呭 */
+	.card-body {
+		padding: 12rpx 16rpx;
+	}
+	
+	.info-grid {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	
+	.info-item {
+		width: 50%;
+		margin-bottom: 8rpx;
+	}
+	
+	.info-label {
+		font-size: 20rpx;
+		color: #909399;
+		display: block;
+	}
+	
+	.info-value {
+		font-size: 24rpx;
+		color: #303133;
+		font-weight: 500;
+		display: block;
+		margin-top: 2rpx;
+	}
+	
+	.info-value.highlight {
+		color: #667eea;
+		font-weight: 600;
+	}
+	
+	/* 杩涘害鏉� */
+	.progress-wrap {
+		display: flex;
+		align-items: center;
+		margin-top: 8rpx;
+	}
+	
+	.progress-bar {
+		flex: 1;
+		height: 8rpx;
+		background: #e8e8e8;
+		border-radius: 4rpx;
+		overflow: hidden;
+	}
+	
+	.progress-fill {
+		height: 100%;
+		background: linear-gradient(90deg, #667eea 0%, #764ba2 100%);
+		border-radius: 4rpx;
+		transition: width 0.3s ease;
+	}
+	
+	.progress-text {
+		font-size: 20rpx;
+		color: #909399;
+		margin-left: 12rpx;
+		min-width: 50rpx;
+		text-align: right;
+	}
+	
+	/* 鍗＄墖搴曢儴 */
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		padding: 12rpx 16rpx;
+		border-top: 1rpx solid #f0f0f0;
+		background: #fafafa;
+	}
+	
+	.card-footer-done {
+		background: #f0fff4;
+	}
+	
+	.action-text {
+		font-size: 24rpx;
+		color: #667eea;
+		margin-right: 6rpx;
+		font-weight: 500;
+	}
+	
+	.done-text {
+		font-size: 24rpx;
+		color: #28a745;
+		margin-right: 6rpx;
+	}
+	
+	/* 绌虹姸鎬� */
+	.empty-state {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 60rpx 0;
+	}
+	
+	.empty-text {
+		font-size: 26rpx;
+		color: #909399;
+		margin-top: 20rpx;
+	}
+	
+	/* 缁熻鏍� */
+	.stats-bar {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		background: #ffffff;
+		padding: 16rpx 0;
+		box-shadow: 0 -2rpx 12rpx rgba(0, 0, 0, 0.06);
+	}
+	
+	.stats-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		flex: 1;
+	}
+	
+	.stats-value {
+		font-size: 32rpx;
+		color: #303133;
+		font-weight: 600;
+	}
+	
+	.stats-label {
+		font-size: 20rpx;
+		color: #909399;
+		margin-top: 4rpx;
+	}
+	
+	.stats-divider {
+		width: 1rpx;
+		height: 50rpx;
+		background: #e8e8e8;
 	}
 </style>
diff --git a/pages/order/orderList.vue b/pages/order/orderList.vue
index d123abf..18bbf20 100644
--- a/pages/order/orderList.vue
+++ b/pages/order/orderList.vue
@@ -1,23 +1,55 @@
 <template>
-	<view>
+	<view class="page-container">
 		<!-- 鎼滅储妗� -->
 		<view class="search-bar">
-			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
-		</view>		
-		<view>
-			<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
-				<view class="tag">
-					<view style="display: flex;">
-						<view class="wms-tag" :style="baColor" >鍗曟嵁</view>
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#F5F5F5" @confirm="search" @cancel="onCancelSearch" />
+		</view>
+		
+		<!-- 璁㈠崟鍒楄〃 -->
+		<view class="order-list">
+			<view class="order-card" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+				<!-- 鍗＄墖澶撮儴 -->
+				<view class="card-header">
+					<view class="order-badge" :class="getSettleClass(item.settle)">
+						<text class="badge-text">{{item.settle$ || '鏈煡'}}</text>
+					</view>
+					<view class="order-no">
+						<text class="order-no-label">鍗曟嵁鍙�</text>
+						<text class="order-no-value">{{item.orderNo}}</text>
 					</view>
 				</view>
-				<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
-				<view class="tag-item">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
-				<view class="tag-item">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
-				<view class="tag-item">浠撳簱锛� {{item.itemName}}</view>
+				
+				<!-- 鍗＄墖鍐呭 -->
+				<view class="card-body">
+					<view class="info-row">
+						<view class="info-item">
+							<text class="info-label">鍗曟嵁绫诲瀷</text>
+							<text class="info-value">{{item.docType$ || '-'}}</text>
+						</view>
+						<view class="info-item">
+							<text class="info-label">浠撳簱</text>
+							<text class="info-value">{{item.itemName || '-'}}</text>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 鍗＄墖搴曢儴 -->
+				<view class="card-footer">
+					<text class="view-detail">鏌ョ湅璇︽儏</text>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
+				</view>
 			</view>
 		</view>
-		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
+		
+		<!-- 绌虹姸鎬� -->
+		<view class="empty-state" v-if="matList.length === 0 && !loading">
+			<uni-icons type="search" size="60" color="#CCCCCC"></uni-icons>
+			<text class="empty-text">鏆傛棤璁㈠崟鏁版嵁</text>
+			<text class="empty-hint">涓嬫媺鍒锋柊璇曡瘯</text>
+		</view>
+		
+		<!-- 鍔犺浇鏇村 -->
+		<uni-load-more v-show="matList.length !== 0" :status="status" :icon-size="16" :content-text="contentText" />
 	</view>
 </template>
 
@@ -28,11 +60,8 @@
 				tagList: [],
 				matList: [],
 				condition: '',
-				reload: false,
-				curr:1,
-				tag: '鍒嗙被',
-				baColor: "background-color: #0081ff;",
-				desc: '鍟嗗搧缂栧彿:',
+				loading: false,
+				curr: 1,
 				baseUrl: '',
 				token: '',
 				status: 'more',
@@ -43,168 +72,165 @@
 				},
 				// 褰撳墠tagId
 				tagIdNow: 1,
-				
 			}
 		},
+		// 涓嬫媺鍒锋柊
+		onPullDownRefresh() {
+			this.refreshData();
+		},
+		// 涓婃媺鍔犺浇鏇村
 		onReachBottom() {
-			this.status = 'more';
-			this.showMat(this.tagIdNow);
+			if (this.status !== 'noMore') {
+				this.status = 'loading';
+				this.loadMoreData();
+			}
 		},
 		onLoad() {
-			// 娌″暐鐢ㄤ簡
 			let that = this
-			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
 			const eventChannel = this.getOpenerEventChannel();
-			
-			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('commonUrl', function(data) {
-				that.commonUrl = data.commonUrl
-			})
+			if (eventChannel) {
+				eventChannel.on('commonUrl', function(data) {
+					that.commonUrl = data.commonUrl
+				})
+			}
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			this.showMat(1)
+			// 姣忔杩涘叆椤甸潰閲嶆柊鍔犺浇
+			this.refreshData();
 		},
 		methods: {
-			search() {
-				let that = this
-				uni.request({
-				    url: that.baseUrl + '/order/search/pda/auth',
-				    data: {
-						condition: that.condition
-				    },
-					method:"GET",
-				    header: {
-						'token':uni.getStorageSync('token'),
-				    },
-					success(result) {
-						console.log(result);
-						var res = result.data
-						if (res.code === 200 ) {
-							that.matList = res.data
-							// that.save()
-						} else if (res.code == 403) {
-							uni.showToast({title: res.msg, icon: "none", position: 'top'})
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
-							}, 1000);
-						} else {
-							uni.showToast({title: res.msg, icon: "none",position: 'top'})
-						}
-					}
-				});
+			// 鍒锋柊鏁版嵁
+			refreshData() {
+				this.curr = 1;
+				this.matList = [];
+				this.status = 'more';
+				this.loading = true;
+				this.fetchOrderList(true);
 			},
-			showTag(parentId) {
-				let that = this
+			// 鍔犺浇鏇村鏁版嵁
+			loadMoreData() {
+				this.fetchOrderList(false);
+			},
+			// 鑾峰彇璁㈠崟鍒楄〃
+			fetchOrderList(isRefresh) {
+				let that = this;
 				uni.request({
-				    url: that.baseUrl + '/tag/list/pda/auth',
-					header: {
-						'token':uni.getStorageSync('token'),
+					url: that.baseUrl + '/order/pakin/order/list/pda/page/auth',
+					data: {
+						curr: that.curr,
+						limit: 20,
+						tagId: that.tagIdNow
 					},
-				    data: {
-						limit: 100000,
-						parentId: parentId
-				    },
+					method: "GET",
 					header: {
-						'token':uni.getStorageSync('token'),
+						'token': uni.getStorageSync('token'),
 					},
 					success(result) {
-						that.tagList = null
-						that.matList = []
-						var res = result.data
+						var res = result.data;
 						if (res.code === 200) {
-							if (res.data != null && res.data.length > 0) {
-								that.tagList = res.data
+							let records = res.data.records || [];
+							if (records.length > 0) {
+								if (isRefresh) {
+									that.matList = records;
+								} else {
+									that.matList = that.matList.concat(records);
+								}
+								that.curr = that.curr + 1;
+								that.status = 'more';
 							} else {
-								that.showMat(parentId)
+								that.status = 'noMore';
 							}
-							that.baColor = "background-color: #0081ff;"
-						} else if (res.code === 403 ) {
-							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+						} else if (res.code === 403) {
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
+								uni.reLaunch({ url: '../login/login' });
 							}, 1000);
 						} else {
-							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 						}
+					},
+					fail(err) {
+						uni.showToast({ title: '缃戠粶璇锋眰澶辫触', icon: "none", position: 'top' });
+					},
+					complete() {
+						that.loading = false;
+						uni.stopPullDownRefresh();
 					}
 				});
 			},
-			showMat(tagId) {
-				let that = this				
-				// wms绔� 琛ユ帴鍙�
-				// @RequestMapping(value = "/mat/list/pda/page/auth")
-				// @ManagerAuth
-				// public R pdaPageList(@RequestParam(required = true)Long tagId,
-				// 					 @RequestParam(defaultValue = "1")Integer curr,
-				// 					 @RequestParam(defaultValue = "10")Integer limit){
-				// 	EntityWrapper<Mat> wrapper = new EntityWrapper<>();
-				// 	wrapper.eq("tag_id", tagId);
-				// 	wrapper.orderBy("create_time", false);
-				// 	return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
-				// }
+			// 鎼滅储
+			search() {
+				if (!this.condition.trim()) {
+					this.refreshData();
+					return;
+				}
+				let that = this;
+				that.loading = true;
 				uni.request({
-				    url: that.baseUrl + '/order/list/pda/page/auth',
-				    data: {
-						curr:that.curr,
-						limit: 100,
-						tagId: tagId
-				    },
-					method:"GET",
-				    header: {
-						'token':uni.getStorageSync('token'),
-				    },
+					url: that.baseUrl + '/order/search/pda/auth',
+					data: {
+						condition: that.condition
+					},
+					method: "GET",
+					header: {
+						'token': uni.getStorageSync('token'),
+					},
 					success(result) {
-						that.tagList = null
-						var res = result.data
+						var res = result.data;
 						if (res.code === 200) {
-							if (res.data.records != null && res.data.records.length > 0) {
-								let list = res.data.records
-								that.matList = that.reload ? list : that.matList.concat(list);
-								that.curr = that.curr + 1
-							}
-							if (res.data.records.length == 0) {
-								that.status = 'noMore'
-							}
-							that.baColor = "background-color: #1cbbb4;"
-						} else if (res.code === 403 ) {
-							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							that.matList = res.data || [];
+							that.status = 'noMore';
+						} else if (res.code === 403) {
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
+								uni.reLaunch({ url: '../login/login' });
 							}, 1000);
 						} else {
-							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 						}
-						
+					},
+					fail() {
+						uni.showToast({ title: '鎼滅储璇锋眰澶辫触', icon: "none", position: 'top' });
+					},
+					complete() {
+						that.loading = false;
 					}
 				});
 			},
+			// 鍙栨秷鎼滅储
+			onCancelSearch() {
+				this.condition = '';
+				this.refreshData();
+			},
+			// 鏍规嵁鐘舵�佽繑鍥炴牱寮忕被鍚�
+			getSettleClass(settle) {
+				// settle: 1-寰呭鐞�, 2-澶勭悊涓�, 3-宸插畬鎴�, 4-宸插彇娑� (鏍规嵁瀹為檯鎯呭喌璋冩暣)
+				const classMap = {
+					1: 'badge-pending',
+					2: 'badge-processing',
+					3: 'badge-completed',
+					4: 'badge-cancelled'
+				};
+				return classMap[settle] || 'badge-default';
+			},
+			// 璺宠浆鍒拌鍗曡鎯�
 			toPrint(item) {
-				let that = this
+				let that = this;
 				uni.navigateTo({
 					url: "../order/orderDetlList",
 					success: function(res) {
-						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 						res.eventChannel.emit('data', {
 							data: item
-						})
+						});
 					},
 					events: {
-						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 						acceptDataFromOpenedPage: function(data) {
-							that.matnr = data.data
-							that.findMat(that.matnr)
+							that.matnr = data.data;
+							that.findMat(that.matnr);
 						},
 					},
-				
-				
 				});
 			}
 		}
@@ -213,34 +239,155 @@
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
-	.tag-list {
-		width: 94%;
-		min-height: 160rpx;
-		margin: 10px auto;
-		background-color: #FFF;
-		border-radius: 5px;
-		box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+	
+	.page-container {
+		min-height: 100vh;
+		background: linear-gradient(135deg, #f5f7fa 0%, #e4e8eb 100%);
+		padding-bottom: 20rpx;
 	}
-	.tag {
+	
+	.search-bar {
+		padding: 0rpx 14rpx;
+		background: #ffffff;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+	}
+	
+	.order-list {
+		padding: 0 24rpx;
+	}
+	
+	.order-card {
+		background: #ffffff;
+		border-radius: 16rpx;
+		margin-top: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+		overflow: hidden;
+		transition: transform 0.2s ease, box-shadow 0.2s ease;
+	}
+	
+	.order-card:active {
+		transform: scale(0.98);
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.12);
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		padding: 24rpx 28rpx;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+	}
+	
+	.order-badge {
+		padding: 6rpx 16rpx;
+		border-radius: 20rpx;
+		margin-right: 20rpx;
+	}
+	
+	.badge-text {
+		font-size: 22rpx;
+		font-weight: 500;
+		color: #ffffff;
+	}
+	
+	/* 鐘舵�佸窘绔犻鑹� */
+	.badge-pending {
+		background: rgba(255, 255, 255, 0.3);
+	}
+	
+	.badge-processing {
+		background: #ffc107;
+	}
+	
+	.badge-completed {
+		background: #28a745;
+	}
+	
+	.badge-cancelled {
+		background: #dc3545;
+	}
+	
+	.badge-default {
+		background: rgba(255, 255, 255, 0.25);
+	}
+	
+	.order-no {
+		flex: 1;
+	}
+	
+	.order-no-label {
+		font-size: 22rpx;
+		color: rgba(255, 255, 255, 0.7);
+		display: block;
+	}
+	
+	.order-no-value {
+		font-size: 28rpx;
+		color: #ffffff;
+		font-weight: 600;
+		display: block;
+		margin-top: 4rpx;
+	}
+	
+	.card-body {
+		padding: 24rpx 28rpx;
+	}
+	
+	.info-row {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	
+	.info-item {
+		width: 50%;
+		margin-bottom: 16rpx;
+	}
+	
+	.info-label {
+		font-size: 24rpx;
+		color: #909399;
+		display: block;
+	}
+	
+	.info-value {
+		font-size: 28rpx;
+		color: #303133;
+		font-weight: 500;
+		display: block;
+		margin-top: 6rpx;
+	}
+	
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		padding: 20rpx 28rpx;
+		border-top: 1rpx solid #f0f0f0;
+	}
+	
+	.view-detail {
+		font-size: 26rpx;
+		color: #909399;
+		margin-right: 8rpx;
+	}
+	
+	/* 绌虹姸鎬� */
+	.empty-state {
 		display: flex;
 		flex-direction: column;
-		min-height: 80rpx;
-		border-bottom: 1px solid #e2e2e2;
+		align-items: center;
+		justify-content: center;
+		padding: 120rpx 0;
 	}
-	.wms-tag {
-		min-width: 60rpx;
-		margin-left: 50rpx;
+	
+	.empty-text {
+		font-size: 30rpx;
+		color: #909399;
 		margin-top: 30rpx;
-		color: #FFF;
-		font-size: 14px;
-		padding: 4rpx 12rpx;
 	}
-	.tag-item {
-		width: 100%;
-		min-height: 60rpx;
-		line-height: 2;
-		padding-left: 50rpx;
-		color: #606266;
-		font-size: 14px;
+	
+	.empty-hint {
+		font-size: 24rpx;
+		color: #c0c4cc;
+		margin-top: 12rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/order/orderPakin2.vue b/pages/order/orderPakin2.vue
index 2c5705e..7b950ef 100644
--- a/pages/order/orderPakin2.vue
+++ b/pages/order/orderPakin2.vue
@@ -1,147 +1,187 @@
 <template>
-	<view>
-		<view class="code">
-			<view class="item">
-				<view class="code-decs">璁㈠崟鍙�:</view>
-				<view style="flex: 1;">
-					<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus">
+	<view class="page-container">
+		<!-- 椤堕儴鍥哄畾鍖哄煙 -->
+		<view class="form-section">
+			<!-- 璁㈠崟鍙� -->
+			<view class="form-item">
+				<view class="form-label">
+					<uni-icons type="staff" size="18" color="#667eea"></uni-icons>
+					<text class="label-text">璁㈠崟鍙�</text>
+				</view>
+				<view class="form-input-wrap">
+					<input class="form-input" type="text" placeholder="鎵爜 / 杈撳叆璁㈠崟鍙�" v-model="orderNo" 
+						:focus="orderNoFocus" disabled />
+				</view>
+			</view>
+			
+			<!-- 鎵樼洏鐮� -->
+			<view class="form-item">
+				<view class="form-label">
+					<uni-icons type="scan" size="18" color="#667eea"></uni-icons>
+					<text class="label-text">鎵樼洏鐮�</text>
+				</view>
+				<view class="form-input-wrap">
+					<input class="form-input" type="text" placeholder="鎵爜 / 杈撳叆鎵樼洏鐮�" v-model="barcode" 
+						:focus="barcodeFocus" @input="barcodeInput()" />
+					<uni-icons v-if="barcode" type="clear" size="20" color="#c0c4cc" @click="clearBarcode"></uni-icons>
+				</view>
+			</view>
+			
+			<!-- 鐗╂枡鐮� -->
+			<view class="form-item">
+				<view class="form-label">
+					<uni-icons type="list" size="18" color="#667eea"></uni-icons>
+					<text class="label-text">鐗╂枡鐮�</text>
+				</view>
+				<view class="form-input-wrap">
+					<input class="form-input" type="text" placeholder="鎵爜澶嶆牳鐗╂枡" v-model="matnr" 
+						:focus="matFocus" @input="findMat()" />
+				</view>
+			</view>
+		</view>
+		
+		<!-- 鍟嗗搧鍒楄〃鏍囬 -->
+		<view class="list-header">
+			<view class="header-left">
+				<text class="header-title">鍟嗗搧鍒楄〃</text>
+				<view class="count-badge" v-if="dataList.length > 0">
+					<text class="count-text">{{dataList.length}}</text>
+				</view>
+			</view>
+			<view class="header-right">
+				<text class="review-status">宸插鏍�: {{reviewedCount}} / {{dataList.length}}</text>
+			</view>
+		</view>
+		
+		<!-- 鍟嗗搧鍒楄〃 -->
+		<view class="list-container">
+			<view class="mat-card" v-for="(item, i) in dataList" :key="i">
+				<!-- 鍗＄墖澶撮儴 -->
+				<view class="card-top">
+					<view class="card-index">{{i + 1}}</view>
+					<view class="mat-code-wrap">
+						<text class="mat-code">{{item.matnr}}</text>
+					</view>
+					<view class="review-badge" :class="item.review === '宸插鏍�' ? 'reviewed' : 'unreviewed'">
+						<text class="badge-text">{{item.review}}</text>
+					</view>
 				</view>
 				
-			</view>
-			<view class="item">
-				<view class="code-decs">鎵樼洏鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
-					@input="barcodeInput()">
-			</view>
-			<view class="item">
-				<view class="code-decs">鐗╂枡鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
-				<!-- <view class="item-right">
-					<button></button>
-					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
-					<uni-icons type="right" color="#c1c1c1"></uni-icons>
-				</view> -->
-			</view>
-		</view>
-		<view class="mat-list-title">
-			鍟嗗搧鍒楄〃
-		</view>
-		<scroll-view>
-			<view class="list" v-for="(item,i) in dataList" :key="i">
-				<view class="list-left">
-					<view class="list-left-item">
-						<view class="desc">No锛�</view>
-						<view class="left-item">{{i + 1}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">缂栫爜锛�</view>
-						<view class="left-item">
-							<uni-tag :text="item.matnr" type="primary"></uni-tag>
+				<!-- 鍗＄墖鍐呭 -->
+				<view class="card-content">
+					<view class="info-row">
+						<view class="info-col">
+							<text class="info-label">鍝佸悕</text>
+							<text class="info-value">{{item.maktx || '-'}}</text>
 						</view>
 					</view>
-					<view class="list-left-item">
-						<view class="desc">鍝佸悕锛�</view>
-						<view class="left-item">{{item.maktx}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">瑙勬牸锛�</view>
-						<view class="left-item">{{item.specs}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">鎵瑰彿锛�</view>
-						<view class="left-item">
-							<uni-tag :text="item.batch" type="warning"></uni-tag>
+					<view class="info-row">
+						<view class="info-col half">
+							<text class="info-label">瑙勬牸</text>
+							<text class="info-value">{{item.specs || '-'}}</text>
+						</view>
+						<view class="info-col half">
+							<text class="info-label">鎵瑰彿</text>
+							<text class="info-value highlight">{{item.batch || '-'}}</text>
 						</view>
 					</view>
-					<!-- <view class="list-left-item">
-						<view class="desc">閲嶉噺锛�</view>
-						<view class="left-item">
-							<uni-tag :text="item.weight" type="warning"></uni-tag>
+					<view class="info-row">
+						<view class="info-col half">
+							<text class="info-label">鏁伴噺</text>
+							<text class="info-value qty">{{item.anfme}}</text>
 						</view>
-					</view> -->
-					<view class="list-left-item">
-						<view class="desc">鏁伴噺锛�</view>
-						<view class="left-item">{{item.anfme}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">鐘舵�侊細</view>
-						<view class="left-item">{{item.review}}</view>
 					</view>
 				</view>
-				<view class="list-right">
-					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
-					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+				
+				<!-- 鍗＄墖鎿嶄綔 -->
+				<view class="card-actions">
+					<view class="action-btn edit-btn" @click="revise(item, i)">
+						<uni-icons type="compose" size="18" color="#667eea"></uni-icons>
+						<text class="action-text">淇敼</text>
+					</view>
+					<view class="action-btn delete-btn" @click="remove(item, i, 'warn')">
+						<uni-icons type="trash" size="18" color="#f56c6c"></uni-icons>
+						<text class="action-text delete-text">绉婚櫎</text>
+					</view>
 				</view>
 			</view>
-		</scroll-view>
+			
+			<!-- 绌虹姸鎬� -->
+			<view class="empty-state" v-if="dataList.length === 0">
+				<uni-icons type="cart" size="60" color="#CCCCCC"></uni-icons>
+				<text class="empty-text">鏆傛棤鍟嗗搧</text>
+				<text class="empty-hint">璇蜂粠璁㈠崟鏄庣粏閫夋嫨鍟嗗搧</text>
+			</view>
+			
+			<!-- 搴曢儴鍗犱綅 -->
+			<view class="bottom-placeholder"></view>
+		</view>
+		
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
-		<view class="buttom">
-			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn')" :disabled="isDisabled">缁勬墭</button>
+		<view class="bottom-bar">
+			<view class="btn-reset" @click="reset('warn')">
+				<uni-icons type="refresh" size="18" color="#909399"></uni-icons>
+				<text class="btn-text">閲嶇疆</text>
+			</view>
+			<view class="btn-submit" :class="{'btn-disabled': isDisabled || dataList.length === 0}" 
+				@click="combConfirm('warn')">
+				<uni-icons type="checkbox" size="18" color="#ffffff"></uni-icons>
+				<text class="btn-text">纭缁勬墭</text>
+			</view>
 		</view>
-		<!-- 寮圭獥 -->
+		
+		<!-- 寮圭獥鍖哄煙 -->
 		<!-- 淇敼鏁伴噺 -->
-		<view>
-			<uni-popup ref="revise" type="dialog">
-				<view class="popup">
-					<!-- 鏍囬 -->
-					<view class="title">淇敼</view>
-					<view class="popup-item">
-						<view class="popup-item-left">缂栫爜:</view>
-						<view class="popup-item-right">
-							<input type="text" v-model="matnr" disabled="true"
-								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
-						</view>
+		<uni-popup ref="revise" type="dialog">
+			<view class="popup-card">
+				<view class="popup-header">
+					<text class="popup-title">淇敼淇℃伅</text>
+				</view>
+				<view class="popup-body">
+					<view class="popup-row">
+						<text class="popup-label">缂栫爜</text>
+						<view class="popup-value disabled">{{matnr}}</view>
 					</view>
-					<view class="popup-item">
-						<view class="popup-item-left">鎵瑰彿:</view>
-						<view class="popup-item-right"><input type="text" v-model="batch"></view>
+					<view class="popup-row">
+						<text class="popup-label">鎵瑰彿</text>
+						<input class="popup-value input" type="text" v-model="batch" placeholder="杈撳叆鎵瑰彿" />
 					</view>
-					<!-- <view class="popup-item">
-						<view class="popup-item-left">閲嶉噺:</view>
-						<view class="popup-item-right"><input type="text" v-model="weight"></view>
-					</view> -->
-					<view class="popup-item">
-						<view class="popup-item-left">鏁伴噺:</view>
-						<view class="popup-item-right" style="border: none;justify-content: center;">
+					<view class="popup-row">
+						<text class="popup-label">鏁伴噺</text>
+						<view class="popup-value number">
 							<uni-number-box :value="count" :step='0.001' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
-					<view class="btn">
-						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
-						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
-					</view>
 				</view>
-			</uni-popup>
-		</view>
+				<view class="popup-footer">
+					<view class="popup-btn cancel" @click="reviseClose">鍙栨秷</view>
+					<view class="popup-btn confirm" @click="reviseConfirm()">纭</view>
+				</view>
+			</view>
+		</uni-popup>
+		
 		<!-- 绉婚櫎纭 -->
-		<view>
-			<!-- 鎻愮ず绐楃ず渚� -->
-			<uni-popup ref="alertDialog" type="dialog">
-				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
-					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
-		<view>
-			<!-- 鎻愮ず淇℃伅寮圭獥 -->
-			<uni-popup ref="message" type="message">
-				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
-			</uni-popup>
-		</view>
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+				@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+		</uni-popup>
+		
+		<!-- 鎻愮ず淇℃伅寮圭獥 -->
+		<uni-popup ref="message" type="message">
+			<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+		</uni-popup>
+		
 		<!-- 纭缁勬墭 -->
-		<view>
-			<uni-popup ref="combConfirm" type="dialog">
-				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
-					@confirm="comb" @close="combClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
+		<uni-popup ref="combConfirm" type="dialog">
+			<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+				@confirm="comb" @close="combClose"></uni-popup-dialog>
+		</uni-popup>
+		
 		<!-- 纭閲嶇疆 -->
-		<view>
-			<uni-popup ref="resetConfirm" type="dialog">
-				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
-					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
+		<uni-popup ref="resetConfirm" type="dialog">
+			<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+				@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
@@ -169,17 +209,24 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
-				isDisabled:false
+				isDisabled: false
+			}
+		},
+		computed: {
+			// 宸插鏍告暟閲�
+			reviewedCount() {
+				return this.dataList.filter(item => item.review === '宸插鏍�').length;
 			}
 		},
 		onLoad() {
-			let that = this
+			let that = this;
 			const eventChannel = this.getOpenerEventChannel();
-			
-			eventChannel.on('orderItem', function(data) {				
-				that.orderNo = data.item.orderNo
-				that.checkMat(data.item)
-			});
+			if (eventChannel) {
+				eventChannel.on('orderItem', function(data) {
+					that.orderNo = data.item.orderNo;
+					that.checkMat(data.item);
+				});
+			}
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
@@ -187,11 +234,18 @@
 		},
 		methods: {
 			messageToggle(type) {
-				this.msgType1 = type
-				this.$refs.message.open()
+				this.msgType1 = type;
+				this.$refs.message.open();
+			},
+			clearBarcode() {
+				this.barcode = '';
+				this.barcodeFocus = false;
+				setTimeout(() => {
+					this.barcodeFocus = true;
+				}, 100);
 			},
 			clearOrderNo() {
-				this.orderNo = ''
+				this.orderNo = '';
 				let that = this;
 				that.orderNoFocus = false;
 				setTimeout(() => {
@@ -200,21 +254,17 @@
 				}, 100);
 			},
 			orderNoInput() {
-				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
-					var len = this.orderNo.length
-					this.barcodeFocuss()
-				}, 200)
+					var len = this.orderNo.length;
+					this.barcodeFocuss();
+				}, 200);
 			},
-			// barcode input 浜嬩欢
 			barcodeInput() {
-				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
-					var len = this.barcode.length					
-					this.focuss()
-				}, 200)
+					var len = this.barcode.length;
+					this.focuss();
+				}, 200);
 			},
-			// 鎵樼洏鐮佹湁璇噸缃�
 			barcodeFocuss() {
 				let that = this;
 				that.barcodeFocus = false;
@@ -223,7 +273,6 @@
 					that.barcodeFocus = true;
 				}, 100);
 			},
-			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
 				this.focus = false;
 				setTimeout(() => {
@@ -231,213 +280,150 @@
 					this.matFocus = true;
 				}, 100);
 			},
-			// 鎼滅储鐗╂枡
+			// 鎼滅储鐗╂枡 - 鎵爜澶嶆牳
 			findMat() {
-				let that = this
-				let m = that.matnr.split(";")
-				let matnr1 = m[0].slice(3)
-				for(var i = 0;i<that.dataList.length;i++){
-					if(that.dataList[i].matnr === matnr1){
-						that.dataList[i].review = "宸插鏍�"
+				let that = this;
+				let m = that.matnr.split(";");
+				let matnr1 = m[0].slice(3);
+				let found = false;
+				for (var i = 0; i < that.dataList.length; i++) {
+					if (that.dataList[i].matnr === matnr1) {
+						that.dataList[i].review = "宸插鏍�";
+						found = true;
 					}
-					 
+				}
+				if (found) {
+					that.messageText = "澶嶆牳鎴愬姛";
+					that.messageToggle('success');
 				}
 				setTimeout(() => {
-					this.matnr = '';					
+					this.matnr = '';
 				}, 100);
-				// uni.request({
-				// 	url: that.baseUrl + '/mat/auth',
-				// 	data: {
-				// 		matnr: matnr1
-				// 	},
-				// 	header: {
-				// 		'token': uni.getStorageSync('token')
-				// 	},
-				// 	success(result) {
-				// 		result = result.data
-				// 		if (result.code === 200 && result.data) {
-				// 			that.matData = result.data
-				// 			that.matnr = ''
-				// 			that.matData['batch'] = ''
-				// 			uni.navigateTo({
-				// 				url: "../mat/matSelected",
-				// 				// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
-				// 				success: function(res) {
-				// 					res.eventChannel.emit('mat', {
-				// 						data: result.data
-				// 					})
-				// 				},
-				// 				// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-				// 				events: {
-				// 					matList: function(data) {
-				// 						that.checkMat(data.data)
-				// 						that.focuss()
-				// 					},
-				// 				},
-				// 			});
-				// 		} else if (result.code == 403) {
-				// 			uni.showToast({
-				// 				title: result.msg,
-				// 				icon: "none",
-				// 				position: 'top'
-				// 			})
-				// 			setTimeout(() => {
-				// 				uni.reLaunch({
-				// 					url: '../login/login'
-				// 				});
-				// 			}, 1000);
-				// 		} else {
-				// 			uni.showToast({
-				// 				title: result.msg,
-				// 				icon: "none",
-				// 				position: 'top'
-				// 			})
-				// 		}
-
-				// 	}
-				// });
-
 			},
 			selectMat() {
-				let that = this
+				let that = this;
 				uni.navigateTo({
 					url: "../mat/matQuery",
 					success: function(res) {
-						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 						res.eventChannel.emit('commonUrl', {
 							commonUrl: ''
-						})
+						});
 					},
 					events: {
-						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 						acceptDataFromOpenedPage: function(data) {
-							that.matnr = data.data
-							that.findMat(that.matnr)
+							that.matnr = data.data;
+							that.findMat(that.matnr);
 						},
 					},
-
-
 				});
-				that.matnr = ''
+				that.matnr = '';
 			},
 			checkMat(mat) {
-				mat.review = "鏈鏍�"
-				mat.anfme = mat.enableQty
-				var len = this.dataList.length
-				var add = true ,sameItem = false
+				mat.review = "鏈鏍�";
+				mat.anfme = mat.enableQty;
+				var len = this.dataList.length;
+				var add = true, sameItem = false;
 				for (var i = 0; i < len; i++) {
 					if (mat.matnr == this.dataList[i].matnr) {
 						for (var j = 0; j < len; j++) {
 							if (mat.batch == this.dataList[j].batch) {
-								sameItem = true
+								sameItem = true;
 							}
 						}
-						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
 						if (mat.batch != this.dataList[i].batch) {
-							this.$forceUpdate() // 寮哄埗鍒锋柊
+							this.$forceUpdate();
 							if (sameItem) {
-								add = false
+								add = false;
 							} else {
-								add = true
+								add = true;
 							}
-							
 						} else {
-							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
-							this.dataList[i].anfme += mat.anfme
-							this.$forceUpdate() // 寮哄埗鍒锋柊
-							add = false
+							this.dataList[i].anfme += mat.anfme;
+							this.$forceUpdate();
+							add = false;
 						}
 					}
 				}
 				if (add) {
-					this.dataList.unshift(mat)
+					this.dataList.unshift(mat);
 				}
 			},
-			// 淇敼鎵瑰彿
+			// 淇敼
 			revise(item, i) {
-				this.matnr = this.dataList[i].matnr
-				this.count = this.dataList[i].anfme
-				this.batch = this.dataList[i].batch
-				this.weight = this.dataList[i].weight
-				this.rowNum = i
-				this.eject()
+				this.matnr = this.dataList[i].matnr;
+				this.count = this.dataList[i].anfme;
+				this.batch = this.dataList[i].batch;
+				this.weight = this.dataList[i].weight;
+				this.rowNum = i;
+				this.eject();
 			},
 			eject(type) {
-				this.type = type
-				this.$refs.revise.open(type)
+				this.type = type;
+				this.$refs.revise.open(type);
 			},
 			// 鍒楄〃绉婚櫎鎸夐挳
 			remove(item, i, type) {
-				this.removeNum  = i
-				this.msgType = type
-				this.title = '璀﹀憡'
-				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
-				this.$refs.alertDialog.open(i)
+				this.removeNum = i;
+				this.msgType = type;
+				this.title = '纭绉婚櫎';
+				this.content = '鏄惁绉婚櫎璇ュ晢鍝侊紵';
+				this.$refs.alertDialog.open(i);
 			},
 			// 纭绉婚櫎
 			removeConfirm() {
-				this.messageText = "绉婚櫎鎴愬姛"
-				this.messageToggle('success')
-				this.dataList.splice(this.removeNum, 1)
+				this.messageText = "绉婚櫎鎴愬姛";
+				this.messageToggle('success');
+				this.dataList.splice(this.removeNum, 1);
 			},
 			// 鍙栨秷绉婚櫎
 			removeClose() {
-				this.$refs.alertDialog.close()
+				this.$refs.alertDialog.close();
 			},
 			reviseConfirm() {
-				this.dataList[this.rowNum].anfme = this.count
-				this.dataList[this.rowNum].batch = this.batch
-				this.dataList[this.rowNum].weight = this.weight
-				this.matnr = ''
-				this.messageText = "淇敼鎴愬姛"
-				this.messageToggle('success')
-				this.$refs.revise.close()
+				this.dataList[this.rowNum].anfme = this.count;
+				this.dataList[this.rowNum].batch = this.batch;
+				this.dataList[this.rowNum].weight = this.weight;
+				this.matnr = '';
+				this.messageText = "淇敼鎴愬姛";
+				this.messageToggle('success');
+				this.$refs.revise.close();
 			},
 			reviseClose() {
-				this.$refs.revise.close()
+				this.$refs.revise.close();
 			},
 			changeValue(value) {
-				this.count = value
+				this.count = value;
 			},
 			combConfirm(type) {
-				this.msgType = type
-				this.title = '璀﹀憡'
-				this.content = '鏄惁鐜板湪缁勬墭!'
-				this.$refs.combConfirm.open()
+				if (this.isDisabled || this.dataList.length === 0) return;
+				this.msgType = type;
+				this.title = '纭缁勬墭';
+				this.content = '纭灏嗗晢鍝佺粍鎵樺叆搴擄紵';
+				this.$refs.combConfirm.open();
 			},
 			combClose() {
-				this.$refs.combConfirm.close()
+				this.$refs.combConfirm.close();
 			},
-			comb() {				
+			comb() {
 				let that = this;
-				that.isDisabled = true
+				that.isDisabled = true;
 				if (that.orderNo === '') {
-					this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
-					this.messageToggle('error')
+					this.messageText = "璇疯緭鍏ヨ鍗曞彿";
+					this.messageToggle('error');
+					that.isDisabled = false;
 					return;
 				}
 				if (that.barcode === '') {
-					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
-					this.messageToggle('error')
+					this.messageText = "璇锋壂鎻忔墭鐩樼爜";
+					this.messageToggle('error');
+					that.isDisabled = false;
 					return;
 				}
 				if (that.dataList.length === 0) {
-					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
-					this.messageToggle('error')
+					this.messageText = "璇锋坊鍔犲晢鍝�";
+					this.messageToggle('error');
+					that.isDisabled = false;
 					return;
-				}
-				for (var i = 0; i < that.dataList.length; i++) {
-					if (that.dataList[i].review !== "宸插鏍�" ) {
-						this.messageText = that.dataList[i].matnr + '鏈鏍�'
-						this.messageToggle('error')
-						return;
-					}
-					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
-						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
-						this.messageToggle('error')
-						return;
-					}				
-					
 				}
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
@@ -451,57 +437,58 @@
 						'token': uni.getStorageSync('token')
 					},
 					success(result) {
-						var res = result.data
+						var res = result.data;
 						if (res.code === 200) {
 							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
-							that.messageToggle('success')
+							that.messageText = "缁勬墭鎴愬姛";
+							that.messageToggle('success');
 							const innerAudioContext = uni.createInnerAudioContext();
 							innerAudioContext.src = '/static/music/pakinOk.mp3';
-							innerAudioContext.play()
-						} else if (res.code == 403) {
-							that.messageText = res.msg
-							that.messageToggle('error')
+							innerAudioContext.play();
+							// 杩斿洖涓婁竴椤�
 							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
+								uni.navigateBack();
+							}, 1500);
+						} else if (res.code == 403) {
+							that.messageText = res.msg;
+							that.messageToggle('error');
+							setTimeout(() => {
+								uni.reLaunch({ url: '../login/login' });
 							}, 1000);
 						} else {
-							that.messageText = res.msg
-							that.messageToggle('error')
+							that.messageText = res.msg;
+							that.messageToggle('error');
 						}
 					},
 					fail: () => {
-						that.messageText = "鎺ュ彛瓒呮椂"
-						that.messageToggle('error')
+						that.messageText = "缃戠粶璇锋眰瓒呮椂";
+						that.messageToggle('error');
 					},
 					complete: () => {
-						that.isDisabled = false
+						that.isDisabled = false;
 					}
 				});
 			},
 			reset(type) {
-				this.msgType = type
-				this.title = '璀﹀憡'
-				this.content = '鏄惁閲嶇疆!'
-				this.$refs.resetConfirm.open()
+				this.msgType = type;
+				this.title = '纭閲嶇疆';
+				this.content = '鏄惁娓呯┖鎵�鏈夊晢鍝侊紵';
+				this.$refs.resetConfirm.open();
 			},
 			// 纭閲嶇疆
 			resetConfirm() {
-				this.dataList = []
-				this.messageText = "閲嶇疆瀹屾垚"
-				this.messageToggle('success')
+				this.dataList = [];
+				this.barcode = '';
+				this.messageText = "閲嶇疆瀹屾垚";
+				this.messageToggle('success');
 			},
 			// 鍙栨秷閲嶇疆
-			resetClose() {
-
-			},
+			resetClose() {},
 			// 娓呯┖
 			resst() {
-				this.orderNo = ''
-				this.dataList = []
-				this.barcode = ''
+				this.orderNo = '';
+				this.dataList = [];
+				this.barcode = '';
 				let that = this;
 				that.orderNoFocus = false;
 				setTimeout(() => {
@@ -516,59 +503,416 @@
 <style>
 	@import url('../../static/css/wms.css/wms.css');
 
-	.code {
-		width: 100%;
-		position: fixed;
-		min-height: 200rpx;
-		background-color: #FFF;
-		z-index: 10;
+	page {
+		height: 100%;
+		background: #f5f7fa;
 	}
 
-	.item {
+	.page-container {
+		min-height: 100vh;
+		background: linear-gradient(135deg, #f5f7fa 0%, #e4e8eb 100%);
+		padding-bottom: 110rpx;
+		box-sizing: border-box;
+	}
+
+	/* 琛ㄥ崟鍖哄煙 */
+	.form-section {
+		background: #ffffff;
+		padding: 12rpx 20rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
+	}
+
+	.form-item {
 		display: flex;
 		align-items: center;
-		height: 100rpx;
-		margin-left: 20rpx;
-		border-bottom: 1px solid #DCDFE6;
+		padding: 12rpx 0;
+		border-bottom: 1rpx solid #f0f0f0;
 	}
 
-	.item input {
-		height: 50rpx;
-		line-height: 50rpx;
-		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
-		font-size: 36upx;
-		font-family: PingFang SC;
-		width: 55vw;
-
+	.form-item:last-child {
+		border-bottom: none;
 	}
 
-	.code-decs {
-		width: 20vw;
-		font-size: 18px;
+	.form-label {
+		display: flex;
+		align-items: center;
+		width: 140rpx;
+		flex-shrink: 0;
+	}
+
+	.label-text {
+		font-size: 26rpx;
+		color: #303133;
+		margin-left: 6rpx;
+	}
+
+	.form-input-wrap {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		background: #f5f7fa;
+		border-radius: 6rpx;
+		padding: 0 16rpx;
+		height: 60rpx;
+	}
+
+	.form-input {
+		flex: 1;
+		height: 60rpx;
+		font-size: 26rpx;
 		color: #303133;
 	}
 
-	.item-right {
-		margin-left: auto;
-		margin-right: 20rpx;
+	/* 鍒楄〃澶撮儴 */
+	.list-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 16rpx 20rpx;
+		background: #ffffff;
+		margin-top: 12rpx;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 	}
 
-	.mat-list-title {
-		height: 80rpx;
-		line-height: 80rpx;
-		width: 100%;
-		background-color: white;
+	.header-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.header-title {
+		font-size: 28rpx;
+		color: #303133;
+		font-weight: 600;
+	}
+
+	.count-badge {
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		border-radius: 16rpx;
+		padding: 2rpx 12rpx;
+		margin-left: 12rpx;
+	}
+
+	.count-text {
+		font-size: 20rpx;
+		color: #ffffff;
+		font-weight: 500;
+	}
+
+	.header-right {
+		display: flex;
+		align-items: center;
+	}
+
+	.review-status {
+		font-size: 22rpx;
+		color: #909399;
+	}
+
+	/* 鍟嗗搧鍒楄〃 */
+	.list-container {
+		padding: 0 20rpx;
+	}
+
+	.mat-card {
+		background: #ffffff;
+		border-radius: 12rpx;
+		margin-top: 12rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		overflow: hidden;
+	}
+
+	.card-top {
+		display: flex;
+		align-items: center;
+		padding: 14rpx 16rpx;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+	}
+
+	.card-index {
+		width: 36rpx;
+		height: 36rpx;
+		background: rgba(255, 255, 255, 0.25);
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 22rpx;
+		color: #ffffff;
+		font-weight: 600;
+		margin-right: 12rpx;
+	}
+
+	.mat-code-wrap {
+		flex: 1;
+	}
+
+	.mat-code {
+		font-size: 26rpx;
+		color: #ffffff;
+		font-weight: 600;
+	}
+
+	.review-badge {
+		padding: 4rpx 12rpx;
+		border-radius: 16rpx;
+	}
+
+	.reviewed {
+		background: #28a745;
+	}
+
+	.unreviewed {
+		background: rgba(255, 255, 255, 0.3);
+	}
+
+	.badge-text {
+		font-size: 20rpx;
+		color: #ffffff;
+	}
+
+	/* 鍗＄墖鍐呭 */
+	.card-content {
+		padding: 12rpx 16rpx;
+	}
+
+	.info-row {
+		display: flex;
+		margin-bottom: 8rpx;
+	}
+
+	.info-row:last-child {
+		margin-bottom: 0;
+	}
+
+	.info-col {
+		flex: 1;
+	}
+
+	.info-col.half {
+		width: 50%;
+		flex: none;
+	}
+
+	.info-label {
+		font-size: 20rpx;
+		color: #909399;
+		display: block;
+	}
+
+	.info-value {
+		font-size: 24rpx;
+		color: #303133;
+		display: block;
+		margin-top: 2rpx;
+	}
+
+	.info-value.highlight {
+		color: #667eea;
+		font-weight: 500;
+	}
+
+	.info-value.qty {
+		font-size: 28rpx;
+		color: #303133;
+		font-weight: 600;
+	}
+
+	/* 鍗＄墖鎿嶄綔 */
+	.card-actions {
+		display: flex;
+		border-top: 1rpx solid #f0f0f0;
+	}
+
+	.action-btn {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 14rpx 0;
+	}
+
+	.edit-btn {
+		border-right: 1rpx solid #f0f0f0;
+	}
+
+	.action-text {
+		font-size: 24rpx;
+		color: #667eea;
+		margin-left: 6rpx;
+	}
+
+	.delete-text {
+		color: #f56c6c;
+	}
+
+	/* 绌虹姸鎬� */
+	.empty-state {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 60rpx 0;
+	}
+
+	.empty-text {
+		font-size: 26rpx;
+		color: #909399;
+		margin-top: 16rpx;
+	}
+
+	.empty-hint {
+		font-size: 22rpx;
+		color: #c0c4cc;
+		margin-top: 8rpx;
+	}
+
+	.bottom-placeholder {
+		height: 20rpx;
+	}
+
+	/* 搴曢儴鎿嶄綔鏍� */
+	.bottom-bar {
 		position: fixed;
-		margin-top: 300rpx;
-		z-index: 9;
-		/* border-top: 1px solid #DCDFE6; */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		display: flex;
+		padding: 16rpx 20rpx;
+		background: #ffffff;
+		box-shadow: 0 -2rpx 12rpx rgba(0, 0, 0, 0.06);
+	}
+
+	.btn-reset {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 160rpx;
+		height: 72rpx;
+		background: #f5f7fa;
+		border-radius: 36rpx;
+		margin-right: 16rpx;
+	}
+
+	.btn-reset .btn-text {
+		font-size: 26rpx;
+		color: #909399;
+		margin-left: 6rpx;
+	}
+
+	.btn-submit {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 72rpx;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		border-radius: 36rpx;
+	}
+
+	.btn-submit .btn-text {
+		font-size: 28rpx;
+		color: #ffffff;
+		font-weight: 500;
+		margin-left: 6rpx;
+	}
+
+	.btn-disabled {
+		background: #c0c4cc;
+		opacity: 0.6;
+	}
+
+	/* 寮圭獥鏍峰紡 */
+	.popup-card {
+		width: 600rpx;
+		background: #ffffff;
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+
+	.popup-header {
+		padding: 24rpx;
 		text-align: center;
-		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+		border-bottom: 1rpx solid #f0f0f0;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
 	}
-	.list:first-child {
-		margin-top: 420rpx;
+
+	.popup-title {
+		font-size: 30rpx;
+		color: #ffffff;
+		font-weight: 600;
 	}
-	.list:last-child {
-		margin-bottom: 120rpx;
+
+	.popup-body {
+		padding: 24rpx;
+	}
+
+	.popup-row {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		height: 70rpx;
+	}
+
+	.popup-row:last-child {
+		margin-bottom: 0;
+	}
+
+	.popup-label {
+		width: 80rpx;
+		font-size: 26rpx;
+		color: #606266;
+		flex-shrink: 0;
+	}
+
+	.popup-value {
+		flex: 1;
+		height: 70rpx;
+		background: #f5f7fa;
+		border-radius: 8rpx;
+		padding: 0 16rpx;
+		font-size: 26rpx;
+		color: #303133;
+		display: flex;
+		align-items: center;
+		box-sizing: border-box;
+	}
+
+	.popup-value.disabled {
+		color: #909399;
+		background: #f0f0f0;
+	}
+
+	.popup-value.input {
+		padding: 0 16rpx;
+	}
+
+	.popup-value.number {
+		justify-content: center;
+		background: transparent;
+		padding: 0;
+	}
+
+	.popup-footer {
+		display: flex;
+		border-top: 1rpx solid #f0f0f0;
+	}
+
+	.popup-btn {
+		flex: 1;
+		height: 90rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+	}
+
+	.popup-btn.cancel {
+		color: #909399;
+		border-right: 1rpx solid #f0f0f0;
+	}
+
+	.popup-btn.confirm {
+		color: #667eea;
+		font-weight: 600;
 	}
 </style>
diff --git a/pages/stock/stockQuery.vue b/pages/stock/stockQuery.vue
index 984cd49..96a3c90 100644
--- a/pages/stock/stockQuery.vue
+++ b/pages/stock/stockQuery.vue
@@ -1,87 +1,109 @@
 <template>
-	<view>
-		<!-- 鎼滅储妗� -->
-		<view class="code">
-			<view class="item">
-				<view class="code-decs">搴撲綅鍙�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo">
+	<view class="page-container">
+		<!-- 鎼滅储琛ㄥ崟 -->
+		<view class="form-section">
+			<view class="form-item">
+				<view class="form-label">
+					<uni-icons type="location" size="18" color="#667eea"></uni-icons>
+					<text class="label-text">搴撲綅鍙�</text>
+				</view>
+				<view class="form-input-wrap">
+					<input class="form-input" type="text" placeholder="鎵爜 / 杈撳叆搴撲綅鍙�" v-model="locNo" />
+					<uni-icons v-if="locNo" type="clear" size="18" color="#c0c4cc" @click="locNo=''"></uni-icons>
+				</view>
 			</view>
-			<view class="item">
-				<view class="code-decs">鐗╂枡鍙�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" @input="findMat()">
-				<view class="item-right">
+			<view class="form-item">
+				<view class="form-label">
+					<uni-icons type="list" size="18" color="#667eea"></uni-icons>
+					<text class="label-text">鐗╂枡鍙�</text>
+				</view>
+				<view class="form-input-wrap">
+					<input class="form-input" type="text" placeholder="鎵爜 / 杈撳叆鐗╂枡鍙�" v-model="matnr" @input="findMat()" />
+					<uni-icons v-if="matnr" type="clear" size="18" color="#c0c4cc" @click="matnr=''"></uni-icons>
 				</view>
 			</view>
 		</view>
-		<view class="mat-list-title">
-			鍟嗗搧鍒楄〃
-		</view>
 		
-		
-		<scroll-view>
-			<view class="list" v-for="(item,i) in dataList" :key="i">
-				<view class="list-left">
-					<view class="list-left-item">
-						<view class="desc">No锛�</view>
-						<view class="left-item">{{i + 1}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">搴撲綅锛�</view>
-						<view class="left-item">{{item.locNo}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">缂栫爜锛�</view>
-						<view class="left-item">
-							<uni-tag :text="item.matnr" type="primary"></uni-tag>
-						</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">鍝佸悕锛�</view>
-						<view class="left-item">{{item.maktx}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">瑙勬牸锛�</view>
-						<view class="left-item">{{item.specs}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">鎵瑰彿锛�</view>
-						<view class="left-item">
-							<uni-tag :text="item.batch" type="warning"></uni-tag>
-						</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">鏁伴噺锛�</view>
-						<view class="left-item">{{item.anfme}}</view>
-					</view>
-					<!-- <view class="list-left-item">
-						<view class="desc">搴撲綅鍙凤細</view>
-						<view class="left-item">{{item.locNo}}</view>
-					</view> -->
+		<!-- 鍒楄〃澶撮儴 -->
+		<view class="list-header">
+			<view class="header-left">
+				<text class="header-title">搴撳瓨鍒楄〃</text>
+				<view class="count-badge" v-if="dataList.length > 0">
+					<text class="count-text">{{dataList.length}}</text>
 				</view>
-				<!-- <view class="list-right">
-					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
-					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
-				</view> -->
 			</view>
-		</scroll-view>
-		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
-		<view class="buttom">
-			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="search()">鏌ヨ</button>
 		</view>
-		<view>
-			<!-- 鎻愮ず淇℃伅寮圭獥 -->
-			<uni-popup ref="message" type="message">
-				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
-			</uni-popup>
+		
+		<!-- 搴撳瓨鍒楄〃 -->
+		<view class="list-container">
+			<view class="stock-card" v-for="(item, i) in dataList" :key="i">
+				<view class="card-header">
+					<view class="card-index">{{i + 1}}</view>
+					<view class="loc-info">
+						<text class="loc-no">{{item.locNo}}</text>
+					</view>
+					<view class="qty-badge">
+						<text class="qty-text">{{item.anfme}}</text>
+					</view>
+				</view>
+				<view class="card-body">
+					<view class="info-row">
+						<view class="info-col">
+							<text class="info-label">鐗╂枡缂栫爜</text>
+							<text class="info-value code">{{item.matnr}}</text>
+						</view>
+					</view>
+					<view class="info-row">
+						<view class="info-col">
+							<text class="info-label">鐗╂枡鍚嶇О</text>
+							<text class="info-value">{{item.maktx || '-'}}</text>
+						</view>
+					</view>
+					<view class="info-row">
+						<view class="info-col half">
+							<text class="info-label">瑙勬牸</text>
+							<text class="info-value">{{item.specs || '-'}}</text>
+						</view>
+						<view class="info-col half">
+							<text class="info-label">鎵瑰彿</text>
+							<text class="info-value batch">{{item.batch || '-'}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 绌虹姸鎬� -->
+			<view class="empty-state" v-if="dataList.length === 0 && !loading">
+				<uni-icons type="search" size="50" color="#CCCCCC"></uni-icons>
+				<text class="empty-text">鏆傛棤搴撳瓨鏁版嵁</text>
+				<text class="empty-hint">璇疯緭鍏ユ潯浠跺悗鐐瑰嚮鏌ヨ</text>
+			</view>
+			
+			<view class="bottom-placeholder"></view>
 		</view>
+		
+		<!-- 搴曢儴鎿嶄綔鏍� -->
+		<view class="bottom-bar">
+			<view class="btn-reset" @click="reset('warn')">
+				<uni-icons type="refresh" size="16" color="#909399"></uni-icons>
+				<text class="btn-text">閲嶇疆</text>
+			</view>
+			<view class="btn-submit" @click="search()">
+				<uni-icons type="search" size="16" color="#ffffff"></uni-icons>
+				<text class="btn-text">鏌ヨ</text>
+			</view>
+		</view>
+		
+		<!-- 鎻愮ず淇℃伅寮圭獥 -->
+		<uni-popup ref="message" type="message">
+			<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+		</uni-popup>
+		
 		<!-- 纭閲嶇疆 -->
-		<view>
-			<uni-popup ref="resetConfirm" type="dialog">
-				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
-					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
+		<uni-popup ref="resetConfirm" type="dialog">
+			<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+				@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
@@ -91,9 +113,10 @@
 			return {
 				baseUrl: '',
 				token: '',
-				locNo: null,
-				matnr: null,
+				locNo: '',
+				matnr: '',
 				dataList: [],
+				loading: false,
 				msgType: '',
 				msgType1: '',
 				messageText: '',
@@ -108,128 +131,344 @@
 		methods: {
 			// 鎼滅储鐗╂枡
 			findMat() {
-				let that = this				
-				let m = that.matnr.split(";")	
-				let matnr1 = m[0].slice(3)				
-				setTimeout(() => { 
-					that.matnr = matnr1
+				let that = this;
+				let m = that.matnr.split(";");
+				let matnr1 = m[0].slice(3);
+				setTimeout(() => {
+					that.matnr = matnr1;
 				}, 100);
 			},
 			search() {
-				let that = this
+				let that = this;
+				that.loading = true;
 				uni.request({
 					url: that.baseUrl + '/manLocDetl/list/auth',
-					header:{'token':uni.getStorageSync('token')},
+					header: { 'token': uni.getStorageSync('token') },
 					data: {
 						curr: 1,
 						limit: 100,
 						loc_no: that.locNo,
 						matnr: that.matnr
 					},
-					method:"GET",
+					method: "GET",
 					success(result) {
-						console.log(result)
-						let res = result.data
-						let records = res.data.records
+						let res = result.data;
 						if (res.code == 200) {
-							if (records) {
-								that.dataList = records
-								console.log(that.dataList)
+							let records = res.data.records;
+							if (records && records.length > 0) {
+								that.dataList = records;
 							} else {
+								that.dataList = [];
 								uni.showToast({
-									title: "鏆傛棤鏇村鏁版嵁",
+									title: "鏆傛棤鏁版嵁",
+									icon: "none",
 									position: 'top',
-									duration: 1000
+									duration: 1500
 								});
 							}
 						} else if (res.code == 403) {
-							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
+								uni.reLaunch({ url: '../login/login' });
 							}, 1000);
 						} else {
-							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+							uni.showToast({ title: res.msg, icon: "none", position: 'top' });
 						}
+					},
+					fail() {
+						uni.showToast({ title: '缃戠粶璇锋眰澶辫触', icon: "none", position: 'top' });
+					},
+					complete() {
+						that.loading = false;
 					}
-				})
+				});
 			},
 			reset(type) {
-				this.msgType = type
-				this.title = '璀﹀憡'
-				this.content = '鏄惁閲嶇疆!'
-				this.$refs.resetConfirm.open()
+				this.msgType = type;
+				this.title = '纭閲嶇疆';
+				this.content = '鏄惁娓呯┖鏌ヨ鏉′欢锛�';
+				this.$refs.resetConfirm.open();
 			},
-			// 纭閲嶇疆
 			resetConfirm() {
-				this.dataList = []
-				this.matnr = ''
-				this.locNo = ''
-				this.messageText = "閲嶇疆瀹屾垚"
-				this.messageToggle('success')
+				this.dataList = [];
+				this.matnr = '';
+				this.locNo = '';
+				this.messageText = "閲嶇疆瀹屾垚";
+				this.messageToggle('success');
 			},
-			// 鍙栨秷閲嶇疆
-			resetClose() {
-			
-			},
+			resetClose() {},
 			messageToggle(type) {
-				this.msgType1 = type
-				this.$refs.message.open()
+				this.msgType1 = type;
+				this.$refs.message.open();
 			},
 		}
 	}
 </script>
 
 <style>
-	@import url('../../static/css/wms.css/wms.css');
-	.code {
-		width: 100%;
-		position: fixed;
-		min-height: 200rpx;
-		background-color: #FFF;
-		z-index: 10;
+	page {
+		background: #f5f7fa;
 	}
 	
-	.item {
+	.page-container {
+		min-height: 100vh;
+		background: linear-gradient(135deg, #f5f7fa 0%, #e4e8eb 100%);
+		padding-bottom: 110rpx;
+		box-sizing: border-box;
+	}
+	
+	/* 琛ㄥ崟鍖哄煙 */
+	.form-section {
+		background: #ffffff;
+		padding: 12rpx 20rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
+	}
+	
+	.form-item {
 		display: flex;
 		align-items: center;
-		height: 100rpx;
-		margin-left: 20rpx;
-		border-bottom: 1px solid #DCDFE6;
+		padding: 12rpx 0;
+		border-bottom: 1rpx solid #f0f0f0;
 	}
 	
-	.item input {
-		height: 50rpx;
-		line-height: 50rpx;
-		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
-		font-size: 36upx;
-		font-family: PingFang SC;
-		width: 55vw;
-	
+	.form-item:last-child {
+		border-bottom: none;
 	}
 	
-	.code-decs {
-		width: 20vw;
-		font-size: 18px;
+	.form-label {
+		display: flex;
+		align-items: center;
+		width: 140rpx;
+		flex-shrink: 0;
+	}
+	
+	.label-text {
+		font-size: 26rpx;
+		color: #303133;
+		margin-left: 6rpx;
+	}
+	
+	.form-input-wrap {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		background: #f5f7fa;
+		border-radius: 6rpx;
+		padding: 0 16rpx;
+		height: 60rpx;
+	}
+	
+	.form-input {
+		flex: 1;
+		height: 60rpx;
+		font-size: 26rpx;
 		color: #303133;
 	}
 	
-	.item-right {
-		margin-left: auto;
-		margin-right: 20rpx;
+	/* 鍒楄〃澶撮儴 */
+	.list-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 16rpx 20rpx;
+		background: #ffffff;
+		margin-top: 12rpx;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 	}
 	
-	.mat-list-title {
-		height: 80rpx;
-		line-height: 80rpx;
-		width: 100%;
-		background-color: white;
+	.header-left {
+		display: flex;
+		align-items: center;
+	}
+	
+	.header-title {
+		font-size: 28rpx;
+		color: #303133;
+		font-weight: 600;
+	}
+	
+	.count-badge {
+		background: linear-gradient(135deg, #F4C823 0%, #E6A817 100%);
+		border-radius: 16rpx;
+		padding: 2rpx 12rpx;
+		margin-left: 12rpx;
+	}
+	
+	.count-text {
+		font-size: 20rpx;
+		color: #ffffff;
+		font-weight: 500;
+	}
+	
+	/* 搴撳瓨鍒楄〃 */
+	.list-container {
+		padding: 0 20rpx;
+	}
+	
+	.stock-card {
+		background: #ffffff;
+		border-radius: 12rpx;
+		margin-top: 12rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+		overflow: hidden;
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		padding: 14rpx 16rpx;
+		background: linear-gradient(135deg, #F4C823 0%, #E6A817 100%);
+	}
+	
+	.card-index {
+		width: 36rpx;
+		height: 36rpx;
+		background: rgba(255, 255, 255, 0.3);
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 22rpx;
+		color: #ffffff;
+		font-weight: 600;
+		margin-right: 12rpx;
+	}
+	
+	.loc-info {
+		flex: 1;
+	}
+	
+	.loc-no {
+		font-size: 26rpx;
+		color: #ffffff;
+		font-weight: 600;
+	}
+	
+	.qty-badge {
+		background: rgba(255, 255, 255, 0.3);
+		padding: 4rpx 14rpx;
+		border-radius: 16rpx;
+	}
+	
+	.qty-text {
+		font-size: 24rpx;
+		color: #ffffff;
+		font-weight: 600;
+	}
+	
+	/* 鍗＄墖鍐呭 */
+	.card-body {
+		padding: 12rpx 16rpx;
+	}
+	
+	.info-row {
+		display: flex;
+		margin-bottom: 8rpx;
+	}
+	
+	.info-row:last-child {
+		margin-bottom: 0;
+	}
+	
+	.info-col {
+		flex: 1;
+	}
+	
+	.info-col.half {
+		width: 50%;
+		flex: none;
+	}
+	
+	.info-label {
+		font-size: 20rpx;
+		color: #909399;
+		display: block;
+	}
+	
+	.info-value {
+		font-size: 24rpx;
+		color: #303133;
+		display: block;
+		margin-top: 2rpx;
+	}
+	
+	.info-value.code {
+		color: #F4C823;
+		font-weight: 600;
+	}
+	
+	.info-value.batch {
+		color: #e6a23c;
+	}
+	
+	/* 绌虹姸鎬� */
+	.empty-state {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 80rpx 0;
+	}
+	
+	.empty-text {
+		font-size: 26rpx;
+		color: #909399;
+		margin-top: 16rpx;
+	}
+	
+	.empty-hint {
+		font-size: 22rpx;
+		color: #c0c4cc;
+		margin-top: 8rpx;
+	}
+	
+	.bottom-placeholder {
+		height: 20rpx;
+	}
+	
+	/* 搴曢儴鎿嶄綔鏍� */
+	.bottom-bar {
 		position: fixed;
-		margin-top: 200rpx;
-		z-index: 9;
-		/* border-top: 1px solid #DCDFE6; */
-		text-align: center;
-		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+		bottom: 0;
+		left: 0;
+		right: 0;
+		display: flex;
+		padding: 16rpx 20rpx;
+		background: #ffffff;
+		box-shadow: 0 -2rpx 12rpx rgba(0, 0, 0, 0.06);
+	}
+	
+	.btn-reset {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 160rpx;
+		height: 72rpx;
+		background: #f5f7fa;
+		border-radius: 36rpx;
+		margin-right: 16rpx;
+	}
+	
+	.btn-reset .btn-text {
+		font-size: 26rpx;
+		color: #909399;
+		margin-left: 6rpx;
+	}
+	
+	.btn-submit {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 72rpx;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		border-radius: 36rpx;
+	}
+	
+	.btn-submit .btn-text {
+		font-size: 28rpx;
+		color: #ffffff;
+		font-weight: 500;
+		margin-left: 6rpx;
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1