From 7bbb44bf6c0b49801351af20a0dc2c41b8f08eba Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 十二月 2023 09:29:12 +0800
Subject: [PATCH] #

---
 pages/pakin/goodsUp2.vue |   67 ++++++++++++++++++++++++---------
 1 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/pages/pakin/goodsUp2.vue b/pages/pakin/goodsUp2.vue
index 55fe206..a9ca7f0 100644
--- a/pages/pakin/goodsUp2.vue
+++ b/pages/pakin/goodsUp2.vue
@@ -10,6 +10,10 @@
 				<uni-combox :candidates="orderNoList" placeholder="璇烽�夋嫨鏉ユ簮鍦�"  v-model="origin"></uni-combox>
 			</view>
 			<view class="item">
+				<view class="code-decs">璐т富:</view>
+				<uni-combox :candidates="ownerList" placeholder="璇烽�夋嫨璐т富"  v-model="owner"></uni-combox>
+			</view>
+			<view class="item">
 				<view class="code-decs">搴撲綅鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" >
 			</view>
@@ -49,7 +53,7 @@
 					</view>
 					
 					<view class="list-left-item">
-						<view class="desc">鏁伴噺锛�</view>
+						<view class="desc">鍏枻锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
 					</view>
 				</view>
@@ -78,16 +82,16 @@
 								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
 						</view>
 					</view>
-					<view class="popup-item">
+					<!-- <view class="popup-item">
 						<view class="popup-item-left">搴撲綅:</view>
 						<view class="popup-item-right"><input type="text" v-model="locNo"></view>
-					</view>
-					<view class="popup-item">
+					</view> -->
+					<!-- <view class="popup-item">
 						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
-					</view>
+					</view> -->
 					<view class="popup-item">
-						<view class="popup-item-left">鏁伴噺:</view>
+						<view class="popup-item-left">鍏枻:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
 							<uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
 						</view>
@@ -154,8 +158,9 @@
 				locNo:'',
 				orderNoList: [],
 				code:'',
-				origin:''
-
+				origin:'',
+				ownerList: [],
+				owner: ''
 			}
 		},
 		onLoad() {
@@ -165,6 +170,7 @@
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 			this.getOrderNoList()
+			this.getOwnerList()
 		},
 		methods: {
 			findCode(){
@@ -188,6 +194,22 @@
 						for (var i = 0; i < res.data.length; i++) {
 							that.orderNoList.push(res.data[i])
 						}
+					}
+				})
+			},
+			getOwnerList(){
+				let that = this
+				uni.request({
+					url: this.baseUrl + '/locOwnerQuery/auth',
+					header: {
+						'token':uni.getStorageSync('token')
+					},
+					method: 'POST',
+					success(res) {
+						res = res.data
+						res.data.forEach((item,index) => {
+							that.ownerList.push(item.value)
+						})
 					}
 				})
 			},
@@ -271,7 +293,11 @@
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
-										that.checkMat(data.data)
+										// that.checkMat(data.data)
+										for(let i = 0; i < data.data.count; i++) {
+											// that.checkMat(data.data)
+											that.dataList.unshift(data.data.mat)
+										}
 									},
 								},
 							});
@@ -431,16 +457,16 @@
 			adjust() {
 				uni.vibrateShort();
 				let that = this;
-				if (that.code === '') {
-					this.messageText = "璇疯緭鍏ユ潯鐮�"
-					this.messageToggle('error')
-					return;
-				}
-				if (that.origin === '') {
-					this.messageText = "璇烽�夋嫨鏉ユ簮鍦�"
-					this.messageToggle('error')
-					return;
-				}
+				// if (that.code === '') {
+				// 	this.messageText = "璇疯緭鍏ユ潯鐮�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
+				// if (that.origin === '') {
+				// 	this.messageText = "璇烽�夋嫨鏉ユ簮鍦�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
 				if (that.locNo === '') {
 					this.messageText = "璇疯緭鍏ュ簱浣嶇爜"
 					this.messageToggle('error')
@@ -564,4 +590,7 @@
 	.list:last-child {
 		margin-bottom: 120rpx;
 	}
+	.list-left-item{
+		margin-bottom: 2px;
+	}
 </style>

--
Gitblit v1.9.1