From 8d24d963f8b82163685c34b816998a904f08234d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 13:39:35 +0800
Subject: [PATCH] feat: 新聚-下单到检验
---
src/views/business/inspectionTask/components/InspectionWord.vue | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 666c720..19b5037 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -57,6 +57,16 @@
</el-select>
</el-form-item>
</el-form>
+ <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"
+ @change="m => subOtherForm(m, 'insResult')">
+ <el-radio :label="1">鍚堟牸</el-radio>
+ <el-radio :label="0">涓嶅悎鏍�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
</div>
<!-- 甯歌妫�楠屽師濮嬭褰� -->
<div id="tableBox" v-loading="tableLoading" class="center-box">
@@ -458,7 +468,8 @@
humidity: null,
detectionTime: null,
detectionPlace: null,
- deviceIds: []
+ deviceIds: [],
+ insResult: null
}
}
},
@@ -504,7 +515,8 @@
humidity: item.humidity != null ? item.humidity : null,
detectionTime: item.detectionTime != null ? item.detectionTime : null,
detectionPlace: item.detectionPlace != null ? item.detectionPlace : null,
- deviceIds: Array.isArray(item.deviceIds) ? [...item.deviceIds] : []
+ deviceIds: Array.isArray(item.deviceIds) ? [...item.deviceIds] : [],
+ insResult: item.insResult != null ? item.insResult : null
})
})
if (this.typeSource == '1') {
@@ -1347,8 +1359,9 @@
},
// 鏂拌仛鐩存帴缁戝畾妯℃澘鐨勫崟鎹紝璁惧鎸夋ā鏉块�夋嫨
isDirectTemplateOrder() {
- return this.sonLaboratory === '鏂拌仛' && this.currentSample &&
- (this.currentSample.insProduct || []).some(product => product.templateRowIndex != null)
+ return this.sonLaboratory === '鏂拌仛' &&
+ Array.isArray(this.insOrder.templateConditions) &&
+ this.insOrder.templateConditions.length > 0
},
loadDeviceOptions() {
search({ status: 0 }).then(res => {
@@ -1369,13 +1382,24 @@
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) {
+ this.$message.error(`璇烽�夋嫨銆�${this.tableLists[missingIndex].templateName}銆嶇殑妫�楠岀粨璁篳)
+ return
+ }
this.reviewLoading = true;
verifyPlan({
orderId: this.orderId,
type: 1,
laboratory: this.sonLaboratory,
tell: null,
- userId: this.checkUser
+ userId: this.checkUser,
+ insResult: this.isDirectTemplateOrder()
+ ? (insResults.every(result => result === 1) ? 1 : 0)
+ : this.insOrder.insResult
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -1423,7 +1447,8 @@
humidity: null,
detectionTime: null,
detectionPlace: null,
- deviceIds: []
+ deviceIds: [],
+ insResult: null
})
}
},
@@ -1817,6 +1842,11 @@
color: #606266;
}
+.template-panel__conclusion--divided {
+ border-top: 1px dashed #e4e7ed;
+ padding-top: 12px;
+}
+
.center {
width: calc(100% - 40px);
/* max-height: 580px; */
--
Gitblit v1.9.3