From e4dc67055ea0c21e72815054c044b56a76ec625e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 17 四月 2024 13:08:36 +0800
Subject: [PATCH] #

---
 pages/pakin/goodsUp.vue |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/pages/pakin/goodsUp.vue b/pages/pakin/goodsUp.vue
index 7ad1284..9ff7c83 100644
--- a/pages/pakin/goodsUp.vue
+++ b/pages/pakin/goodsUp.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>
@@ -52,7 +56,7 @@
 						<view class="left-item">{{item.batch}}</view>
 					</view>
 					<view class="list-left-item">
-						<view class="desc">鍏枻锛�</view>
+						<view class="desc">鍏枻(鏁伴噺)锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
 					</view>
 				</view>
@@ -79,6 +83,7 @@
 						<view class="popup-item-right">
 							<input type="text" v-model="matnr" disabled="true"
 								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+								
 						</view>
 					</view>
 					<!-- <view class="popup-item">
@@ -157,7 +162,9 @@
 				locNo:'',
 				orderNoList: [],
 				code:'',
-				origin:''
+				origin:'',
+				ownerList: [],
+				owner: ''
 
 			}
 		},
@@ -168,6 +175,7 @@
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 			this.getOrderNoList()
+			this.getOwnerList()
 		},
 		methods: {
 			findCode(){
@@ -194,6 +202,22 @@
 					}
 				})
 			},
+			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)
+						})
+					}
+				})
+			},
 			// 鏍规嵁鎵樼洏鐮佹悳绱�
 			search() {
 				let that = this
@@ -205,7 +229,6 @@
 					data: {orderNo: that.orderNo},
 					method:'GET',
 					success(res) {
-						console.log(res);
 						res = res.data
 						if(res.code === 200){
 							for(var i = 0; i < res.data.length;i++){
@@ -274,7 +297,17 @@
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
-										that.checkMat(data.data)
+										if(data.data.batch == "" || data.data.batch == null){
+											const now = new Date();
+											const year = now.getFullYear();
+											const month = now.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1
+											const day = now.getDate();
+											data.data.batch = (""+year+month+day)
+										}
+										for(let i = 0; i < data.data.count; i++) {
+											// that.checkMat(data.data)
+											that.dataList.unshift(data.data.mat)
+										}
 									},
 								},
 							});
@@ -327,6 +360,7 @@
 				var len = this.dataList.length
 				var add = true ,sameItem = false
 				for (var i = 0; i < len; i++) {
+					
 					if (mat.matnr == this.dataList[i].matnr) {
 						for (var j = 0; j < len; j++) {
 							if (mat.batch == this.dataList[j].batch) {
@@ -467,12 +501,13 @@
 					}
 				}
 				uni.request({
-					url: that.baseUrl + '/mobile/manDetl/in/origin',
+					url: that.baseUrl + '/mobile/manDetl/in/no/origin',
 					data: JSON.stringify({						
 						locNo:that.locNo,
 						// code:that.code,
 						// origin:that.origin,
-						combMats: that.dataList
+						combMats: that.dataList,
+						owner: that.owner
 					}),
 					method: 'POST',
 					header: {

--
Gitblit v1.9.1