From 3911b985cc7cd41fdb2c9061d8c83f4bf7a4880e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 14:07:21 +0800
Subject: [PATCH] #

---
 pages/pakin/goodsUp.vue    |   28 +++++++++++++-
 pages/pakin/goodsDown2.vue |   26 +++++++++----
 pages/pakin/goodsUp2.vue   |   26 ++++++++++++-
 3 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/pages/pakin/goodsDown2.vue b/pages/pakin/goodsDown2.vue
index b3776d1..eb4ff4d 100644
--- a/pages/pakin/goodsDown2.vue
+++ b/pages/pakin/goodsDown2.vue
@@ -7,7 +7,7 @@
 					@input="barcodeInput()">
 			</view> -->
 			<view class="item">
-				<view class="code-decs">鐗╂枡鍙�:</view>
+				<view class="code-decs">鎵爜:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="barcodeFocus" @input="findMat()">
 				<view class="item-right">
 					<button></button>
@@ -50,6 +50,12 @@
 						<view class="desc">鎵瑰彿锛�</view>
 						<view class="left-item">
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
+						</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">璐т富锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.owner" type="warning"></uni-tag>
 						</view>
 					</view>
 					<!-- <view class="list-left-item">
@@ -161,6 +167,7 @@
 				matnr: '',
 				matnr1: '',
 				batch: '',
+				owner: '',
 				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
@@ -240,8 +247,9 @@
 				mat['batch'] = arr[1]
 				mat['anfme'] = arr[2]
 				mat['locNo'] = arr[3]
-				mat['maktx'] = arr[4]
-				mat['index'] = arr[5]
+				mat['owner'] = arr[4]
+				mat['maktx'] = arr[5]
+				mat['index'] = arr[6]
 				this.checkMat(mat)
 				
 				return
@@ -336,11 +344,11 @@
 			comb() {
 				uni.vibrateShort();
 				let that = this;
-				if (that.barcode === '') {
-					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
-					this.messageToggle('error')
-					return;
-				}
+				// if (that.barcode === '') {
+				// 	this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
 				if (that.dataList.length === 0) {
 					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
 					this.messageToggle('error')
@@ -407,6 +415,7 @@
 				this.matnr1 = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.owner = this.dataList[i].owner
 				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
@@ -432,6 +441,7 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].owner = this.owner
 				this.dataList[this.rowNum].weight = this.weight
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
diff --git a/pages/pakin/goodsUp.vue b/pages/pakin/goodsUp.vue
index 28c7c01..aeb30a5 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>
@@ -158,7 +162,9 @@
 				locNo:'',
 				orderNoList: [],
 				code:'',
-				origin:''
+				origin:'',
+				ownerList: [],
+				owner: ''
 
 			}
 		},
@@ -169,6 +175,7 @@
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 			this.getOrderNoList()
+			this.getOwnerList()
 		},
 		methods: {
 			findCode(){
@@ -193,6 +200,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)
+						})
 					}
 				})
 			},
@@ -482,7 +505,8 @@
 						locNo:that.locNo,
 						// code:that.code,
 						// origin:that.origin,
-						combMats: that.dataList
+						combMats: that.dataList,
+						owner: that.owner
 					}),
 					method: 'POST',
 					header: {
diff --git a/pages/pakin/goodsUp2.vue b/pages/pakin/goodsUp2.vue
index de113ad..89a43cc 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>
@@ -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(){
@@ -191,6 +197,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

--
Gitblit v1.9.1