From a95a257a702360e7632b5daeb5b554163382720c Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 17 四月 2025 17:00:59 +0800
Subject: [PATCH] 1

---
 代码管理/淮安PDA/pages/stash/raworderboxing.vue |   57 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 10 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
index 80fed18..763d4d7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
@@ -26,7 +26,10 @@
 							<checkbox checked="check">鏄惁婊$洏</checkbox>
 						</uni-forms-item> -->
 						<uni-forms-item>
-							<button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
+							<view style="display: flex;justify-content: space-around;margin-top: 2%;">
+								<button @click="reset" type="default" size="default" style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
+								<button @click="submit" type="primary" size="default" style="width: 160rpx;">缁勭洏</button>
+							</view>
 						</uni-forms-item>
 					</uni-forms>
 					<uni-list>
@@ -68,8 +71,8 @@
 								placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
 						</uni-forms-item>
 						<uni-forms-item label="鍦板潃鏉$爜">
-							<uni-easyinput type="text" v-model="address" :disabled="addressdisabled" placeholder="璇锋壂鎻忓湴鍧�鏉$爜" ref='midInput'
-								:focus="addressFocus" />
+							<uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
+								placeholder="璇锋壂鎻忓湴鍧�鏉$爜" ref='midInput' :focus="addressFocus" />
 						</uni-forms-item>
 						<uni-forms-item>
 							<button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
@@ -87,8 +90,7 @@
 										<view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
 										<view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
 										<!-- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view> -->
-										<view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity}}</view>
-										<view style="font-size: 18px;">鍗曚綅锛歿{item.unit}}</view>
+										<view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity+item.unit}}</view>
 										<view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view>
 									</view>
 								</view>
@@ -104,9 +106,14 @@
 							<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="pkfocus"
 								v-model="pkmaterSn" @input="pksnInput" />
 						</uni-forms-item>
+						
 						<uni-forms-item>
-							<button @click="pksubmit" type="primary" size="default" style="margin-top: 2%;">鍏ュ钩搴�</button>
+							<view style="display: flex;justify-content: space-around;margin-top: 2%;">
+								<button @click="resetInPk" type="default" size="default" style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
+								<button @click="pksubmit" type="primary" size="default" style="margin-top: 2%;">鍏ュ钩搴�</button>
+							</view>
 						</uni-forms-item>
+						
 					</uni-forms>
 					<uni-list>
 						<uni-list-item direction="column" v-for="(item,index) in pkmatInfos" :key="index">
@@ -398,6 +405,20 @@
 				this.pkmatInfos.splice(res, 1);
 				this.pksns.splice(res, 1);
 			},
+			reset(){
+				this.barcode="";
+				this.matInfos=[];
+				this.sns=[];
+				this.materSn="";
+				if(this.warehouseId=!6){
+					this.Initiallife=0;
+				}
+			},
+			resetInPk(){
+				this.pkmaterSn="";
+				this.pkmatInfos=[];
+				this.pksns=[];
+			},
 			pksubmit() {
 				if (this.pkmatInfos.length == 0) {
 					this.$refs.uToast.show({
@@ -442,11 +463,24 @@
 				if (this.Test) {
 					if (!this.Testcheck) {
 						this.Testcheck = true;
-						this.$refs.uToast.show({
-							title: "璇风‘璁ゅ垵濮嬪鍛�",
-							type: 'error'
-						})
+						if (this.warehouseId == 2) {
+							this.$refs.uToast.show({
+								title: "璇风‘璁ゆ暟閲�",
+								type: 'error'
+							})
+						} else if (this.warehouseId == 6) {
+							this.$refs.uToast.show({
+								title: "璇风‘璁ゅ垵濮嬪鍛�",
+								type: 'error'
+							})
+						}
 						return;
+					}
+				}
+				if (this.warehouseId == 2) { //娌瑰ⅷ浠撳簱鍖篒D
+					this.sn = this.sns[0];
+					for (var i = 0; i < this.Initiallife - 1; i++) {
+						this.sns.push(this.sn);
 					}
 				}
 				this.$u.post('/api/InboundOrder/MaterielGroup', {
@@ -470,6 +504,9 @@
 						this.matInfos = [];
 						this.sns = [];
 						this.matTotal = [];
+						if (this.warehouseId != 6) { //娴嬭瘯鏋朵粨搴撳尯ID
+							this.Initiallife="";
+						}
 					} else {
 						this.$refs.uToast.show({
 							title: res.message,

--
Gitblit v1.9.3