From eaff2fbd473362115c8c45e22b86b2ecb73e5a97 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 10 九月 2026 15:17:12 +0800
Subject: [PATCH] 新疆——新聚lims 1.标准库层级需要修改层级，行业-标准，总共两级；实验室换成行业 2.每个标准下的检验项列表加一个搜索查询功能
---
src/views/business/inspectionTask/components/InspectionWord.vue | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 89800da..bd71a78 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
@@ -1775,15 +1789,18 @@
checkSubmitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
+ reportType: this.reportType,
}).then(res => {
if (res.code === 200) {
- if (!res.data || res.data.length == 0) {
+ if (!res.data || res.data.errorMsg.length == 0) {
this.submitLoading = true;
submitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
- entrustCode: this.insOrder.entrustCode
+ entrustCode: this.insOrder.entrustCode,
+ registerInsResults: this.reportType === 1,
+ reportType: this.reportType
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -1798,12 +1815,12 @@
} else {
let newData = []
const h = this.$createElement
- for (let i in res.data) {
- const lastChar = res.data[i].slice(-1);
+ for (let i in res.data.errorMsg) {
+ const lastChar = res.data.errorMsg[i].slice(-1);
if (lastChar == '-') {
- res.data[i] = res.data[i].slice(0, -1);
+ res.data.errorMsg[i] = res.data.errorMsg[i].slice(0, -1);
}
- newData.push(h('p', { style: 'font-size: 14px;color: red;' }, (Number(i) + 1) + '銆�' + res.data[i]))
+ newData.push(h('p', { style: 'font-size: 14px;color: red;' }, (Number(i) + 1) + '銆�' + res.data.errorMsg[i]))
}
newData.push(h('p', { style: 'font-size: 16px;color:#000;margin-top:12px;overflow-y: auto;max-height:80vh' }, '浠ヤ笂椤圭洰涓嶅悎鏍硷紝纭畾鎻愪氦锛�'))
this.$confirm('鎻愮ず', {
@@ -1817,7 +1834,9 @@
submitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser
+ verifyUser: this.verifyUser,
+ registerInsResults: false,
+ reportType: this.reportType
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
--
Gitblit v1.9.3