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/components/InspectionWord.vue | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 19b5037..54ddbd0 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -48,7 +48,7 @@
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')">
@@ -523,9 +523,7 @@
this.retestTag = '1'
}
this.getEquipOptions(1)
- if (this.sonLaboratory === '鏂拌仛') {
- this.loadDeviceOptions()
- }
+ this.loadDeviceOptions()
// 鑾峰彇褰撳墠鏍峰搧鐨勬楠岄」
let list = await this.getCurrentProduct(this.currentSample.id, 0)
if (list === undefined) {
@@ -1357,12 +1355,6 @@
})
}
},
- // 鏂拌仛鐩存帴缁戝畾妯℃澘鐨勫崟鎹紝璁惧鎸夋ā鏉块�夋嫨
- isDirectTemplateOrder() {
- return this.sonLaboratory === '鏂拌仛' &&
- Array.isArray(this.insOrder.templateConditions) &&
- this.insOrder.templateConditions.length > 0
- },
loadDeviceOptions() {
search({ status: 0 }).then(res => {
this.deviceOptions = (res.data || []).map(device => ({
@@ -1382,11 +1374,12 @@
upInsReview(e) {
if (e == 1) {
// 閫氳繃
+ // 姣忎釜妯℃澘閮借鏈夌粨璁猴紱鍏ㄩ儴鍚堟牸鎵嶇畻鏁村崟鍚堟牸
const insResults = this.tableLists.map(
item => (this.otherForm[item.templateId] || {}).insResult
)
const missingIndex = insResults.findIndex(result => result !== 0 && result !== 1)
- if (this.isDirectTemplateOrder() && missingIndex > -1) {
+ if (missingIndex > -1) {
this.$message.error(`璇烽�夋嫨銆�${this.tableLists[missingIndex].templateName}銆嶇殑妫�楠岀粨璁篳)
return
}
@@ -1397,9 +1390,7 @@
laboratory: this.sonLaboratory,
tell: null,
userId: this.checkUser,
- insResult: this.isDirectTemplateOrder()
- ? (insResults.every(result => result === 1) ? 1 : 0)
- : this.insOrder.insResult
+ insResult: insResults.every(result => result === 1) ? 1 : 0
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -1481,7 +1472,7 @@
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.deviceIds || form.deviceIds.length === 0) {
missing.push(`璇烽�夋嫨銆�${m.templateName}銆嶇殑璁惧`)
}
})
--
Gitblit v1.9.3