From 825172fe39308a3c8a36c4bece5aba7c8761b0db Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 22 十月 2026 20:28:19 +0800
Subject: [PATCH] fix: 完善检验设备显示与报告印章提示
---
src/views/standard/model/index.vue | 2 ++
src/views/business/inspectionTask/components/InspectionWord.vue | 11 ++++++++++-
src/views/business/reportPreparation/index.vue | 5 ++++-
src/views/business/inspectionView/index.vue | 11 ++++++++++-
src/views/business/inspectionTask/inspection.vue | 12 ++++++++++--
5 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 0effd09..f8469d6 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -45,7 +45,8 @@
</el-form-item>
<el-form-item label="璁惧:">
<el-select v-model="currentOtherForm.deviceIds" :disabled="state != 1" multiple filterable clearable
- size="small" placeholder="璇烽�夋嫨璁惧" style="width: 360px"
+ class="device-select" size="small" placeholder="璇烽�夋嫨璁惧"
+ style="width: 360px !important; min-width: 360px; flex: 0 0 360px"
@change="m => subOtherForm(m, 'deviceIds')">
<el-option v-for="device in deviceOptions" :key="device.id" :label="device.label"
:value="device.id" />
@@ -1798,6 +1799,14 @@
flex: none;
}
+/* 璁惧涓嬫媺鍥哄畾瀹藉害锛岀姝㈣琛屽唴甯冨眬鍘嬬缉锛屽惁鍒欓�変腑鍐呭涓嶅彲瑙� */
+.template-panel:deep(.device-select) {
+ display: inline-block !important;
+ width: 360px !important;
+ min-width: 360px;
+ flex: 0 0 360px;
+}
+
.template-panel__unit {
margin-left: 4px;
color: var(--lims-text-2);
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 1031214..4c7cafe 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -187,7 +187,8 @@
</el-form-item>
<el-form-item label="璁惧:">
<el-select v-model="currentOtherForm.deviceIds" :disabled="state != 1" multiple filterable clearable
- size="small" placeholder="璇烽�夋嫨璁惧" style="width: 360px"
+ class="device-select" size="small" placeholder="璇烽�夋嫨璁惧"
+ style="width: 360px !important; min-width: 360px; flex: 0 0 360px"
@change="(m) => subOtherForm(m, 'deviceIds')">
<el-option v-for="device in orderDeviceOptions" :key="device.id" :label="device.label" :value="device.id" />
</el-select>
@@ -1910,7 +1911,6 @@
temperature: form.temperature == null ? null : form.temperature,
detectionTime: form.detectionTime || null,
detectionPlace: form.detectionPlace || null,
- deviceIds: Array.isArray(form.deviceIds) ? [...form.deviceIds] : [],
});
}));
} catch (error) {
@@ -2324,6 +2324,14 @@
flex: none;
}
+/* 璁惧涓嬫媺鍥哄畾瀹藉害锛岀姝㈣琛屽唴甯冨眬鍘嬬缉锛屽惁鍒欓�変腑鍐呭涓嶅彲瑙� */
+.template-panel:deep(.device-select) {
+ display: inline-block !important;
+ width: 360px !important;
+ min-width: 360px;
+ flex: 0 0 360px;
+}
+
.template-panel__unit {
margin-left: 4px;
color: var(--lims-text-2);
diff --git a/src/views/business/inspectionView/index.vue b/src/views/business/inspectionView/index.vue
index 958bafa..f14d47d 100644
--- a/src/views/business/inspectionView/index.vue
+++ b/src/views/business/inspectionView/index.vue
@@ -155,7 +155,8 @@
</el-form-item>
<el-form-item label="璁惧:">
<el-select v-model="currentOtherForm.deviceIds" :disabled="state != 1" multiple filterable clearable
- placeholder="璇烽�夋嫨璁惧" size="small" style="width: 360px"
+ class="device-select" placeholder="璇烽�夋嫨璁惧" size="small"
+ style="width: 360px !important; min-width: 360px; flex: 0 0 360px"
@change="m => subOtherForm(m, 'deviceIds')">
<el-option v-for="device in orderDeviceOptions" :key="device.id" :label="device.label"
:value="device.id" />
@@ -2540,6 +2541,14 @@
flex: none;
}
+/* 璁惧涓嬫媺鍥哄畾瀹藉害锛岀姝㈣琛屽唴甯冨眬鍘嬬缉锛屽惁鍒欓�変腑鍐呭涓嶅彲瑙� */
+.template-panel:deep(.device-select) {
+ display: inline-block !important;
+ width: 360px !important;
+ min-width: 360px;
+ flex: 0 0 360px;
+}
+
.template-panel__unit {
margin-left: 4px;
color: var(--lims-text-2);
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 25bb717..0ea5aa2 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -165,7 +165,7 @@
<div v-else class="seal-position-empty">璇ヤ綅缃笉鐩栫珷</div>
</div>
</div>
- <el-empty v-if="!sealLoading && sealOptions.length === 0" description="鏆傛棤鍚敤鍗扮珷锛岃鍏堝湪鍗扮珷绠＄悊涓淮鎶�" :image-size="54" />
+ <el-empty v-if="!sealLoading && sealOptions.length === 0" description="鏆傛棤鍚敤鍗扮珷锛岃鍏堝埌銆屽熀纭�閰嶇疆 鈫� 鍗扮珷绠＄悊銆嶆柊澧炲苟鍚敤鍗扮珷" :image-size="54" />
</div>
<template #footer><span class="dialog-footer">
<el-button :disabled="loadingApprove" @click="approveReasonVisible = true">涓嶆壒鍑�</el-button>
@@ -1060,6 +1060,9 @@
},
// 鎵瑰噯閫氳繃
subApprove() {
+ if (!this.sealOptions.length) {
+ return this.$message.error('鏆傛棤鍚敤鐨勫嵃绔狅紝璇峰厛鍒般�屽熀纭�閰嶇疆 鈫� 鍗扮珷绠＄悊銆嶆柊澧炲苟鍚敤鍗扮珷')
+ }
const selectedIds = Object.values(this.selectedSealPositions).filter(id => id != null)
if (!selectedIds.length) {
return this.$message.error('璇疯嚦灏戜负涓�涓綅缃�夋嫨鍗扮珷')
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index d4e0274..9293e02 100644
--- a/src/views/standard/model/index.vue
+++ b/src/views/standard/model/index.vue
@@ -247,6 +247,8 @@
break;
case "缂栬緫":
params.thing = this.copyForm.thing ? this.copyForm.thing : "";
+ // 浠锋牸鐣欑┖浠嶆寜 0 淇濆瓨锛涙ā鏉跨紪鍒朵繚瀛樹笉浼犱环鏍硷紝闇�鐢卞悗绔繚鎸佸師鍊�
+ params.price = params.price == null ? 0 : params.price;
upStandardTemplate(params)
.then((res) => {
this.isShowCopyTem = false;
--
Gitblit v1.9.3