From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点,若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 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