From c9c263dc43ad90f95f24a036cee9e6b47afb596c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 十二月 2024 18:44:20 +0800
Subject: [PATCH] 新建盐城德森项目

---
 pages/pakin/pakin.vue |  942 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 446 insertions(+), 496 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8af03fd..0090ff2 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -1,503 +1,453 @@
-<template>
-	<view>
-		<view class="code">
-			<view class="item">
-				<view class="code-decs">鎵樼洏鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
-					@input="barcodeInput()">
-			</view>
-			<view class="item">
-				<view class="code-decs">鐗╂枡鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
-				<view class="item-right">
-					<button></button>
-					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
-					<uni-icons type="right" color="#c1c1c1"></uni-icons>
-				</view>
-			</view>
-		</view>
-		<view class="mat-list-title">
-			鍟嗗搧鍒楄〃
-		</view>
-		<scroll-view>
-			<view class="list" v-for="(item,i) in dataList" :key="i">
-				<view class="list-left">
-					<view class="list-left-item">
-						<view class="desc">No锛�</view>
-						<view class="left-item">{{i + 1}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">缂栫爜锛�</view>
-						<view class="left-item">
-							<uni-tag :text="item.matnr" type="primary"></uni-tag>
-						</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">鍝佸悕锛�</view>
-						<view class="left-item">{{item.maktx}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">瑙勬牸锛�</view>
-						<view class="left-item">{{item.specs}}</view>
-					</view>
-					<view class="list-left-item">
-						<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.weight" type="warning"></uni-tag>
-						</view>
-					</view> -->
-					<view class="list-left-item">
-						<view class="desc">鏁伴噺锛�</view>
-						<view class="left-item">{{item.anfme}}</view>
-					</view>
-				</view>
-				<view class="list-right">
-					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
-					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
-				</view>
-			</view>
-		</scroll-view>
-		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
-		<view class="buttom">
-			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
-		</view>
-		<!-- 寮圭獥 -->
-		<!-- 淇敼鏁伴噺 -->
-		<view>
-			<uni-popup ref="revise" type="dialog">
-				<view class="popup">
-					<!-- 鏍囬 -->
-					<view class="title">淇敼</view>
-					<view class="popup-item">
-						<view class="popup-item-left">缂栫爜:</view>
-						<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">
-						<view class="popup-item-left">鎵瑰彿:</view>
-						<view class="popup-item-right"><input type="text" v-model="batch"></view>
-					</view>
-					<!-- <view class="popup-item">
-						<view class="popup-item-left">閲嶉噺:</view>
-						<view class="popup-item-right"><input type="text" v-model="weight"></view>
-					</view> -->
-					<view class="popup-item">
-						<view class="popup-item-left">鏁伴噺:</view>
-						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
-						</view>
-					</view>
-					<view class="btn">
-						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
-						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
-		<!-- 绉婚櫎纭 -->
-		<view>
-			<!-- 鎻愮ず绐楃ず渚� -->
-			<uni-popup ref="alertDialog" type="dialog">
-				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
-					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
-		<view>
-			<!-- 鎻愮ず淇℃伅寮圭獥 -->
-			<uni-popup ref="message" type="message">
-				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
-			</uni-popup>
-		</view>
-		<!-- 纭缁勬墭 -->
-		<view>
-			<uni-popup ref="combConfirm" type="dialog">
-				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
-					@confirm="comb" @close="combClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
-		<!-- 纭閲嶇疆 -->
-		<view>
-			<uni-popup ref="resetConfirm" type="dialog">
-				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
-					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
-			</uni-popup>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				baseUrl: '',
-				token: '',
-				barcode: '',
-				dataList: [],
-				count: 0,
-				rowNum: '',
-				matnr: '',
-				batch: '',
-				weight: '',
-				msgType1: 'success',
-				msgType: 'success',
-				messageText: '',
-				title: '',
-				content: '',
-				barcodeFocus: true,
-				matFocus: false,
-				matData: '',
-				removeNum: 0,
-			}
-		},
-		onLoad() {
-
-		},
-		onShow() {
-			this.baseUrl = uni.getStorageSync('baseUrl');
-			this.token = uni.getStorageSync('token');
-		},
-		methods: {
-			messageToggle(type) {
-				this.msgType1 = type
-				this.$refs.message.open()
-			},
-			// barcode input 浜嬩欢
-			barcodeInput() {
-				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
-				setTimeout(() => {
-					var len = this.barcode.length
-					if (len != 8) {
-						uni.showToast({
-							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
-							icon: "none",
-							position: 'top'
-						});
-						this.barcodeFocuss()
-						return;
-					}
-					this.focuss()
-				}, 200)
-			},
-			// 鎵樼洏鐮佹湁璇噸缃�
-			barcodeFocuss() {
-				let that = this;
-				that.barcodeFocus = false;
-				setTimeout(() => {
-					that.barcode = '';
-					that.barcodeFocus = true;
-				}, 100);
-			},
-			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
-			focuss() {
-				this.focus = false;
-				setTimeout(() => {
-					this.matnr = '';
-					this.matFocus = true;
-				}, 100);
-			},
-			// 鎼滅储鐗╂枡
+<template>
+	<view>
+		<view class="code">
+			<view class="item">
+				<view class="code-decs">鎵樼洏鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+					@input="barcodeInput()">
+			</view>
+			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" >
+				<view class="item-right">
+					<button></button>
+					<text style="text-align: right;color: #409EFF;" @click="findMat()">鎻愬彇+</text>
+					<uni-icons type="right" color="#c1c1c1"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<view class="mat-list-title">
+			<div>鍟嗗搧鍒楄〃</div>
+			<scroll-view>
+				<view class="list" v-for="(item,i) in dataList" :key="i">
+					<view class="list-left">
+						<view class="list-left-item">
+							<view class="desc">No锛�</view>
+							<view class="left-item">{{i + 1}}</view>
+						</view>
+						<view class="list-left-item">
+							<view class="desc">缂栫爜锛�</view>
+							<view class="left-item">
+								<uni-tag :text="item.matnr" type="primary"></uni-tag>
+							</view>
+						</view>
+						<view class="list-left-item">
+							<view class="desc">鍝佸悕锛�</view>
+							<view class="left-item">{{item.maktx}}</view>
+						</view>
+						<view class="list-left-item">
+							<view class="desc">瑙勬牸锛�</view>
+							<view class="left-item">{{item.specs}}</view>
+						</view>
+						<view class="list-left-item">
+							<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">{{item.mergeNum}}</view>
+						</view>
+					</view>
+					<view class="list-right">
+						<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+						<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+		<view class="buttom">
+			<button size="mini" @click="reset('warn')">閲嶇疆</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+		</view>
+		<!-- 寮圭獥 -->
+		<!-- 淇敼鏁伴噺 -->
+		<view>
+			<uni-popup ref="revise" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">淇敼</view>
+					<view class="popup-item">
+						<view class="popup-item-left">缂栫爜:</view>
+						<view class="popup-item-right">
+							<input type="text" v-model="selectedItem.matnr" disabled="true"
+								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+						</view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鎵瑰彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="selectedItem.batch"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">鏁伴噺:</view>
+						<view class="popup-item-right" style="border: none;justify-content: center;">
+							<uni-number-box :value="selectedItem.mergeNum" :step='1' :max="selectedItem.maxQty" color="#747474" @change="changeValue" />
+						</view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="reviseClose">鍙栨秷</view>
+						<view class="btn-right" @click="reviseConfirm()">淇敼</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 绉婚櫎纭 -->
+		<view>
+			<!-- 鎻愮ず绐楃ず渚� -->
+			<uni-popup ref="alertDialog" type="dialog">
+				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<view>
+			<!-- 鎻愮ず淇℃伅寮圭獥 -->
+			<uni-popup ref="message" type="message">
+				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+			</uni-popup>
+		</view>
+		<!-- 纭缁勬墭 -->
+		<view>
+			<uni-popup ref="combConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="comb" @close="combClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		<!-- 纭閲嶇疆 -->
+		<view>
+			<uni-popup ref="resetConfirm" type="dialog">
+				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				dataList: [],
+				rowNum: '',
+				matnr: '',
+				msgType1: 'success',
+				msgType: 'success',
+				messageText: '',
+				title: '',
+				content: '',
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				selectedItem: {},
+				removeNum: 0,
+			}
+		},
+		
+		onLoad() {
+
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+		},
+		methods: {
+			getMatsList(params) {
+				this.checkMat(params.data)
+				console.log(params)
+			},
+			
+			messageToggle(type) {
+				this.msgType1 = type
+				this.$refs.message.open()
+			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					if (len != 8) {
+						uni.showToast({
+							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+							icon: "none",
+							position: 'top'
+						});
+						// this.barcodeFocuss()
+						return;
+					}
+					// this.focuss()
+				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			// focuss() {
+			// 	this.focus = false;
+			// 	setTimeout(() => {
+			// 		this.matnr = '';
+			// 		this.matFocus = true;
+			// 	}, 100);
+			// },
+			// 鎼滅储鐗╂枡
 			findMat() {
 				let that = this
-				uni.request({
-					url: that.baseUrl + '/mat/auth',
-					data: {
-						matnr: that.matnr
-					},
-					header: {
-						'token': uni.getStorageSync('token')
-					},
-					success(result) {
-						result = result.data
-						if (result.code === 200 && result.data) {
-							that.matData = result.data
-							that.matnr = ''
-							that.matData['batch'] = ''
-							uni.navigateTo({
-								url: "../mat/matSelected",
-								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
-								success: function(res) {
-									res.eventChannel.emit('mat', {
-										data: result.data
-									})
-								},
-								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-								events: {
-									matList: function(data) {
-										that.checkMat(data.data)
-										that.focuss()
-									},
-								},
-							});
-						} else if (result.code == 403) {
-							uni.showToast({
-								title: result.msg,
-								icon: "none",
-								position: 'top'
-							})
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
-							}, 1000);
-						} else {
-							uni.showToast({
-								title: result.msg,
-								icon: "none",
-								position: 'top'
-							})
-						}
-
-					}
-				});
-
-			},
-			selectMat() {
-				let that = this
-				uni.navigateTo({
-					url: "../mat/matQuery",
-					success: function(res) {
-						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
-						res.eventChannel.emit('commonUrl', {
-							commonUrl: ''
-						})
-					},
-					events: {
-						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
-						acceptDataFromOpenedPage: function(data) {
-							that.matnr = data.data
-							that.findMat(that.matnr)
-						},
-					},
-
-
-				});
-				that.matnr = ''
-			},
-			checkMat(mat) {
-				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) {
-								sameItem = true
-							}
-						}
-						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
-						if (mat.batch != this.dataList[i].batch) {
-							this.$forceUpdate() // 寮哄埗鍒锋柊
-							if (sameItem) {
-								add = false
-							} else {
-								add = true
-							}
-							
-						} else {
-							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
-							this.dataList[i].anfme += mat.anfme
-							this.$forceUpdate() // 寮哄埗鍒锋柊
-							add = false
-						}
-					}
-				}
-				if (add) {
-					this.dataList.unshift(mat)
-				}
-			},
-			// 淇敼鎵瑰彿
-			revise(item, i) {
-				this.matnr = this.dataList[i].matnr
-				this.count = this.dataList[i].anfme
-				this.batch = this.dataList[i].batch
-				this.weight = this.dataList[i].weight
-				this.rowNum = i
-				this.eject()
-			},
-			eject(type) {
-				this.type = type
-				this.$refs.revise.open(type)
-			},
-			// 鍒楄〃绉婚櫎鎸夐挳
-			remove(item, i, type) {
-				this.removeNum  = i
-				this.msgType = type
-				this.title = '璀﹀憡'
-				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
-				this.$refs.alertDialog.open(i)
-			},
-			// 纭绉婚櫎
-			removeConfirm() {
-				this.messageText = "绉婚櫎鎴愬姛"
-				this.messageToggle('success')
-				this.dataList.splice(this.removeNum, 1)
-			},
-			// 鍙栨秷绉婚櫎
-			removeClose() {
-				this.$refs.alertDialog.close()
-			},
-			reviseConfirm() {
-				this.dataList[this.rowNum].anfme = this.count
-				this.dataList[this.rowNum].batch = this.batch
-				this.dataList[this.rowNum].weight = this.weight
-				this.matnr = ''
-				this.messageText = "淇敼鎴愬姛"
-				this.messageToggle('success')
-				this.$refs.revise.close()
-			},
-			reviseClose() {
-				this.$refs.revise.close()
-			},
-			changeValue(value) {
-				this.count = value
-			},
+				if (that.matnr == null && that.matnr == '') {
+					uni.showToast({
+						title: "鐗╂枡鐮佷笉鑳戒负绌猴紒锛�",
+						icon: "none",
+						position: "top"
+					})
+					return;
+				} else {
+					uni.navigateTo({
+						url: "../pakin/pakinSelector?barcode=" + that.matnr,
+					});
+				}
+			},
+		
+			checkMat(mat) {
+				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) {
+								sameItem = true
+							}
+						}
+						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
+						if (mat.batch != this.dataList[i].batch) {
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							if (sameItem) {
+								add = false
+							} else {
+								add = true
+							}
+							
+						} else {
+							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+							this.dataList[i].mergeNum += mat.mergeNum
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							add = false
+						}
+					}
+				}
+				if (add) {
+					this.dataList.unshift(mat)
+				}
+			},
+			// 淇敼鎵瑰彿
+			revise(item, i) {
+				this.selectedItem = item;
+				this.selectedItem.maxQty = item.mergeNum;
+				this.rowNum = i
+				this.eject()
+			},
+			eject(type) {
+				this.type = type
+				this.$refs.revise.open(type)
+			},
+			// 鍒楄〃绉婚櫎鎸夐挳
+			remove(item, i, type) {
+				this.removeNum  = i
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+				this.$refs.alertDialog.open(i)
+			},
+			// 纭绉婚櫎
+			removeConfirm() {
+				this.messageText = "绉婚櫎鎴愬姛"
+				this.messageToggle('success')
+				this.dataList.splice(this.removeNum, 1)
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
+			},
+			reviseConfirm() {
+				this.dataList.splice(this.rowNum, 1, this.selectedItem)
+				console.log(this.dataList)
+				this.messageText = "淇敼鎴愬姛"
+				this.messageToggle('success')
+				this.$refs.revise.close()
+			},
+			reviseClose() {
+				this.$refs.revise.close()
+			},
+			changeValue(value) {
+				if (value > this.selectedItem.mergeNum) {
+					uni.showToast({
+						title: "瓒呭嚭鏈�澶у彲缁勬嫋鏁伴噺锛侊紒",
+						icon: "none",
+						position: 'top'
+					})
+					return;
+				}
+				this.selectedItem.mergeNum = value
+			},
 			combConfirm(type) {
-				this.msgType = type
-				this.title = '璀﹀憡'
-				this.content = '鏄惁鐜板湪缁勬墭!'
-				this.$refs.combConfirm.open()
-			},
-			combClose() {
-				this.$refs.combConfirm.close()
-			},
-			comb() {
-				uni.vibrateShort();
-				let that = this;
-				if (that.barcode === '') {
+				if (this.barcode === '') {
 					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
 					this.messageToggle('error')
 					return;
 				}
-				if (that.dataList.length === 0) {
-					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
-					this.messageToggle('error')
-					return;
-				}
-				for (var i = 0; i < that.dataList.length; i++) {
-					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
-						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
-						this.messageToggle('error')
-						return;
-					}
-				}
-				uni.request({
-					url: that.baseUrl + '/mobile/comb/auth',
-					data: JSON.stringify({
-						barcode: that.barcode,
-						combMats: that.dataList
-					}),
-					method: 'POST',
-					header: {
-						'token': uni.getStorageSync('token')
-					},
-					success(result) {
-						var res = result.data
-						if (res.code === 200) {
-							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
-							that.messageToggle('success')
-							const innerAudioContext = uni.createInnerAudioContext();
-							innerAudioContext.src = '/static/music/pakinOk.mp3';
-							innerAudioContext.play()
-						} else if (res.code == 403) {
-							that.messageText = res.msg
-							that.messageToggle('error')
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
-							}, 1000);
-						} else {
-							that.messageText = res.msg
-							that.messageToggle('error')
-						}
-					}
-				});
-			},
-			reset(type) {
-				this.msgType = type
-				this.title = '璀﹀憡'
-				this.content = '鏄惁閲嶇疆!'
-				this.$refs.resetConfirm.open()
-			},
-			// 纭閲嶇疆
-			resetConfirm() {
-				this.dataList = []
-				this.messageText = "閲嶇疆瀹屾垚"
-				this.messageToggle('success')
-			},
-			// 鍙栨秷閲嶇疆
-			resetClose() {
-
-			},
-			// 娓呯┖
-			resst() {
-				this.dataList = []
-				this.barcode = ''
-				this.barcodeFocuss()
-			},
-		}
-	}
-</script>
-
-<style>
-	@import url('../../static/css/wms.css/wms.css');
-
-	.code {
-		width: 100%;
-		position: fixed;
-		min-height: 200rpx;
-		background-color: #FFF;
-		z-index: 10;
-	}
-
-	.item {
-		display: flex;
-		align-items: center;
-		height: 100rpx;
-		margin-left: 20rpx;
-		border-bottom: 1px solid #DCDFE6;
-	}
-
-	.item input {
-		height: 50rpx;
-		line-height: 50rpx;
-		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
-		font-size: 36upx;
-		font-family: PingFang SC;
-		width: 55vw;
-
-	}
-
-	.code-decs {
-		width: 20vw;
-		font-size: 18px;
-		color: #303133;
-	}
-
-	.item-right {
-		margin-left: auto;
-		margin-right: 20rpx;
-	}
-
-	.mat-list-title {
-		height: 80rpx;
-		line-height: 80rpx;
-		width: 100%;
-		background-color: white;
-		position: fixed;
-		margin-top: 200rpx;
-		z-index: 9;
-		/* border-top: 1px solid #DCDFE6; */
-		text-align: center;
-		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
-	}
-</style>
+		
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.$refs.combConfirm.open()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			comb() {
+				uni.vibrateShort();
+				let that = this;
+
+				if (that.dataList.length === 0) {
+					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+					this.messageToggle('error')
+					return;
+				}
+				for (var i = 0; i < that.dataList.length; i++) {
+					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+						this.messageToggle('error')
+						return;
+					}
+				}
+				uni.request({
+					url: that.baseUrl + '/pda/comb/auth',
+					data: JSON.stringify({
+						mergeNo: that.barcode,
+						orderNo: that.matnr,
+						orderDetls: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.resst();
+							that.messageText = "缁勬墭鎴愬姛"
+							that.messageToggle('success')
+							const innerAudioContext = uni.createInnerAudioContext();
+							innerAudioContext.src = '/static/music/pakinOk.mp3';
+							innerAudioContext.play()
+						} else if (res.code == 403) {
+							that.messageText = res.msg
+							that.messageToggle('error')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							that.messageText = res.msg
+							that.messageToggle('error')
+						}
+					}
+				});
+			},
+			reset(type) {
+				this.msgType = type
+				this.title = '璀﹀憡'
+				this.content = '鏄惁閲嶇疆!'
+				this.$refs.resetConfirm.open()
+			},
+			// 纭閲嶇疆
+			resetConfirm() {
+				this.dataList = []
+				this.messageText = "閲嶇疆瀹屾垚"
+				this.messageToggle('success')
+			},
+			// 鍙栨秷閲嶇疆
+			resetClose() {
+
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.barcodeFocuss()
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url('../../static/css/wms.css/wms.css');
+
+	.list {
+		border-radius: unset;
+		margin: auto;
+		margin-top: 20rpx;
+		padding: 10rpx;
+	}
+
+	.list:first-child {
+		margin-top: 20rpx;
+	}
+	.code {
+		width: 100%;
+		position: fixed;
+		min-height: 200rpx;
+		background-color: #FFF;
+		z-index: 10;
+	}
+
+	.item {
+		display: flex;
+		align-items: center;
+		height: 100rpx;
+		margin-left: 20rpx;
+		border-bottom: 1px solid #DCDFE6;
+	}
+
+	.item input {
+		height: 50rpx;
+		line-height: 50rpx;
+		/* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+		font-size: 36upx;
+		font-family: PingFang SC;
+		width: 55vw;
+
+	}
+
+	.code-decs {
+		width: 20vw;
+		font-size: 18px;
+		color: #303133;
+	}
+
+	.item-right {
+		margin-left: auto;
+		margin-right: 20rpx;
+	}
+
+	.mat-list-title {
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 100%;
+		background-color: white;
+		position: fixed;
+		margin-top: 200rpx;
+		z-index: 9;
+		/* border-top: 1px solid #DCDFE6; */
+		text-align: center;
+		/* box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2); */
+	}
+</style>

--
Gitblit v1.9.1