From 6f8fe2fc191fb466e3141a6e915d6aa63802c269 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:43:35 +0800
Subject: [PATCH] 更新优化

---
 代码管理/淮安PDA/pages/stash/receiveorderoutbound.vue |  156 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 110 insertions(+), 46 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 a24cf23..a74b0fd 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"
@@ -177,6 +177,7 @@
 	import {
 		config
 	} from '../../common/config';
+import message from '../../tuniao-ui/libs/function/message';
 	const innerAudioContext = uni.createInnerAudioContext();
 	export default {
 		data() {
@@ -230,7 +231,9 @@
 				endTypeRange: [],
 				sns: "",
 				receiveOrderId: 0,
-				warehouseId:""
+				warehouseId:"",
+				toastQueue: [], // 鎻愮ず闃熷垪
+				isShowingToast: false
 			}
 		},
 
@@ -260,6 +263,29 @@
 			}
 		},
 		methods: {
+			showToast(options) {
+			            this.toastQueue.push(options);
+			            this.processToastQueue();
+			        },
+			        
+			        // 澶勭悊鎻愮ず闃熷垪
+			        processToastQueue() {
+			            // 濡傛灉姝e湪鏄剧ず鎻愮ず鎴栭槦鍒椾负绌猴紝鍒欎笉鎵ц
+			            if (this.isShowingToast || this.toastQueue.length === 0) return;
+			            
+			            this.isShowingToast = true;
+			            const toastOptions = this.toastQueue.shift();
+			            
+			            // 鏄剧ず鎻愮ず
+			            this.$refs.uToast.show({
+			                ...toastOptions,
+			                complete: () => {
+			                    // 鎻愮ず鍏抽棴鍚庡鐞嗕笅涓�涓�
+			                    this.isShowingToast = false;
+			                    this.processToastQueue();
+			                }
+			            });
+			        },
 			inputDialogToggle(itemCode) {
 				this.itemCode = itemCode;
 				this.$refs.inputDialog.open()
@@ -376,53 +402,91 @@
 				});
 			},
 			submit() {
-				if (this.sns == "") {
-					this.$refs.uToast.show({
-						title: "璇锋壂鎻忓唴绠辨爣绛�",
-						type: 'error'
+			    // 鎻愬彇鐢熶骇鏃ユ湡锛堟牸寮忎负"鐢熶骇鏃ユ湡锛歒YYY-MM"锛�
+			    const productionDateStr = this.ProductionDate.replace('鐢熶骇鏃ユ湡锛�', '');
+			    if (!productionDateStr) {
+					this.showToast({
+			            title: "鏈幏鍙栧埌鐢熶骇鏃ユ湡",
+			            type: 'error'
+			        });
+			        return;
+			    }
+			                
+			    // 瑙f瀽鐢熶骇鏃ユ湡鐨勫勾鏈�
+			    const [prodYear, prodMonth] = productionDateStr.split('-').map(Number);
+			                
+			    // 鑾峰彇褰撳墠鏃ユ湡鐨勫勾鏈�
+			    const currentDate = new Date();
+			    const currentYear = currentDate.getFullYear();
+			    const currentMonth = currentDate.getMonth() + 1;
+			                
+			    // 姣旇緝骞存湀鏄惁涓�鑷�
+			    const isDateMismatch = prodYear !== currentYear || prodMonth !== currentMonth;
+			    if (isDateMismatch) {
+			        this.showToast({
+			            title: "璇ョ墿鏂欑敓浜ф棩鏈熺殑骞存湀涓庡綋鍓嶅勾鏈堜笉涓�鑷�",
+			            type: 'warning',
+			            duration: 1500
+			        });
+			    }
+			    
+			    // 鍘熸湁鐨勭‘璁ゆ敹璐ч�昏緫
+			    if (this.sns == "") {
+			        this.$refs.uToast.show({
+			            title: "璇锋壂鎻忓唴绠辨爣绛�",
+			            type: 'error'
+			        })
+			        return;
+			    }
+			    if (this.Quantity == "") {
+			        this.$refs.uToast.show({
+			            title: "璇疯緭鍏ュ疄闄呮暟閲�",
+			            type: 'error'
+			        })
+			        return;
+			    }
+			    if(this.warehouseId==2){
+			        //鏇挎崲鎸囧畾涓や釜瀛楃闂寸殑瀛楃
+			        this.sns = this.sns.replace(/(Q:)([^,PO]+)(,PO)/, (match, p1, p2, p3) => {
+			            return p1 + this.Quantity + p3;
+			        });
+			    }
+				const sendRequest = () => {
+					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"
+							})
+						} else {
+							this.$refs.uToast.show({
+								title: res.message,
+								type: "error"
+							})
+						}
 					})
-					return;
+					
+				};
+				// 濡傛灉鏈夋棩鏈熶笉鍖归厤鎻愮ず锛岀瓑寰呮彁绀哄畬鎴愬悗鍙戦�佽姹�
+				if (isDateMismatch) {
+				    setTimeout(sendRequest, 1500); // 绛夊緟1.5绉掞紙涓庢彁绀烘椂闀夸竴鑷达級
+				} else {
+				    sendRequest(); // 娌℃湁鏃ユ湡鎻愮ず锛岀珛鍗冲彂閫佽姹�
 				}
-				if (this.Quantity == "") {
-					this.$refs.uToast.show({
-						title: "璇疯緭鍏ュ疄闄呮暟閲�",
-						type: 'error'
-					})
-					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"
-						})
-					} else {
-						this.$refs.uToast.show({
-							title: res.message,
-							type: "error"
-						})
-					}
-				})
 			},
 			submit1() {
 				this.$u.post('/api/ReceiveOrder/FeedbackReceiveOrder?orderId=' + this

--
Gitblit v1.9.3