From dcecb039035f4b2e82e31c39b74db9402444c536 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 08 四月 2025 21:35:39 +0800
Subject: [PATCH] 代码更新,优化等内容

---
 代码管理/淮安PDA/pages/stash/receiveorderoutbound.vue |   86 ++++++++++++++++++++++++++++++-------------
 1 files changed, 60 insertions(+), 26 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
index c5621d3..c8b5f39 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
@@ -8,7 +8,7 @@
 					<uni-forms-item :label="label" style="margin-top: -20px;"></uni-forms-item>
 					<!-- <uni-forms-item label="鍗曟嵁绫诲瀷锛氱敓浜ч鏂欏崟" style="margin-top: -20px;"></uni-forms-item> -->
 					<uni-forms-item label="鍐呯鐮侊細" style="margin-top: -20px;">
-						<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="focus"
+						<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="!focus"
 							v-model="innerCode" @input="innercodeInput" />
 					</uni-forms-item>
 					<uni-forms-item :label="PurchaseOrderNo" style="margin-top: -20px;"></uni-forms-item>
@@ -22,10 +22,19 @@
 					</uni-forms-item>
 				</uni-forms>
 				<uni-forms-item>
-					<button @click="submit" type="primary" size="default" style="margin-top: 2%;">纭鏀惰揣</button>
+					<view class="uni-flex uni-row" style="justify-content: space-between;margin-top: 2%;height: 45px;width: 520rpx;margin: 0px auto;">
+						<view>
+							<button @click="resetReceive" type="default" size="default" style="width: 200rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
+						</view>
+						<view>
+							<button @click="submit" type="primary" size="default" style="width: 220rpx;">纭鏀惰揣</button>
+						</view>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item>
-					<button @click="submit1" type="primary" size="default" style="margin-top: 2%;">瀹屾垚鏀惰揣</button>
+					<view style="margin-top: 2%;height: 45px;width: 520rpx;margin: 0px auto;">
+						<button @click="submit1" type="primary" size="default" style="margin-top: 2%;backgroundColor:#1AAD19;borderColor:#1AAD19">瀹屾垚鏀惰揣</button>
+					</view>
 				</uni-forms-item>
 			</view>
 		</view>
@@ -43,15 +52,15 @@
 					</uni-forms-item>
 				</uni-forms> -->
 				<uni-list :border="true">
-					<uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.id">
+					<uni-list-item direction="column" v-for="item in orderinfoDetails" :key="item.id">
 						<template v-slot:body>
 								<view class="uni-content">
-									<view style="font-size: 18px;">鏀惰揣鍗曞彿锛歿{orderNo}}</view>
-									<view style="font-size: 18px;">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
-									<view style="font-size: 18px;">鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
-									<view style="font-size: 18px;">鎵规鍙凤細{{item.lotNo}}</view>
-									<view style="font-size: 18px;">鏀惰揣鏁伴噺锛歿{item.receivedQuantity}}</view>
-									<view style="font-size: 18px;">鏄惁璐ㄦ锛歿{item.ifInspection==1?"鏄�":"鍚�"}}</view>
+									<view>鏀惰揣鍗曞彿锛歿{orderNo}}</view>
+									<view>閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
+									<view>鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
+									<view>鎵规鍙凤細{{item.lotNo}}</view>
+									<view>鏀惰揣鏁伴噺锛歿{item.receivedQuantity}}</view>
+									<view>鏄惁璐ㄦ锛歿{item.ifInspection==1?"鏄�":"鍚�"}}</view>
 								</view>
 						</template>
 					</uni-list-item>
@@ -175,6 +184,7 @@
 				current: 0,
 				orderNo: "",
 				orderInfo: [],
+				orderinfoDetails:[],
 				label: "",
 				innerCode: "",
 				PurchaseOrderNo: "閲囪喘鍗曞彿锛�",
@@ -191,7 +201,7 @@
 				remaindQty: "瀹為檯鏁伴噺锛�",
 				tagFocus: true,
 				numberFocus: false,
-				focus: true,
+				focus: false,
 				tag: "",
 				number: "",
 				tagmatCode: "鐗╂枡缂栫爜锛�",
@@ -218,6 +228,7 @@
 				endTypeRange: [],
 				sns: "",
 				receiveOrderId: 0,
