From 4b05298f1ee210f1e0fb3e401997f00d3878a20c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 02 八月 2024 09:15:13 +0800
Subject: [PATCH] #

---
 pages/phyz/orderOut/orderCheck.vue        |   14 
 pages/phyz/waitOrder/waitOrderIn.vue      |  459 ++++++++++++++++++++++++++++++
 pages/home/orderManage.vue                |   14 
 pages/phyz/orderOut/bcpOrderOutSelect.vue |    3 
 pages.json                                |   14 
 pages/phyz/waitOrder/waitOrderOut.vue     |  366 ++++++++++++++++++++++++
 6 files changed, 868 insertions(+), 2 deletions(-)

diff --git a/pages.json b/pages.json
index 5ff0c17..3ac7ed0 100644
--- a/pages.json
+++ b/pages.json
@@ -413,6 +413,20 @@
         	{
         		"navigationBarTitleText" : "宸插姞宸ョ‘璁�"
         	}
+        },
+        {
+        	"path" : "pages/phyz/waitOrder/waitOrderIn",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "寰呭寘瑁呭叆搴撳崟"
+        	}
+        },
+        {
+        	"path" : "pages/phyz/waitOrder/waitOrderOut",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "寰呭寘瑁呭嚭搴撳崟"
+        	}
         }
     ],
 	"globalStyle": {
diff --git a/pages/home/orderManage.vue b/pages/home/orderManage.vue
index 7efccb5..59f8007 100644
--- a/pages/home/orderManage.vue
+++ b/pages/home/orderManage.vue
@@ -26,6 +26,18 @@
 				project: 'tzsk',
 				elements2: [
 					{
+						title: '寰呭寘瑁呭叆搴撳崟',
+						name: 'pakinOrder',
+						color: 'blue',
+						url: `/phyz/waitOrder/waitOrderIn`
+					},
+					{
+						title: '寰呭寘瑁呭嚭搴撳崟',
+						name: 'pakinOrder',
+						color: 'blue',
+						url: `/phyz/waitOrder/waitOrderOut`
+					},
+					{
 						title: '閲囪喘鍏ュ簱鍗�',
 						name: 'pakinOrder',
 						color: 'blue',
@@ -47,7 +59,7 @@
 					// 	url: `/phyz/order/purchaseOrder`
 					// },
 					{
-						title: '璁㈠崟鍑哄簱',
+						title: '閲囪喘鍑哄簱',
 						name: 'outOrder',
 						color: 'blue',
 						// cuIcon: 'pullup',
diff --git a/pages/phyz/orderOut/bcpOrderOutSelect.vue b/pages/phyz/orderOut/bcpOrderOutSelect.vue
index 0d791cb..87b45bb 100644
--- a/pages/phyz/orderOut/bcpOrderOutSelect.vue
+++ b/pages/phyz/orderOut/bcpOrderOutSelect.vue
@@ -199,6 +199,9 @@
 					success(res) {
 						res.eventChannel.emit('item', {
 							item: item
+						}),
+						res.eventChannel.emit('type', {
+							type: "bcp"
 						})
 					},
 					events: {
diff --git a/pages/phyz/orderOut/orderCheck.vue b/pages/phyz/orderOut/orderCheck.vue
index bd47f2c..3008a81 100644
--- a/pages/phyz/orderOut/orderCheck.vue
+++ b/pages/phyz/orderOut/orderCheck.vue
@@ -75,7 +75,8 @@
 				option: '',
 				options: [],
 				combDis: false,
-				maxCount: 0
+				maxCount: 0,
+				orderType: ''
 			}
 		},
 		onShow() {
@@ -92,6 +93,12 @@
 			eventChannel.on('item', function(data) {
 				let ids = [data.item.id]
 				_this.getPakoutList(ids)
+			})
+			eventChannel.on('type', function(data) {
+				console.log(data);
+				if (data) {
+					_this.orderType = data.type
+				}
 			})
 		},
 		methods: {
@@ -124,6 +131,11 @@
 									k['isOpen'] = false
 									k['count'] = k.anfme
 									k.anfme = 0
+									if (_this.orderType == 'bcp') {
+										if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
+											continue
+										}
+									}
 									_this.dataList.push(k)
 								}
 							}
diff --git a/pages/phyz/waitOrder/waitOrderIn.vue b/pages/phyz/waitOrder/waitOrderIn.vue
new file mode 100644
index 0000000..e417a68
--- /dev/null
+++ b/pages/phyz/waitOrder/waitOrderIn.vue
@@ -0,0 +1,459 @@
+<template>
+	<view class="container">
+		<view class="code">
+			<uni-search-bar :focus="searchValueFocus" v-model="searchValue" 
+				maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
+			</uni-search-bar>
+			<view class="code-title">
+				<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>
+		
+		<view class="list list-font-color" :class="orderDetl.color" v-for="(orderDetl,index) in dataList" :key="index">
+			<view class="list-left">
+				<view class="detl-threeCode">{{orderDetl.threeCode}}</view>
+				<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>
+			<view class="list-right" @click="addItem(index)">
+				<uni-icons type="folder-add" size="25"  color="#fff"></uni-icons>
+			</view>
+		</view>
+		
+		
+		<view class="shop-car" @click="orderCar()">
+			<view class="car-left">
+				<uni-icons type="cart-filled" size="35"  color="#fff"></uni-icons>
+			</view>
+			<view class="car-right">
+				<text>{{orderCarList.length}}</text>
+			</view>
+		</view>
+		<!-- 鍨珮 -->
+		<view style="height: 340rpx;text-align: center;color: #b9b9b9;">
+			- 宸茬粡鍒板簳浜� -
+		</view>
+		<!-- 寮圭獥 -->
+		<view>
+			<uni-popup ref="addItem" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">鍏ュ簱鏁伴噺</view>
+					<view class="popup-item">
+						<uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="addClose">鍙栨秷</view>
+						<view class="btn-right" @click="addConfirm()">娣诲姞</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 绛涢�夊脊绐� -->
+		<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>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				baseUrl: '',
+				token: '',
+				searchValueFocus: true,
+				searchValue: '',
+				orderNo: '',
+				matnr: '',
+				maktx: '',
+				brand: '',
+				total: '',
+				dataList: [],
+				orderCarList: [],
+				data: {
+					curr: 1,
+					limit: 100,
+					three_code: '',
+					matnr: '',
+					maktx: '',
+					order_no: '',
+					brand: ''
+				},
+				index: 0,
+				count: 0,
+				mask: false
+				
+			}
+		},
+		// 涓嬫媺鍒锋柊
+		onReachBottom() {
+			this.status = 'more';
+			this.getOrderDetlList(this.searchValue,10);
+		},
+		onLoad() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.searchValue = uni.getStorageSync('waitOrderInCode');
+			this.getOrderDetlList(this.searchValue,10)
+		},
+		onShow() {
+			console.log(uni.getStorageSync('waitOrderInCar'));
+		},
+		onHide() {
+			uni.setStorageSync('waitOrderInCar', this.orderCarList);
+		},
+		methods: {
+			getOrderDetlList(threeCode,limit) {
+				uni.showLoading({})
+				let _this = this
+				_this.mask = true
+				_this.data.three_code = threeCode
+				_this.data.limit = limit
+				uni.request({
+					url: `${_this.baseUrl}/order/wait/detls/pakin/page/auth`,
+					header: {'token': uni.getStorageSync('token')},
+					data: _this.data,
+					method: 'GET',
+					success(res) {
+						uni.hideLoading()
+						res = res.data
+						if (res.code === 200) {
+							for (let k of res.data.records) {
+								if (k.anfme > k.qty && k.qty == 0) {
+									k['color'] = 'order-sts-start'
+								} else if (k.anfme > k.qty && k.qty != 0) {
+									k['color'] = 'order-sts-working'
+								} else {
+									k['color'] = 'order-sts-end'
+								}
+							}
+							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) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				})
+			},
+			searchValueInput2() {
+				this.dataList = []
+				this.data.curr = 1
+				uni.setStorageSync('waitOrderInCode', this.searchValue);
+				if (this.searchValue.length == 0) {
+					this.getOrderDetlList(this.searchValue,10)
+				} else {
+					this.getOrderDetlList(this.searchValue,10)
+				}
+				
+			},
+			clear() {
+				this.dataList = []
+				this.data.curr = 1
+				setTimeout(()=> {
+					this.getOrderDetlList(this.searchValue,10)
+				},300)
+			},
+			// 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
+			addItem(index) {
+				// 鍒ゆ柇娣诲姞鐨勫晢鍝佹槸鍚﹀拰宸茬粡娣诲姞鐨勯噸澶�
+				let dataList = this.dataList
+				for (let k of this.orderCarList) {
+					if (k.orderNo == dataList[index].orderNo 
+						&& k.threeCode == dataList[index].threeCode 
+						&& k.matnr == dataList[index].matnr) {
+							uni.showToast({ title: '璇峰嬁閲嶅娣诲姞鍟嗗搧锛�', icon: "none", position: 'top' })
+							return
+					}
+				}
+				this.index = index
+				this.$refs.addItem.open()
+			},
+			addClose() {
+				this.$refs.addItem.close()
+				this.count = 0
+			},
+			addConfirm() {
+				// 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])
+				this.index = 0
+				this.count = 0
+				this.$refs.addItem.close()
+			},
+			// 鐐瑰嚮鍓嶅線 寰呯粍鎵樺垪琛�
+			orderCar() {
+				let _this = this
+				if (_this.orderCarList.length === 0) {
+					uni.showToast({ title: '璇锋坊鍔犲叆搴撳晢鍝侊紒', icon: "none", position: 'top' })
+					return
+				}
+				uni.navigateTo({
+					url: '../order/orderCar',
+					success(res) {
+						res.eventChannel.emit('item', {
+							item: _this.orderCarList
+						})
+					},
+					events: {
+						acceptDataFromOpenedPage: function(data) {
+							if (data.data == 1) {
+								_this.orderCarList = []
+								_this.getOrderDetlList(uni.getStorageSync('waitOrderInCode'),10)
+							}
+						}
+					}
+				})
+			},
+			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()
+			}
+			
+		}
+	}
+	
+</script>
+
+<style>
+	@import url('../../../static/css/common/order.css');
+	.list-font-color {
+		color: #fff;
+		/* background-color: #33bb44; */
+	}
+	.order-sts-start {
+		background-color: #3eb689;
+	}
+	.order-sts-working {
+		background-color: #ff9d46;
+	}
+	.order-sts-end {
+		background-color: #ff7356;
+	}
+	.detl-threeCode {
+		font-size: 28px;
+		font-weight: bold;
+	}
+	.shop-car {
+		position: fixed;
+		left: 22rpx;
+		bottom: 150rpx;
+		background-color: #2299ff;
+		width: 260rpx;
+		height: 90rpx;
+		display: flex;
+		align-items: center;
+		box-shadow: 0 0 10px 5px rgba(0, 0, 0, .6);
+		border-radius: 10rpx;
+		color: #fff;
+		font-size: 28px;
+		font-weight: bold;
+	}
+	.car-left {
+		padding: 16rpx;
+		flex: 5;
+	}
+	.car-right {
+		flex: 4;
+	}
+	
+	.mask {
+		position: absolute;
+		width: 100%;
+		height: 100vh;
+		z-index: 999;
+		top: 0;
+		left: 0;
+		background-color: rgba(0, 0, 0, .4);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 16px;
+		color: #fff;
+	}
+	
+	.popup {
+		width: 80vw;
+		min-height: 100rpx;
+		background-color: #FFF;
+		border-radius: 25rpx;
+		position: relative;
+	}
+	.title {
+		height: 100rpx;
+		line-height: 100rpx;
+		width: 100%;
+		color: #606266;
+		text-align: center;
+		font-size: 16px;
+	}
+	.popup-item {
+		height: 80rpx;
+		line-height: 80rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.popup-item-left {
+		width: 16vw;
+		padding-right: 20rpx;
+		text-align: right;
+		color: #606266;
+	}
+	.popup-item-right {
+		display: flex;
+		align-items: center;
+		width: 50vw;
+		height: 50rpx;
+		padding: 2px 5px;
+		border: 1px solid #E4E7ED;
+		border-radius: 5rpx;
+	}
+	.popup-item-right input{
+		color: #606266;
+	}
+	.btn {
+		display: flex;
+		height: 90rpx;
+		margin-top: 20rpx;
+		border-top: 1px solid #DCDFE6;
+		justify-content: center;
+		align-items: center;
+	}
+	.btn-left {
+		display: flex;
+		flex: 1;
+		height: 100%;
+		justify-content: center;
+		align-items: center;
+		color: #606266;
+		border-right: 1px solid #DCDFE6;
+	}
+	.btn-right {
+		display: flex;
+		flex: 1;
+		justify-content: center;
+		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
diff --git a/pages/phyz/waitOrder/waitOrderOut.vue b/pages/phyz/waitOrder/waitOrderOut.vue
new file mode 100644
index 0000000..b79743f
--- /dev/null
+++ b/pages/phyz/waitOrder/waitOrderOut.vue
@@ -0,0 +1,366 @@
+<template>
+	<view>
+		<view class="code">
+			<uni-search-bar  v-model="searchValue1" 
+				maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
+			</uni-search-bar>
+			<view class="code-title">
+				<view></view>
+				<view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue1}} 鎬绘暟閲忥細- {{total}} -</view>
+				<view style="width: 100rpx;margin: 16rpx 0;" @click="filter()">绛涢��</view>
+			</view>
+		</view>
+		
+		<view class="list list-font-color" :class="orderDetl.color" v-for="(orderDetl,index) in dataList" :key="index">
+			<view class="list-left">
+				<view class="detl-threeCode">{{orderDetl.threeCode}}</view>
+				<view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
+				<view>缂栧彿锛歿{orderDetl.matnr}}</view>
+				<view>鍚嶇О锛歿{orderDetl.maktx}}</view>
+				<view>绫诲瀷锛歿{orderDetl.brand}}</view>
+				<view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
+				<view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
+				<view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</view>
+			</view>
+			<view class="list-right" @click="goToLocDetl(orderDetl)">
+				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
+			</view>
+		</view>
+		
+		<!-- 鍨珮 -->
+		<view style="height: 340rpx;text-align: center;color: #b9b9b9;">
+			- 宸茬粡鍒板簳浜� -
+		</view>
+		
+		<!-- <view class="buttom">
+			<view style="width: 150rpx;text-align: center;padding-left: 12rpx;">
+				鍚嶇О
+			</view>
+			<uni-search-bar v-model="searchValue2" style="width: 100%;"
+				maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear2" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
+			</uni-search-bar>
+		</view> -->
+		<!-- 绛涢�夊脊绐� -->
+		<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="searchValue1">
+						</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				searchValue1: '',
+				searchValue2: '',
+				orderNo: '',
+				matnr: '',
+				maktx: '',
+				brand: '',
+				total: '',
+				dataList: [],
+				orderCarList: [],
+				data: {
+					curr: 1,
+					limit: 100,
+					three_code: '',
+					matnr: '',
+					maktx: '',
+					order_no: '',
+					brand: ''
+				},
+			}
+		},
+		onReachBottom() {
+			this.status = 'more';
+			this.getOrderDetlList(this.searchValue1,10);
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			this.searchValue1 = uni.getStorageSync('waitOrderOutCode');
+			this.searchValue2 = uni.getStorageSync('waitOrderOutCode2');
+			this.getOrderDetlList(this.searchValue1,10)
+		},
+		methods: {
+			getOrderDetlList(threeCode,limit) {
+				uni.showLoading({})
+				let _this = this
+				_this.mask = true
+				_this.data.three_code = threeCode
+				_this.data.limit = limit
+				uni.request({
+					url: `${_this.baseUrl}/orderDetl/pakout/list/authV6`,
+					header: {'token': uni.getStorageSync('token')},
+					data: _this.data,
+					method: 'GET',
+					success(res) {
+						uni.hideLoading({})
+						res = res.data
+						if (res.code === 200) {
+							for (let k of res.data.records) {
+								if (k.anfme > k.qty && k.qty == 0) {
+									k['color'] = 'order-sts-start'
+								} else if (k.anfme > k.qty && k.qty != 0) {
+									k['color'] = 'order-sts-working'
+								} else {
+									k['color'] = 'order-sts-end'
+								}
+							}
+							let list = res.data.records
+							_this.dataList =  _this.dataList.concat(list);
+							_this.data.curr = _this.data.curr + 1
+							_this.total = res.data.total
+							_this.mask = false
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				})
+			},
+			searchValueInput1() {
+				this.dataList = []
+				this.data.curr = 1
+				uni.setStorageSync('waitOrderOutCode', this.searchValue1);
+				uni.setStorageSync('waitOrderOutCode2', this.searchValue2);
+				if (this.searchValue1.length == 0) {
+					this.getOrderDetlList(this.searchValue1,10)
+				} else {
+					this.getOrderDetlList(this.searchValue1,10)
+				}
+				
+			},
+			searchValueInput2() {
+				uni.setStorageSync('waitOrderOutCode', this.searchValue1);
+				uni.setStorageSync('waitOrderOutCode2', this.searchValue2);
+				if (this.searchValue1.length == 0) {
+					this.getOrderDetlList(this.searchValue1,10)
+				} else {
+					this.getOrderDetlList(this.searchValue1,10)
+				}
+			},
+			clear() {
+				this.dataList = []
+				this.data.curr = 1
+				setTimeout(()=> {
+					this.getOrderDetlList(this.searchValue,10)
+				},300)
+			},
+			clear2() {
+				setTimeout(()=> {
+					this.searchValue2 = ''
+					this.getOrderDetlList(this.searchValue1,10)
+				},300)
+			},
+			goToLocDetl(item) {
+				if (item.qty >= item.anfme) {
+					uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
+					return
+				}
+				let _this = this
+				uni.navigateTo({
+					url: '../orderOut/orderCheck',
+					success(res) {
+						res.eventChannel.emit('item', {
+							item: item
+						})
+					},
+					events: {
+						acceptDataFromOpenedPage: function(data) {
+							_this.getOrderDetlList(this.searchValue1,10)
+						}
+					}
+				})
+			},
+			// 绛涢��
+			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.searchValue1,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.searchValue1,10)
+				this.$refs.filter.close()
+			}
+			
+		}
+	}
+</script>
+
+<style>
+	@import url('../../../static/css/common/order.css');
+	.list-font-color {
+		color: #fff;
+		/* background-color: #33bb44; */
+	}
+	.order-sts-start {
+		background-color: #3eb689;
+	}
+	.order-sts-working {
+		background-color: #ff9d46;
+	}
+	.order-sts-end {
+		background-color: #ff7356;
+	}
+	.detl-threeCode {
+		font-size: 28px;
+		font-weight: bold;
+	}
+	
+	.title {
+		height: 100rpx;
+		line-height: 100rpx;
+		width: 100%;
+		color: #606266;
+		text-align: center;
+		font-size: 16px;
+	}
+	.popup-item {
+		height: 80rpx;
+		line-height: 80rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.popup-item-left {
+		width: 16vw;
+		padding-right: 20rpx;
+		text-align: right;
+		color: #606266;
+	}
+	.popup-item-right {
+		display: flex;
+		align-items: center;
+		width: 50vw;
+		height: 50rpx;
+		padding: 2px 5px;
+		border: 1px solid #E4E7ED;
+		border-radius: 5rpx;
+	}
+	.popup-item-right input{
+		color: #606266;
+	}
+	.btn {
+		display: flex;
+		height: 90rpx;
+		margin-top: 20rpx;
+		border-top: 1px solid #DCDFE6;
+		justify-content: center;
+		align-items: center;
+	}
+	.btn-left {
+		display: flex;
+		flex: 1;
+		height: 100%;
+		justify-content: center;
+		align-items: center;
+		color: #606266;
+		border-right: 1px solid #DCDFE6;
+	}
+	.btn-right {
+		display: flex;
+		flex: 1;
+		justify-content: center;
+		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>

--
Gitblit v1.9.1