From 9e263d85631bb44574ca6750a101ad9ce96cab98 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 13 五月 2025 13:56:56 +0800
Subject: [PATCH] 来料检优化代码提交

---
 pages/QC/LLJ/detail.vue |   92 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/pages/QC/LLJ/detail.vue b/pages/QC/LLJ/detail.vue
index c3ee72e..3b8923b 100644
--- a/pages/QC/LLJ/detail.vue
+++ b/pages/QC/LLJ/detail.vue
@@ -97,9 +97,9 @@
 						<view class="info-value">{{formData.result}}</view>
 					</view>
 
-					<view v-if="formData.remarks!=null" class="result-ng">
+					<view v-if="formData.funit!=null" class="result-ng">
 						<view class="info-label">涓嶈壇鎻忚堪</view>
-						<view class="info-value danger">{{formData.remarks}}</view>
+						<view class="info-value danger">{{formData.funit}}</view>
 					</view>
 				</view>
 			</view>
@@ -108,7 +108,7 @@
 			<view class="section">
 				<view class="section-header">妫�楠岀粨鏋滃綍鍏�</view>
 				<view class="section-body">
-					<view class="input-group">
+					<view class="input-group input1">
 						<view class="input-wrapper">
 
 							<button class="btn upload-btn" @tap="chooseImage">
@@ -119,6 +119,29 @@
 								<uni-icons type="compose" size="16" color="#fff"></uni-icons>
 								涓嶈壇鎻忚堪
 							</button>
+							<input v-if="(tableData.length < formData.checkQyt)" @input="search($event)"
+								v-model="inputTxt" type="text" class="result-input" placeholder="璇疯緭鍏ユ楠岀粨鏋�..."
+								placeholder-class="placeholder" />
+							<button v-if="(tableData.length < formData.checkQyt)"
+								style="margin: 0px;background-color: #3498db;color:#ffffff ;" class="btn primary-btn"
+								@tap="saveResult">淇濆瓨缁撴灉</button>
+						</view>
+					</view>
+					
+					<view class="input-group input2">
+						<view class="input-wrapper">
+					
+							<button class="btn upload-btn" @tap="chooseImage">
+								<uni-icons type="upload" size="16" color="#fff"></uni-icons>
+								涓婁紶/鏌ョ湅鍥剧墖
+							</button>
+							<button v-if="this.current" class="btn upload-btn" @tap="upRemarks">
+								<uni-icons type="compose" size="16" color="#fff"></uni-icons>
+								涓嶈壇鎻忚堪
+							</button>
+						</view>
+						<view class="input-wrapper" style="margin-top: 15px;">
+						
 							<input v-if="(tableData.length < formData.checkQyt)" @input="search($event)"
 								v-model="inputTxt" type="text" class="result-input" placeholder="璇疯緭鍏ユ楠岀粨鏋�..."
 								placeholder-class="placeholder" />
@@ -161,7 +184,12 @@
 					<form>
 						<view class="form-group">
 							<label class="form-label">涓嶅悎鏍兼弿杩�:</label>
-							<input class="form-input" type="text" v-model="remarks" />
+							<!-- <input class="form-input" type="text" v-model="remarks" /> -->
+							
+							<picker @change="onRemarksChange" :value="RemarksIndex" :range="Remarks">
+								<view class="picker" style="height: 40px;">{{this.remarks}}</view>
+							</picker>
+							
 						</view>
 						<button class="updateBut" type="warn" @click="editRemarks">淇敼</button>
 						<button @click="remarksPopup = !remarksPopup">鍙栨秷</button>
@@ -207,7 +235,9 @@
 				inputTxt: '',
 				formID:'',
 				releaseNo:'',
-				current:false
+				current:false,
+				Remarks:[],
+				RemarksIndex:0
 			}
 		},
 		methods: {
@@ -219,6 +249,11 @@
 			//妫�娴嬭緭鍏ユ鐨勮緭鍏ワ紝骞剁粰鍙橀噺璧嬪��
 			search(event) {
 				this.formData.fcheckResu = event.detail.value;
+			
+			},
+			onRemarksChange(e) {
+				this.RemarksIndex = e.detail.value
+				this.remarks=this.Remarks[this.RemarksIndex];
 			},
 			toggleResult(item) {
 				let fstand = "鈭�";
@@ -240,7 +275,20 @@
 						updateBy: this.$loginInfo.account,
 					}
 				}).then(res => {
-					this.$showMessage("淇敼鎴愬姛");
+					if (item.fcheckResu == 'OK') {
+						uni.showModal({
+							title: "鎻愮ず",
+							content: "淇敼鎴愬姛!鍒ゅ畾涓嶅悎鏍煎悗闇�瑕佸~鍐欎笉鑹弿杩板苟涓婁紶鍥剧墖",
+							confirmText: "纭畾",
+							showCancel: false,
+							success: (res) => {
+								
+							}
+						})
+					}else{
+						this.$showMessage("淇敼鎴愬姛");
+					}
+					
 					this.refreshResult(); //鍒锋柊椤甸潰
 				})
 			},
@@ -325,7 +373,8 @@
 					}
 				}).then(res => {
 					this.formData = res.data.tbBillList.itemXj01;
-
+					this.remarks=this.formData.funit;
+					
 					this.tableData = res.data.tbBillList.itemXj02s;
 
 					if (this.formData.imageData) {
@@ -363,7 +412,7 @@
 						}
 					}).then(res => {
 						if (res.data.tbBillList > 0) {
-							this.formData.remarks = this.remarks;
+							this.formData.funit = this.remarks;
 							this.remarksPopup = !this.remarksPopup;
 							this.$showMessage("淇濆瓨鎴愬姛");
 						}
@@ -377,7 +426,7 @@
 						}
 					}).then(res => {
 						if (res.data.tbBillList > 0) {
-							this.formData.remarks = this.remarks;
+							this.formData.funit = this.remarks;
 							this.remarksPopup = !this.remarksPopup;
 							this.$showMessage("淇濆瓨鎴愬姛");
 						}
@@ -481,7 +530,14 @@
 				this.tableData.forEach((item, index) => {
 					this.set(item, 'current', this.current);
 				});
-				console.log(this.tableData);
+			})
+			
+			this.$post({
+				url: "/LLJ/getBlmsItem",
+				data: {
+				}
+			}).then(res1 => {
+				this.Remarks=res1.data;
 			})
 		}
 	}
@@ -722,4 +778,20 @@
 		background-color: #3498db;
 		color: white;
 	}
+ .input1{
+ 		   display: block;
+ }
+ .input2{
+ 		   display: none;
+ }
+	/* 鍝嶅簲寮忚璁� */
+	@media (max-width: 500px) {
+	   .input1{
+		   display: none;
+	   }
+	   .input2{
+		   display: block;
+	   }
+	}
+	
 </style>
\ No newline at end of file

--
Gitblit v1.9.3