From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
index dc6f818..614a252 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
@@ -102,7 +102,7 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="24">
<a-form-item
:labelCol="{span:4}"
@@ -120,7 +120,7 @@
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
@@ -258,7 +258,7 @@
that.model = Object.assign({}, record);
that.fileList = [];
that.$nextTick(() => {
- that.form.setFieldsValue({ num: record.num, fileType: record.type, judgmentResult: record.judgmentResult, remark: record.remark });
+ that.form.setFieldsValue({ num: record.num, fileType: record.type, name: record.name, remark: record.remark });
});
that.uploadId = ''
//鑾峰彇褰撳墠鏂囦欢瀵瑰簲闄勪欢
--
Gitblit v1.9.3