From 56148970959b7016cfe1c54ffa39dbd9bb9921ff Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 11 七月 2025 21:10:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/equipment/EamEquipmentLedger.vue | 62 +++---------------------------
1 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 6fa5133..4564585 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -151,34 +151,6 @@
</a-table>
</div>
<!-- table鍖哄煙-end -->
-
- <!--<a-tabs v-model="activeTabKey" @change="handleTabChange">-->
- <!--<a-tab-pane tab="璁惧鏂囨。" :key="1">-->
- <!--<eam-equipment-attachment-list ref="tabPaneTableListRef1"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="鐐规宸ュ崟" :key="2">-->
- <!--<eam-inspection-order-list ref="tabPaneTableListRef2" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="浜屼繚宸ュ崟" :key="3">-->
- <!--<eam-second-maintenance-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="涓変繚宸ュ崟" :key="4">-->
- <!--<eam-third-maintenance-order-list ref="tabPaneTableListRef4" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="缁翠慨宸ュ崟" :key="5">-->
- <!--<eam-repair-order-list ref="tabPaneTableListRef5" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="淇濆吇鏍囧噯" :key="6">-->
- <!--<eam-maintenance-standard-list ref="tabPaneTableListRef6" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="宸ヨ壓鍙傛暟" :key="7" v-if="isOpenProcess">-->
- <!--<eam-equipment-process-list ref="tabPaneTableListRef7" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="璁惧绮惧害" :key="8" v-if="isOpenPrecision">-->
- <!--<eam-equipment-precision-list ref="tabPaneTableListRef8" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--</a-tabs>-->
-
<!-- 琛ㄥ崟鍖哄煙 -->
<eamEquipment-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"
:repairDepartTreeData="repairDepartTreeData"/>
@@ -191,31 +163,14 @@
import EamEquipmentModal from './modules/EamEquipmentModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction, templateXlsDownload } from '@api/manage'
- import { getSystemConfigValue } from '@api/api'
import ResumeDrawer from '@views/eam/equipment/modules/ResumeDrawer.vue'
- import EamMaintenanceStandardList from '@views/eam/base/EamMaintenanceStandardList.vue'
- import EamRepairOrderList from '../repair/EamRepairOrderList'
- import EamInspectionOrderList from '../maintenance/EamInspectionOrderList'
- import EamEquipmentAttachmentList from '@views/eam/equipment/EamEquipmentAttachmentList.vue'
- import EamEquipmentProcessList from '@views/eam/equipment/modules/EamEquipmentProcessList.vue'
- import EamEquipmentPrecisionList from '@views/eam/equipment/modules/EamEquipmentPrecisionList.vue'
- import EamSecondMaintenanceOrderList from '@views/eam/maintenance/EamSecondMaintenanceOrderList.vue'
- import EamThirdMaintenanceOrderList from '@views/eam/maintenance/EamThirdMaintenanceOrderList.vue'
export default {
name: 'EquipmentLedger',
mixins: [JeecgListMixin],
components: {
- EamInspectionOrderList,
- EamRepairOrderList,
- EamMaintenanceStandardList,
ResumeDrawer,
EamEquipmentModal,
- EamEquipmentAttachmentList,
- EamEquipmentProcessList,
- EamEquipmentPrecisionList,
- EamSecondMaintenanceOrderList,
- EamThirdMaintenanceOrderList
},
data() {
return {
@@ -244,15 +199,18 @@
align: 'center',
dataIndex: 'equipmentCode',
scopedSlots: { customRender: 'equipmentCode' },
- ellipsis: true,
- fixed: 'left',
- sorter: true
+ fixed: 'left'
},
{
title: '璁惧鍚嶇О',
align: 'center',
dataIndex: 'equipmentName',
- ellipsis: true,
+ fixed: 'left'
+ },
+ {
+ title: '鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel',
fixed: 'left'
},
{
@@ -384,17 +342,11 @@
align: 'center',
dataIndex: 'manufacturingEnterprise',
scopedSlots: { customRender: 'manufacturingEnterprise' },
- ellipsis: true
},
{
title: '璧勪骇鏉ユ簮鍥藉',
align: 'center',
dataIndex: 'originCountry'
- },
- {
- title: '鍨嬪彿',
- align: 'center',
- dataIndex: 'equipmentModel'
},
{
title: '璁惧瑙勬牸',
--
Gitblit v1.9.3