From d6723c2a0b2d5262ae156d71eadde66a884084eb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 17 九月 2026 15:15:16 +0800
Subject: [PATCH] 新疆——新聚lims 1.检验单详情展示修改 2.委托单详情展示优化
---
src/views/business/inspectionTask/inspection.vue | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 342b500..c05b7fa 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -177,7 +177,7 @@
</div>
<!-- 褰撳墠妫�楠屾ā鏉跨殑妫�娴嬫潯浠朵笌妫�楠岀粨璁� -->
<div class="template-panel">
- <el-form v-if="showTemplateConditions" :inline="true" :model="currentOtherForm" class="form-inline"
+ <el-form :inline="true" :model="currentOtherForm" class="form-inline"
size="small" label-width="84px">
<el-form-item v-if="insOrder.ifsOrderType!=='02wg'" label="娓╁害:">
<el-input v-model="currentOtherForm.temperature" :disabled="state > 1" placeholder="" size="small"
@@ -189,16 +189,16 @@
style="width: 90px" @change="(m) => subOtherForm(m, 'humidity')"></el-input>
<span class="template-panel__unit">%RH</span>
</el-form-item>
- <el-form-item v-if="insOrder.ifsOrderType!=='02wg'" label="妫�娴嬫椂闂�:">
+ <el-form-item label="妫�娴嬫椂闂�:">
<el-date-picker v-model="currentOtherForm.detectionTime" :disabled="state > 1" type="date"
value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鏃ユ湡" size="small" style="width: 160px"
@change="(m) => subOtherForm(m, 'detectionTime')"></el-date-picker>
</el-form-item>
- <el-form-item v-if="insOrder.ifsOrderType!=='02wg'" label="妫�娴嬪湴鐐�:">
+ <el-form-item label="妫�娴嬪湴鐐�:">
<el-input v-model="currentOtherForm.detectionPlace" :disabled="state > 1" clearable placeholder="璇疯緭鍏ユ娴嬪湴鐐�"
size="small" style="width: 200px" @change="(m) => subOtherForm(m, 'detectionPlace')"></el-input>
</el-form-item>
- <el-form-item v-if="isDirectTemplateOrder()" label="璁惧:">
+ <el-form-item label="璁惧:">
<el-select v-model="currentOtherForm.deviceIds" :disabled="state != 1" multiple filterable clearable
size="small" placeholder="璇烽�夋嫨璁惧" style="width: 360px"
@change="(m) => subOtherForm(m, 'deviceIds')">
@@ -207,8 +207,7 @@
</el-form-item>
</el-form>
<!-- 澶嶆牳鏃舵墠鑳介�� -->
- <el-form :inline="true" :model="currentOtherForm"
- :class="['form-inline', { 'template-panel__conclusion--divided': showTemplateConditions }]"
+ <el-form :inline="true" :model="currentOtherForm" class="form-inline template-panel__conclusion--divided"
size="small" label-width="84px">
<el-form-item label="妫�楠岀粨璁�:">
<el-radio-group v-model="currentOtherForm.insResult" :disabled="state != 2"
@@ -870,10 +869,6 @@
}
);
},
- // 02wg 鍗曟病鏈夋俯婀垮害锛涙柊鑱氱洿鎺ョ粦瀹氭ā鏉跨殑鍗曞彧鏈夎澶�
- showTemplateConditions() {
- return this.insOrder.ifsOrderType !== "02wg" || this.isDirectTemplateOrder();
- },
},
created() {
this.saveQueue = Promise.resolve();
@@ -1159,9 +1154,7 @@
this.rawMaterialTag = "1";
}
this.getEquipOptions(1);
- if (this.sonLaboratory === "鏂拌仛") {
- this.loadDeviceOptions();
- }
+ this.loadDeviceOptions();
// 鑾峰彇褰撳墠鏍峰搧鐨勬楠岄」
let list = await this.getCurrentProduct(this.currentSample.id, 0);
this.currentSample.insProduct = this.HaveJson(list);
@@ -2364,10 +2357,10 @@
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 (this.isDirectTemplateOrder() && (!form.deviceIds || form.deviceIds.length === 0)) {
+ 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}銆嶇殑璁惧`);
}
});
--
Gitblit v1.9.3