From b0d4df5f39525ae7fe252e8ee65d85fd71dca721 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:53:32 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 012b6d4..441c17e 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -172,7 +172,7 @@
<el-dialog title="娣诲姞妫�楠岄」" :visible.sync="dialogVisible5" width="1000px">
<lims-table :tableData="tableData5" :column="column5"
:isSelection="true" :handleSelectionChange="selectMethod"
- height="540" :page="page5" :tableLoading="tableLoading5"
+ :height="400" :page="page5" :tableLoading="tableLoading5"
@pagination="pagination5"></lims-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible5 = false">鍙� 娑�</el-button>
@@ -268,11 +268,14 @@
{ label: "db", value: ".db" },
{ label: "mdb", value: ".mdb" },
{ label: "word", value: ".docx" },
- { label: "excelxlsx", value: ".xlsx" },
- { label: "excelxls", value: ".xls" },
+ { label: "excel(xlsx)", value: ".xlsx" },
+ { label: "excel(xls)", value: ".xls" },
+ { label: "pngInExcel", value: ".pngInExcel" },
{ label: "txt", value: ".txt" },
{ label: "mysql", value: ".mysql" },
{ label: "mqtt", value: ".mqtt" },
+ { label: "sqlserver", value: ".sqlserver" },
+ { label: "serialPort", value: ".serialPort" },
{ label: "png", value: ".png" }
],
spanList: [],
@@ -471,8 +474,8 @@
deviceId: this.deviceId,
inspectionItem: row.inspectionItem.trim(),
isDevice: true,
- inspectionItemSubclass: row.inspectionItemSubclass.trim(),
- inspectionItemClass: row.inspectionItemClass.trim(),
+ inspectionItemSubclass: row.inspectionItemSubclass?row.inspectionItemSubclass.trim():"",
+ inspectionItemClass: row.inspectionItemClass?row.inspectionItemClass.trim():"",
structureItemParameterId: row.structureItemParameterId
}).then(res => {
const data = res.data;
--
Gitblit v1.9.3