From 2c75eece8ea416574746c922da164d5e448be551 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 三月 2024 08:04:20 +0800
Subject: [PATCH] #

---
 pages/phyz/order/orderList.vue     |   99 ++++++++-----------------------------------------
 pages/phyz/order/purchaseOrder.vue |    1 
 static/css/common/order.css        |   14 ++++++
 3 files changed, 31 insertions(+), 83 deletions(-)

diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
index a74fbfc..fc0bce1 100644
--- a/pages/phyz/order/orderList.vue
+++ b/pages/phyz/order/orderList.vue
@@ -25,6 +25,12 @@
 			</view>
 		</view>
 		<view style="height: 100rpx;"></view>
+		
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" @click="reset('warn')">閲嶇疆</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+		</view>
 	</view>
 </template>
 
@@ -38,86 +44,7 @@
 				matFocus: true,
 				matnr: '',
 				checck: true,
-				dataList: [
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931255',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z',
-						checked: true
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931225',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-					{
-						orderNo: 'cg0931241',
-						matnr: 'cg0931241',
-						maktx: '浣犲ソ',
-						anfme: 10,
-						specs: '10-z'
-					},
-				],
+				dataList: [],
 				oldDataList: [],
 				newDataList: [],
 				allCheck: false,
@@ -133,13 +60,18 @@
 			eventChannel.on('item', function(data) {
 				console.log(data);
 				that.orderId = data.item.orderId 
+				uni.setNavigationBarTitle({
+					title: data.item.orderNo
+				})
 				
 			})
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			this.oldDataList = [...this.dataList]
+			if (this.dataList.length > 0) {
+				this.oldDataList = [...this.dataList]
+			}
 			this.getOrderDetl(this.orderId)
 		},
 		methods: {
@@ -160,6 +92,7 @@
 						console.log(res);
 						if (res.code === 200) {
 							_this.dataList = res.data.records
+							_this.oldDataList = [..._this.dataList]
 						} 
 					}
 				})
@@ -167,7 +100,9 @@
 			matInput() {
 				let count = 0
 				let sign = 0
-				this.dataList = [...this.oldDataList]
+				if (this.oldDataList.length > 0) {
+					this.dataList = [...this.oldDataList]
+				}
 				this.newDataList = []
 				for (let k in this.dataList) {
 					if (!this.dataList[k].matnr.includes(this.matnr)) {
diff --git a/pages/phyz/order/purchaseOrder.vue b/pages/phyz/order/purchaseOrder.vue
index 4b26296..f5ecffd 100644
--- a/pages/phyz/order/purchaseOrder.vue
+++ b/pages/phyz/order/purchaseOrder.vue
@@ -54,6 +54,7 @@
 			this.oldDataList = [...this.dataList]
 			this.getOrderList()
 		},
+		
 		methods: {
 			searchValueInput() {
 				let count = 0
diff --git a/static/css/common/order.css b/static/css/common/order.css
index 3ea9df4..2dddb98 100644
--- a/static/css/common/order.css
+++ b/static/css/common/order.css
@@ -43,4 +43,16 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-	}
\ No newline at end of file
+	}
+	.buttom {
+	width: 100%;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 100rpx;
+	background-color: #FFF;
+	box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.2) ;
+}
\ No newline at end of file

--
Gitblit v1.9.1