From 59dc3bbd1fdedab400b56d67a169bcda97dcf75e Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 17 十二月 2025 18:51:33 +0800
Subject: [PATCH] SJ,XJ,RKJ优化修改

---
 pages/QC/RKJ/Add.vue |   53 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/pages/QC/RKJ/Add.vue b/pages/QC/RKJ/Add.vue
index bdab1ae..cf1f0f0 100644
--- a/pages/QC/RKJ/Add.vue
+++ b/pages/QC/RKJ/Add.vue
@@ -41,8 +41,8 @@
 
 				<view class="form-row">
 					<label class="form-label required">閫佹鏁伴噺锛�</label>
-					<input type="number" v-model="formData.quantity" placeholder="璇疯緭鍏ラ�佹鏁伴噺" class="large-quantity-input"
-						@input="onQuantityChange" />
+					<input type="number" v-model="formData.sjqty" placeholder="璇疯緭鍏ラ�佹鏁伴噺" class="large-quantity-input"
+						@input="onSjqtyChange" />
 				</view>
 			</view>
 
@@ -79,7 +79,7 @@
 
 		<view class="form-actions">
 			<button class="btn-primary"
-				v-if="!isShowTable && formData.workShop && formData.lineName && formData.rBillNo && formData.quantity"
+				v-if="!isShowTable && formData.workShop && formData.lineName && formData.rBillNo && formData.sjqty"
 				@click="getItem">
 				<text class="btn-icon">鉁�</text>
 				鐢熸垚妫�楠屽崟
@@ -130,8 +130,12 @@
 				<view class="info-value">{{formData.itemModel}}</view>
 			</view>
 			<view class="info-block">
+				<view class="info-label">宸ュ崟鏁伴噺锛�</view>
+				<view class="info-value">{{formData.quantity || formData.planQty}}</view>
+			</view>
+			<view class="info-block">
 				<view class="info-label">閫佹鏁伴噺锛�</view>
-				<view class="info-value highlight">{{formData.quantity}}</view>
+				<view class="info-value highlight">{{formData.sjqty}}</view>
 			</view>
 			<view class="info-block" v-if="formData.remarks">
 				<view class="info-label">涓嶅悎鏍兼弿杩帮細</view>
@@ -474,7 +478,8 @@
 					rbillNo: "",
 					workShop: "", // 宸ヤ綔杞﹂棿
 					lineName: "", // 绾夸綋鍚嶇О
-					quantity: "", // 閫佹鏁伴噺
+					quantity: "", // 宸ュ崟鏁伴噺锛堝師閫佹鏁伴噺瀛楁锛�
+					sjqty: "", // 閫佹鏁伴噺锛堟柊澧炲瓧娈碉級
 					planQty: "", // 宸ュ崟璁″垝鏁伴噺
 					fngDesc: "" // 涓嶈壇鎻忚堪
 				},
