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/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue b/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
index 3ec4a91..9138629 100644
--- a/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
@@ -72,7 +72,7 @@
                 <a-form-item
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
-                  label="瀵硅薄閮ㄩ棬"
+                  label="浣跨敤閮ㄩ棬"
                   class="hightColor"
                 >
                   <span
@@ -253,7 +253,7 @@
                         style="max-width:80px;font-size: 12px;font-style: italic;"
                       />
                       <a-select
-                        v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '2'"
+                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
                         :value="text"
                         :options="record.inspectionCycles"
                         @change="(e) => handleChange(e, record.key, col, index)"
@@ -262,7 +262,7 @@
                       />
                       <a-input-number
                         :value="text"
-                        v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '1'"
+                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
                         :min="0"
                         :max="200"
                         @change="(e)=>handleChange(e, record.key, col, index,record)"
@@ -825,7 +825,7 @@
       if (target) {
 
         if (column.dataIndex == 'inspectionProjectResult') {
-          if (target.analysisMethod === "1") {
+          if (target.testValueType == "1") {
             target[column.dataIndex] = value;
             let maxValue = target.maxValue
             let minValue = target.minValue

--
Gitblit v1.9.3