From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
index 3cc3260..f50b36f 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}"
@@ -114,13 +114,13 @@
:disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇烽�夋嫨鍒ゅ畾缁撴灉'"
:triggerChange="true"
- dictCode="judgment_result"
+ dictCode="technology_status"
v-decorator="['judgmentResult', validatorRules.judgmentResult]"
/>
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
@@ -143,7 +143,7 @@
</a-spin>
</a-modal>
</template>
-
+
<script>
import { getAction, postAction, postFileAction } from '@/api/manage'
import Vue from 'vue'
--
Gitblit v1.9.3