@@ -706,8 +711,8 @@
 					data: {
 						from: this.formData,
 						userNo: this.$loginInfo.account,
-						quantity: this.formData.quantity,
-						//moidNum: this.formData.moidNum
+						quantity: this.formData.quantity, // 宸ュ崟鏁伴噺
+						sjqty: this.formData.sjqty, // 閫佹鏁伴噺
 						items: this.tableData
 					}
 				}).then(res => {
@@ -826,39 +831,40 @@
 				this.formData.billNo = data.daa001; // 宸ュ崟鍙蜂綔涓篵illNo
 				this.formData.rbillNo = "鏃犳簮鍗�"; // 閫佹鎵规鍙凤紙浣跨敤榛樿鍊硷級
 				this.formData.itemModel = data.daa004 || ""; // 浜у搧瑙勬牸
-				this.formData.planQty = data.daa008 || ""; // 宸ュ崟鏁伴噺
+				this.formData.planQty = data.daa008 || ""; // 宸ュ崟鏁伴噺锛堜粎鏄剧ず锛�
+				this.formData.quantity = data.daa008 || ""; // 宸ュ崟鏁伴噺锛堜繚瀛樺埌鏁版嵁搴擄級
 				// 涓嶆竻绌洪�佹鏁伴噺锛屼繚鎸佺敤鎴峰凡杈撳叆鐨勫��
 				this.tableData = [];
 			},
 			// 閫佹鏁伴噺鍙樺寲浜嬩欢
-			onQuantityChange(event) {
+			onSjqtyChange(event) {
 				// 濡傛灉杈撳叆涓虹┖锛屼笉杩涜楠岃瘉
-				if (!this.formData.quantity || this.formData.quantity === "") {
+				if (!this.formData.sjqty || this.formData.sjqty === "") {
 					return;
 				}
 
-				const quantity = parseFloat(this.formData.quantity);
+				const sjqty = parseFloat(this.formData.sjqty);
 
 				// 妫�鏌ユ槸鍚︿负鏈夋晥鏁板瓧
-				if (isNaN(quantity)) {
+				if (isNaN(sjqty)) {
 					this.$showMessage("璇疯緭鍏ユ湁鏁堢殑鏁板瓧");
-					this.formData.quantity = "";
+					this.formData.sjqty = "";
 					return;
 				}
 
 				// 鍙湁鍦ㄨ緭鍏ュ畬鎴愪笖鏁伴噺澶т簬0鏃舵墠杩涜楠岃瘉
-				if (quantity <= 0) {
+				if (sjqty <= 0) {
 					this.$showMessage("閫佹鏁伴噺蹇呴』澶т簬0");
-					this.formData.quantity = "";
+					this.formData.sjqty = "";
 					return;
 				}
 
 				// 鍙湁鍦ㄥ凡閫夋嫨宸ュ崟涓旀湁宸ュ崟鏁伴噺鏃舵墠杩涜鏁伴噺姣旇緝
-				if (this.formData.planQty) {
-					const planQty = parseFloat(this.formData.planQty);
-					if (!isNaN(planQty) && quantity > planQty) {
+				if (this.formData.quantity || this.formData.planQty) {
+					const planQty = parseFloat(this.formData.quantity || this.formData.planQty);
+					if (!isNaN(planQty) && sjqty > planQty) {
 						this.$showMessage("閫佹鏁伴噺涓嶈兘澶т簬宸ュ崟鏁伴噺");
-						this.formData.quantity = "";
+						this.formData.sjqty = "";
 						return;
 					}
 				}
@@ -888,7 +894,8 @@
 						this.formData.itemNo = data.itemNo;
 						this.formData.itemId = data.itemId;
 						this.formData.lineNo = data.lineNo;
-						this.formData.quantity = data.quantity;
+						this.formData.quantity = data.quantity; // 宸ュ崟鏁伴噺
+						this.formData.sjqty = data.sjqty; // 閫佹鏁伴噺
 						this.formData.fcheckResu = data.fcheckResu;
 						this.formData.fcheckBy = data.fcheckBy;
 						this.formData.fcheckDate = data.fcheckDate;
@@ -1089,8 +1096,8 @@
 				});
 			},
 			getTable() {
-				// 纭繚quantity鏈夊��
-				if (!this.formData.quantity || parseFloat(this.formData.quantity) <= 0) {
+				// 纭繚sjqty鏈夊��
+				if (!this.formData.sjqty || parseFloat(this.formData.sjqty) <= 0) {
 					this.$showMessage("璇峰厛杈撳叆鏈夋晥鐨勯�佹鏁伴噺");
 					return;
 				}
@@ -1099,7 +1106,7 @@
 					url: "/RKJ/setJYItem",
 					data: {
 						itemNo: this.formData.itemNo,
-						quantity: this.formData.quantity
+						quantity: this.formData.sjqty
 					}
 				}).then(res => {
 

--
Gitblit v1.9.3