+				warehouseId:""
 			}
 		},
 
@@ -233,6 +244,7 @@
 			this.orderNo = res.orderNo;
 			this.receiveOrderId = res.receiveOrderId;
 			this.label = "鏀惰揣鍗曞彿锛�" + this.orderNo;
+			this.warehouseId=res.warehouseId;
 			this.getData();
 		},
 		mounted() {
@@ -256,6 +268,19 @@
 			},
 			search() {
 				this.getData();
+			},
+			resetReceive(){
+				this.PurchaseOrderNo="閲囪喘鍗曞彿锛�";
+				this.matCode="鐗╂枡缂栫爜锛�";
+				this.LotNo="鐗╂枡鎵规锛�";
+				this.orderQty="璁㈠崟鏁伴噺锛�";
+				this.ProductionDate="鐢熶骇鏃ユ湡锛�";
+				this.EffectiveDate="鏈夋晥鏃ユ湡锛�";
+				this.Quantity="";
+				setTimeout(() => {
+					this.innerCode="";
+					this.focus=false;
+				}, 10);
 			},
 			releasebox() {
 				if (this.releasevalue.length == 0) {
@@ -363,15 +388,32 @@
 					})
 					return;
 				}
+				if(this.warehouseId==2){
+					//鏇挎崲鎸囧畾涓や釜瀛楃闂寸殑瀛楃
+					this.sns = this.sns.replace(/(Q:)([^,PO]+)(,PO)/, (match, p1, p2, p3) => {
+					  return p1 + this.Quantity + p3;
+					});
+				}
 				this.$u.post('/api/ReceiveOrderDetail/AddReceiveOrderDetail?serNum=' + this.sns + '&orderNo=' + this
 					.orderNo, {}).then(res => {
 					if (res.status) {
+						this.PurchaseOrderNo="閲囪喘鍗曞彿锛�";
+						this.matCode="鐗╂枡缂栫爜锛�";
+						this.LotNo="鐗╂枡鎵规锛�";
+						this.orderQty="璁㈠崟鏁伴噺锛�";
+						this.ProductionDate="鐢熶骇鏃ユ湡锛�";
+						this.EffectiveDate="鏈夋晥鏃ユ湡锛�";
+						this.Quantity="";
+						setTimeout(() => {
+							this.innerCode="";
+							this.focus=false;
+						}, 100);
+						this.orderInfo=[];
+						this.sns = "";
 						this.$refs.uToast.show({
 							title: "纭鏀惰揣鎴愬姛",
 							type: "success"
 						})
-						this.orderInfo=[];
-						this.sns = "";
 					} else {
 						this.$refs.uToast.show({
 							title: res.message,
@@ -446,6 +488,7 @@
 				})
 			},
 			onClickItem(e) {
+				console.log(1)
 				this.focus = false;
 				this.addressFocus = false;
 				if (this.current !== e.currentIndex) {
@@ -464,8 +507,8 @@
 				}
 				this.$u.post('/api/ReceiveOrderDetail/GetReceiveOrderInfos', postData).then((res) => {
 					if (res.status) {
-						this.orderInfo = res.data;
-						if (this.orderInfo.length > 3) {
+						this.orderinfoDetails = res.data;
+						if (this.orderinfoDetails.length > 3) {
 							this.loadVisible = true;
 						}
 					}
@@ -479,7 +522,8 @@
 					var innerCode = this.innerCode;
 					setTimeout(() => {
 						this.innerCode = "";
-					}, 10);
+						this.focus=true;
+					}, 1);
 
 					this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + innerCode, {}).then((res) => {
 						if (res.status) {
@@ -493,16 +537,6 @@
 							this.ProductionDate = "鐢熶骇鏃ユ湡锛�" + res.data.productionDate;
 							this.orderQty = "璁㈠崟鏁伴噺锛�" + res.data.quantity;
 							this.Quantity = res.data.quantity;
-							if (res.message) {
-								this.$refs.uToast.show({
-									title: res.message,
-									type: "error"
-								})
-								setTimeout(() => {
-									this.voiceSpeech('../../static/fail.mp3');
-								}, 100);
-								return;
-							}
 							setTimeout(() => {
 								this.voiceSpeech('../../static/success.mp3');
 							}, 100);

--
Gitblit v1.9.3