From 3c06dd86de7b503bbe14c52bb02a77e965e4c596 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 05 五月 2024 20:41:50 +0800
Subject: [PATCH] #

---
 pages/phyz/order/pakinOrderSelect.vue |  162 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 141 insertions(+), 21 deletions(-)

diff --git a/pages/phyz/order/pakinOrderSelect.vue b/pages/phyz/order/pakinOrderSelect.vue
index c3bba06..c054c9d 100644
--- a/pages/phyz/order/pakinOrderSelect.vue
+++ b/pages/phyz/order/pakinOrderSelect.vue
@@ -6,8 +6,8 @@
 			</uni-search-bar>
 			<view class="code-title">
 				<view></view>
-				<view style="width: 100%;text-align: center;margin: 16rpx;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
-				<view></view>
+				<view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
+				<view style="width: 100rpx;margin: 16rpx 0;" @click="filter()">绛涢��</view>
 			</view>
 		</view>
 		
@@ -17,6 +17,7 @@
 				<view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
 				<view>缂栧彿锛歿{orderDetl.matnr}}</view>
 				<view>鍚嶇О锛歿{orderDetl.maktx}}</view>
+				<view>绫诲瀷锛歿{orderDetl.brand}}</view>
 				<view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
 				<view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
 			</view>
@@ -54,15 +55,49 @@
 				</view>
 			</uni-popup>
 		</view>
-		<!-- 閬僵灞� -->
-		<view class="mask" v-if="mask">
-			鍔犺浇涓�傘�傘��
+		<!-- 绛涢�夊脊绐� -->
+		<view>
+			<uni-popup ref="filter" type="dialog">
+				<view class="filter-popup">
+					<!-- 鏍囬 -->
+					<view class="title">绛涢��</view>
+					<view class="popup-item" style="background-color: #dfdfdf;">
+						<view class="item-cl">
+							<view>閿�鍞鍗曪細</view>
+							<input type="text" v-model="searchValue">
+						</view>
+					</view>
+					<view class="popup-item" style="background-color: #dfdfdf;">
+						<view class="item-cl">
+							<view>涓昏鍗曞彿锛�</view>
+							<input type="text" v-model="orderNo">
+						</view>
+					</view>
+					<view class="popup-item" style="background-color: #dfdfdf;">
+						<view class="item-cl">
+							<view>鍟嗗搧缂栧彿锛�</view>
+							<input type="text" v-model="matnr">
+						</view>
+					</view>
+					<view class="popup-item" style="background-color: #dfdfdf;">
+						<view class="item-cl">
+							<view>鍟嗗搧鍚嶇О锛�</view>
+							<input type="text" v-model="maktx">
+						</view>
+					</view>
+					<view class="popup-item" style="background-color: #dfdfdf;">
+						<view class="item-cl">
+							<view>鍟嗗搧绉嶇被锛�</view>
+							<input type="text" v-model="brand">
+						</view>
+					</view>
+					<view class="btn filter-btn">
+						<view class="btn-left" @click="filterClose">閲嶇疆</view>
+						<view class="btn-right" @click="filterConfirm()">纭</view>
+					</view>
+				</view>
+			</uni-popup>
 		</view>
-		<!-- <view class="buttom">
-			<uni-search-bar :focus="searchValueFocus" v-model="searchValue" style="width: 100%;"
-				maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
-			</uni-search-bar>
-		</view> -->
 	</view>
 </template>
 
@@ -74,6 +109,10 @@
 				token: '',
 				searchValueFocus: true,
 				searchValue: '',
+				orderNo: '',
+				matnr: '',
+				maktx: '',
+				brand: '',
 				total: '',
 				dataList: [],
 				orderCarList: [],
@@ -81,6 +120,10 @@
 					curr: 1,
 					limit: 100,
 					three_code: '',
+					matnr: '',
+					maktx: '',
+					order_no: '',
+					brand: ''
 				},
 				index: 0,
 				count: 0,
@@ -88,26 +131,27 @@
 				
 			}
 		},
+		// 涓嬫媺鍒锋柊
+		onReachBottom() {
+			this.status = 'more';
+			this.getOrderDetlList(this.searchValue,10);
+		},
 		onLoad() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 			this.searchValue = uni.getStorageSync('threeCode');
