From 025e5c58bfaeee5721b726fc2b960208d7540348 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 18 九月 2026 14:15:21 +0800
Subject: [PATCH] 新疆——新聚lims 1.按钮限制放开 2.检验单详情温湿度、检测时间、检测地方校验必填
---
src/views/business/inspectionTask/inspection.vue | 37 ++++++++++++++++++++++++-------------
src/views/business/productOrder/index.vue | 3 ---
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 749bdd3..6852d28 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -2249,10 +2249,33 @@
openAddCheck() {
this.addCheck = true;
},
+ // 鏀堕泦妯℃澘绾ф娴嬫潯浠剁殑缂哄け椤癸紙姣忎釜妯℃澘閮借濉叏锛�
+ getMissingConditions() {
+ const missing = [];
+ this.tableLists.forEach((m) => {
+ const form = this.otherForm[m.templateId] || {};
+ if (this.insOrder.ifsOrderType !== "02wg") {
+ if (!form.temperature) missing.push(`璇峰～鍐欍��${m.templateName}銆嶇殑娓╁害`);
+ if (!form.humidity) missing.push(`璇峰～鍐欍��${m.templateName}銆嶇殑婀垮害`);
+ }
+ if (!form.detectionTime) missing.push(`璇烽�夋嫨銆�${m.templateName}銆嶇殑妫�娴嬫椂闂碻);
+ if (!form.detectionPlace) missing.push(`璇峰～鍐欍��${m.templateName}銆嶇殑妫�娴嬪湴鐐筦);
+ if (!form.deviceIds || form.deviceIds.length === 0) {
+ missing.push(`璇烽�夋嫨銆�${m.templateName}銆嶇殑璁惧`);
+ }
+ });
+ return missing;
+ },
// 澶嶆牳
upInsReview(e) {
if (e == 1) {
// 閫氳繃
+ // 姣忎釜妯℃澘閮借鏈夋娴嬫潯浠讹紝缂轰竴涓嶅彲
+ const missing = this.getMissingConditions();
+ if (missing.length > 0) {
+ this.$message.error(missing[0]);
+ return;
+ }
// 姣忎釜妯℃澘閮借鏈夌粨璁猴紱鍏ㄩ儴鍚堟牸鎵嶇畻鏁村崟鍚堟牸
const insResults = this.tableLists.map(
(m) => (this.otherForm[m.templateId] || {}).insResult
@@ -2344,19 +2367,7 @@
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
return;
}
- const missing = [];
- this.tableLists.forEach((m) => {
- const form = this.otherForm[m.templateId] || {};
- if (this.insOrder.ifsOrderType !== "02wg") {
- if (!form.temperature) missing.push(`璇峰～鍐欍��${m.templateName}銆嶇殑娓╁害`);
- if (!form.humidity) missing.push(`璇峰～鍐欍��${m.templateName}銆嶇殑婀垮害`);
- }
- if (!form.detectionTime) missing.push(`璇烽�夋嫨銆�${m.templateName}銆嶇殑妫�娴嬫椂闂碻);
- if (!form.detectionPlace) missing.push(`璇峰～鍐欍��${m.templateName}銆嶇殑妫�娴嬪湴鐐筦);
- if (!form.deviceIds || form.deviceIds.length === 0) {
- missing.push(`璇烽�夋嫨銆�${m.templateName}銆嶇殑璁惧`);
- }
- });
+ const missing = this.getMissingConditions();
if (missing.length > 0) {
this.$message.error(missing[0]);
return;
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 69d9738..e6db73e 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -431,9 +431,6 @@
clickFun: (row) => {
this.download(row);
},
- disabled: (row, index) => {
- return row.state != 4 || row.reportId == null
- },
showHide: (row) => {
return this.tabIndex === 2 || this.tabIndex === 3 || this.tabIndex === 6
}
--
Gitblit v1.9.3