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/EquipmentListOfFilesCarousel.vue | 49 +++++++++++++++++++++----------------------------
1 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 85900d3..eeacfcf 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,40 +57,24 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +88,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
@@ -577,6 +560,16 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬�',
+ align: "center",
+ dataIndex: 'technologyStatus_dictText',
+ },
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
--
Gitblit v1.9.3