-			this.getOrderDetlList(this.searchValue,30)
+			this.getOrderDetlList(this.searchValue,10)
 			console.log("onLoad");
 		},
 		onShow() {
 			console.log(uni.getStorageSync('pakinOrderCar'));
-			// if (uni.getStorageSync('pakinOrderCar')) {
-			// 	this.orderCarList = uni.getStorageSync('pakinOrderCar');
-			// } else {
-			// 	this.orderCarList = []
-			// }
 		},
 		onHide() {
 			uni.setStorageSync('pakinOrderCar', this.orderCarList);
 		},
 		methods: {
 			getOrderDetlList(threeCode,limit) {
+				uni.showLoading({})
 				let _this = this
 				_this.mask = true
 				_this.data.three_code = threeCode
@@ -118,6 +162,7 @@
 					data: _this.data,
 					method: 'GET',
 					success(res) {
+						uni.hideLoading()
 						res = res.data
 						if (res.code === 200) {
 							for (let k of res.data.records) {
@@ -129,7 +174,10 @@
 									k['color'] = 'order-sts-end'
 								}
 							}
-							_this.dataList = res.data.records
+							let list = res.data.records
+							_this.dataList =  _this.dataList.concat(list);
+							_this.data.curr = _this.data.curr + 1
+							// _this.dataList = res.data.records
 							_this.total = res.data.total
 							_this.mask = false
 						} else if (res.code == 403) {
@@ -142,16 +190,22 @@
 				})
 			},
 			searchValueInput2() {
+				this.dataList = []
+				this.data.curr = 1
 				uni.setStorageSync('threeCode', this.searchValue);
 				if (this.searchValue.length == 0) {
-					this.getOrderDetlList(this.searchValue,30)
+					this.getOrderDetlList(this.searchValue,10)
 				} else {
-					this.getOrderDetlList(this.searchValue,999999)
+					this.getOrderDetlList(this.searchValue,10)
 				}
 				
 			},
 			clear() {
-				this.getOrderDetlList(this.searchValue,30)
+				this.dataList = []
+				this.data.curr = 1
+				setTimeout(()=> {
+					this.getOrderDetlList(this.searchValue,10)
+				},300)
 			},
 			// 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
 			addItem(index) {
@@ -203,7 +257,7 @@
 							console.log(data);
 							if (data.data == 1) {
 								_this.orderCarList = []
-								_this.getOrderDetlList(uni.getStorageSync('threeCode'),999999)
+								_this.getOrderDetlList(uni.getStorageSync('threeCode'),10)
 							}
 						}
 					}
@@ -212,6 +266,31 @@
 			changeValue(value) {
 				this.count = value
 			},
+			// 绛涢��
+			filter() {
+				this.$refs.filter.open('bottom')
+			},
+			filterConfirm() {
+				this.dataList = []
+				this.data.curr = 1
+				this.data.maktx = this.maktx
+				this.data.matnr = this.matnr
+				this.data.order_no = this.order_no
+				this.data.brand = this.brand
+				this.getOrderDetlList(this.searchValue,10)
+				this.$refs.filter.close()
+			},
+			filterClose() {
+				this.dataList = []
+				this.data.curr = 1
+				this.data.maktx = ''
+				this.data.matnr = ''
+				this.data.order_no = ''
+				this.data.brand = ''
+				this.getOrderDetlList(this.searchValue,10)
+				this.$refs.filter.close()
+			}
+			
 		}
 	}
 	
@@ -338,4 +417,45 @@
 		align-items: center;
 		color: #409EFF;
 	}
+	.filter-popup {
+		width: 100%;
+		height: 80vh;
+		background-color: #FFF;
+		position: relative;
+		border-radius: 30rpx 30rpx 0rpx 0rpx;
+	}
+	.filter-popup-item {
+		height: 100%;
+		width: 100%;
+		background-color: #c9cdd5;
+	}
+	.filter-popup-item-left {
+		width: 30%;
+		height: 100%;
+		background-color: #DCDFE6;
+		
+	}
+	.item-btn {
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #c9cdd5;
+		text-align: center;
+	}
+	.item-btn:checked {
+		background-color: #606266;
+	}
+	.filter-btn {
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		background-color: #FFF;
+	}
+	.item-cl {
+		display: flex;align-items: center;
+	}
+	.item-cl input {
+		border-bottom: 1px solid #b9b9b9;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1