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/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue b/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
index a0d3da1..f94b14a 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
@@ -38,19 +38,19 @@
         </a-row>
         <a-row style='width: 100%'>
           <a-col :span='12'>
-            <a-form-model-item label='涓诲崟浣�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
+            <a-form-model-item label='鍗曚綅' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
               <!--              <a-input v-model='model.mainUnitId' placeholder='璇疯緭鍏ヤ富鍗曚綅' />-->
               <j-dict-select-tag
                 allow-clear
-                :placeholder="'璇烽�夋嫨涓诲崟浣�'"
+                :placeholder="'璇烽�夋嫨鍗曚綅'"
                 v-model='model.departId'
                 dictCode="mom_base_unit,name,id,del_flag!='1'"
               />
             </a-form-model-item>
           </a-col>
-          <a-col :span='12'>
+<!--          <a-col :span='12'>
             <a-form-model-item label='杈呭崟浣�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='auxiliaryUnitId'>
-              <!--              <a-input v-model='model.auxiliaryUnitId' placeholder='璇疯緭鍏ヨ緟鍗曚綅' />-->
+              &lt;!&ndash;              <a-input v-model='model.auxiliaryUnitId' placeholder='璇疯緭鍏ヨ緟鍗曚綅' />&ndash;&gt;
               <j-dict-select-tag
                 allow-clear
                 :placeholder="'璇烽�夋嫨杈呭崟浣�'"
@@ -58,7 +58,7 @@
                 dictCode="mom_base_unit,name,id,del_flag!='1'"
               />
             </a-form-model-item>
-          </a-col>
+          </a-col>-->
         </a-row>
         <a-row style='width: 100%'>
           <a-col :span='12'>

--
Gitblit v1.9.3