From f4711865a8ea9566910bfcc6daa31795b89272a7 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 09 七月 2025 10:11:57 +0800
Subject: [PATCH] 来料检优化

---
 pages/QC/LLJ/detail.vue |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pages/QC/LLJ/detail.vue b/pages/QC/LLJ/detail.vue
index 925e9db..3ad05ea 100644
--- a/pages/QC/LLJ/detail.vue
+++ b/pages/QC/LLJ/detail.vue
@@ -101,9 +101,9 @@
 						<view class="info-label">涓嶈壇鎻忚堪</view>
 						<view class="info-value danger">{{formData.funit}}</view>
 					</view>
-					<view v-if="formData.meom!=null" class="result-ng">
-						<view class="info-label">澶囨敞</view>
-						<view class="info-value danger">{{formData.meom}}</view>
+					<view class="result-ng">
+					    <view class="info-label">澶囨敞</view>
+					    <view class="info-value danger">{{formData.meom}}</view>
 					</view>
 				</view>
 			</view>
@@ -112,7 +112,7 @@
 			<view class="section">
 				<view class="section-header">妫�楠岀粨鏋滃綍鍏�</view>
 				<view class="section-body">
-					<view class="input-group" v-if="tableData.length >= formData.checkQyt">
+					<view class="input-group" v-if="tableData.length >= formData.checkQyt && formData.fstand == null">
 						<view class="input-wrapper">
 							<input v-model="batchInput" type="text" class="result-input"
 								placeholder="鏍煎紡锛歄K-3 鎴� NG-3锛堣鍕夸慨鏀圭粨鏋滀负鏁板瓧鐨勫�硷級" placeholder-class="placeholder"
@@ -230,7 +230,7 @@
 			        </form>
 			    </view>
 			</view>
-			<view v-if="showPopup" class="overlay">
+			<view v-if="showMeom" class="overlay">
 				<view class="popup">
 					<h3>淇敼妫�楠岀粨鏋�</h3>
 					<form :modelValue="editData">
@@ -239,7 +239,7 @@
 							<input class="form-input" type="text" v-model="editData.fcheckResu" />
 						</view>
 						<button type="warn" @click="eidt">淇敼</button>
-						<button @click="showPopup = !showPopup">鍙栨秷</button>
+						<button @click="showMeom = !showMeom">鍙栨秷</button>
 					</form>
 				</view>
 			</view>
@@ -275,6 +275,7 @@
 				isBatchInputValid: false,
 				funit:'',
 				meomPopup: false,
+				showMeom:false,
 				meom: '',
 			}
 		},
@@ -413,7 +414,11 @@
 						this.$showMessage("璇疯緭鍏ユ纭殑妫�楠屽��");
 						return;
 					}
-
+					
+					if (!/^-?\d+(\.\d+)?$/.test(this.formData.fcheckResu)) {
+					            this.$showMessage("璇疯緭鍏ユ纭殑鏁板�硷紒");
+					            return;
+					}
 					if (parseFloat(this.formData.fcheckResu) >= parseFloat(this.formData.fdownAllow) && parseFloat(this
 							.formData
 							.fcheckResu) <= parseFloat(this.formData.fupAllow)) {
@@ -483,6 +488,7 @@
 					} else {
 						this.isNumber = false;
 					}
+					
 				})
 			},
 			editResult(fcheckResu) {
@@ -494,20 +500,23 @@
 			},
 			toDetail(item) {
 				this.showPopup = !this.showPopup;
+				this.showMeom = !this.showMeom;
 				this.editData = item;
+				
 			},
 			upMeom() {
 			    this.meomPopup = true;
-			    this.meom = this.formData.meom || ''; // 鍒濆鍖栧娉ㄥ��
+			    
 			},
 			editMeom() {
 			    // 淇濆瓨澶囨敞淇℃伅
-			    if (this.Meom) {
+			    if (this.meom) {
 			        this.$post({
 			            url: "/LLJ/saveRemarksPid",
 			            data: {
 			                pid: this.formData.id,
-			                remarks: this.meom
+			                meom: this.meom,
+							
 			            }
 			        }).then(res => {
 			            if (res.data.tbBillList > 0) {
@@ -534,7 +543,7 @@
 			},
 			editRemarks() {
 				if (this.remarks) {
-					//saveRemarksGid
+					
 					this.$post({
 						url: "/LLJ/saveRemarksPid",
 						data: {
@@ -641,7 +650,7 @@
 				data: {
 					id: this.formID,
 					releaseNo: this.releaseNo,
-					meom:this.meom
+					
 				}
 			}).then(res1 => {
 				let tableData = res1.data.tbBillList

--
Gitblit v1.9.3