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 | 20 ++++++++++++++++++--
src/views/business/inspectionView/index.vue | 18 ++++++++++++++++++
src/views/business/inspectionTask/inspection.vue | 19 ++++++++++++++++++-
3 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 89800da..047d3aa 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -179,6 +179,15 @@
</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>
<span slot="footer" class="dialog-footer">
<el-button @click="addVerifyDia = false">鍙� 娑�</el-button>
<el-button :loading="submitLoading" type="primary" @click="submit()">纭� 瀹�</el-button>
@@ -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("鎿嶄綔鎴愬姛")
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 62d0464..bf67066 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -447,6 +447,17 @@
</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>
<span slot="footer" class="dialog-footer">
<el-button @click="addVerifyDia = false">鍙� 娑�</el-button>
<el-button :loading="submitLoading" type="primary" @click="submit()">纭� 瀹�</el-button>
@@ -721,6 +732,7 @@
widthList: [],
addVerifyDia: false,
verifyUser: null,
+ reportType: null,
personList: [],
enumList: [],
tableLoading: false,
@@ -2751,7 +2763,8 @@
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
entrustCode: this.insOrder.entrustCode,
- registerInsResults: registerInsResults
+ registerInsResults: this.reportType === 1 && registerInsResults,
+ reportType: this.reportType
}).then((res) => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -2770,6 +2783,10 @@
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
return;
}
+ if (this.reportType === null || this.reportType === "") {
+ this.$message.error("璇烽�夋嫨鎶ュ憡绫诲瀷");
+ return;
+ }
if (!this.otherForm.humidity && this.insOrder.ifsOrderType!=='02wg') {
this.$message.error("璇疯緭鍏ユ箍搴�");
return;
diff --git a/src/views/business/inspectionView/index.vue b/src/views/business/inspectionView/index.vue
index c7f43c5..aed573d 100644
--- a/src/views/business/inspectionView/index.vue
+++ b/src/views/business/inspectionView/index.vue
@@ -401,6 +401,17 @@
</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>
<span slot="footer" class="dialog-footer">
<el-button @click="addVerifyDia = false">鍙� 娑�</el-button>
<el-button :loading="submitLoading" type="primary" @click="submit()">纭� 瀹�</el-button>
@@ -614,6 +625,7 @@
widthList: [],
addVerifyDia: false,
verifyUser: null,
+ reportType: null,
personList: [],
enumList: [],
tableLoading: false,
@@ -2556,6 +2568,10 @@
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
return;
}
+ if (this.reportType === null || this.reportType === "") {
+ this.$message.error("璇烽�夋嫨鎶ュ憡绫诲瀷");
+ return;
+ }
if (!this.otherForm.humidity) {
this.$message.error("璇疯緭鍏ユ箍搴�");
return;
@@ -2577,6 +2593,7 @@
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
entrustCode: this.insOrder.entrustCode,
+ reportType: this.reportType,
}).then((res) => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -2628,6 +2645,7 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
+ reportType: this.reportType,
}).then((res) => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
--
Gitblit v1.9.3