From 1540871d2efbcd6c89680e9d13724b2148ffd0ad Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 八月 2026 16:53:10 +0800
Subject: [PATCH] feat(inspection): 添加报告类型选择功能 - 在检测视图、检测任务和检测文档组件中新增报告类型下拉选择框 - 添加检测报告和检验报告两种选项供用户选择 - 在检验报告类型时对注册检测结果进行条件性处理
---
src/views/business/inspectionTask/components/InspectionWord.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 755730e..047d3aa 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -63,7 +63,7 @@
</template>
<template v-else-if="n.v.ps != undefined && n.v.ps.value === '缁撹'">
<el-select
- v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state == 1 && PROJECT == '瑁呭鐢电紗'"
+ v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state == 1"
v-model="n.v.v" class="table_input"
@change="m => changeInput(m, `${item.templateId}-${n.r}-${n.c}-${n.i}`, n, 'getDataType')">
<el-option :value="1" label="鍚堟牸"></el-option>
@@ -176,6 +176,15 @@
<el-select v-model="verifyUser" clearable filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
<el-option v-for="(item, i) in personList" :key="i" :label="item.label" :value="item.value">
</el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="body" style="display: flex;padding: 10px;align-items: center;">
+ <div class="search_label" style="width: 150px;"><span class="required-span">*</span>鎶ュ憡绫诲瀷</div>
+ <div class="search_input" style="width: 100%;">
+ <el-select v-model="reportType" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option label="妫�娴嬫姤鍛�" :value="0"></el-option>
+ <el-option label="妫�楠屾姤鍛�" :value="1"></el-option>
</el-select>
</div>
</div>
@@ -356,6 +365,7 @@
widthList: [],
addVerifyDia: false,
verifyUser: null,
+ reportType: null,
personList: [],
enumList: [],
tableLoading: false,
@@ -1763,6 +1773,10 @@
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�")
return
}
+ if (this.reportType === null || this.reportType === '') {
+ this.$message.error("璇烽�夋嫨鎶ュ憡绫诲瀷")
+ return
+ }
if (!this.otherForm.humidity) {
this.$message.error("璇疯緭鍏ユ箍搴�")
return
@@ -1783,7 +1797,8 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
- entrustCode: this.insOrder.entrustCode
+ entrustCode: this.insOrder.entrustCode,
+ reportType: this.reportType
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -1817,7 +1832,8 @@
submitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser
+ verifyUser: this.verifyUser,
+ reportType: this.reportType
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
--
Gitblit v1.9.3