From 5248e257623228bf7b598f75f09902cbff6518c6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 00:16:02 +0800
Subject: [PATCH] #

---
 pages/home/orderManage.vue            |   10 ++++++----
 manifest.json                         |    2 +-
 pages/phyz/order/pakinOrderSelect.vue |   12 ++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index a404231..6cd3249 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-    "versionName" : "20240408B",
+    "versionName" : "20240410A",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/home/orderManage.vue b/pages/home/orderManage.vue
index 7ec5488..30f656d 100644
--- a/pages/home/orderManage.vue
+++ b/pages/home/orderManage.vue
@@ -27,10 +27,10 @@
 				elements2: [
 					{
 						title: '閲囪喘鍏ュ簱鍗�',
-						name: 'pakin',
+						name: 'outOrder',
 						color: 'blue',
 						// cuIcon: 'pullup',
-						url: `/phyz/order/purchaseOrder`
+						url: `/phyz/order/pakinOrderSelect`
 					},
 					{
 						title: '鍑哄簱鍗�',
@@ -41,11 +41,13 @@
 					},
 					{
 						title: '鍏ュ簱鍗曟祴璇曠敤',
-						name: 'outOrder',
+						name: 'pakin',
 						color: 'blue',
 						// cuIcon: 'pullup',
-						url: `/phyz/order/pakinOrderSelect`
+						url: `/phyz/order/purchaseOrder`
 					},
+					
+					
 				],
 				colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
 			};
diff --git a/pages/phyz/order/pakinOrderSelect.vue b/pages/phyz/order/pakinOrderSelect.vue
index d985e00..fd9bb87 100644
--- a/pages/phyz/order/pakinOrderSelect.vue
+++ b/pages/phyz/order/pakinOrderSelect.vue
@@ -149,10 +149,10 @@
 				this.count = 0
 			},
 			addConfirm() {
-				if (this.count == 0) {
-					uni.showToast({ title: '鍏ュ簱鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
-					return
-				}
+				// if (this.count == 0) {
+				// 	uni.showToast({ title: '鍏ュ簱鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
+				// 	return
+				// }
 				this.dataList[this.index]['used'] = true
 				this.dataList[this.index]['pakinQty'] = this.count
 				this.orderCarList.push(this.dataList[this.index])
@@ -163,6 +163,10 @@
 			// 鐐瑰嚮鍓嶅線 寰呯粍鎵樺垪琛�
 			orderCar() {
 				let _this = this
+				if (_this.orderCarList.length === 0) {
+					uni.showToast({ title: '璇锋坊鍔犲叆搴撳晢鍝侊紒', icon: "none", position: 'top' })
+					return
+				}
 				uni.navigateTo({
 					url: './orderCar',
 					success(res) {

--
Gitblit v1.9.1