From d3441881742c1397cd02f68c4b0de565456f97b1 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 02 七月 2025 14:02:54 +0800
Subject: [PATCH] 1、删除冗余代码 2、设备台账新增弹窗开发完成
---
src/views/eam/equipment/EamEquipmentLedger.vue | 248 ++++++++++++++++++++++---------------------------
1 files changed, 110 insertions(+), 138 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index e7af665..589f207 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -5,6 +5,12 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍏抽敭璁惧鏍囪瘑">
+ <j-dict-select-tag dict-code="equipment_importance" placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
+ v-model="queryParam.equipmentImportance"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="璁惧缂栧彿">
<a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentCode"></a-input>
</a-form-item>
@@ -14,39 +20,31 @@
<a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="queryParam.equipmentName"></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="绠＄悊鍒嗙被">
- <j-dict-select-tag dict-code="equipment_abc_flag" placeholder="璇烽�夋嫨绠＄悊鍒嗙被"
- v-model="queryParam.equipmentImportance"></j-dict-select-tag>
- </a-form-item>
- </a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璧勪骇鐘舵��">
- <j-dict-select-tag dict-code="asset_status" placeholder="璇烽�夋嫨璧勪骇鐘舵��"
- v-model="queryParam.assetStatus"></j-dict-select-tag>
+ <a-form-item label="鎵�灞炲垎绫�">
+ <j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨璁惧鎵�灞炲垎绫�"
+ v-model="queryParam.equipmentCategory"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧绫诲埆">
- <j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨璁惧绫诲埆"
- v-model="queryParam.equipmentCategory"></j-dict-select-tag>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="浣跨敤杞﹂棿">
- <a-tree-select v-model="queryParam.orgId"
- style="width: 100%"
- :tree-data="treeDataAlias"
- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
- placeholder="璇烽�夋嫨浣跨敤杞﹂棿"
- allow-clear
- tree-default-expand-all
+ <a-form-item label="浣跨敤閮ㄩ棬">
+ <a-tree-select v-model="queryParam.orgId" style="width: 100%" :tree-data="treeDataAlias" show-search
+ treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
+ allow-clear tree-default-expand-all
>
</a-tree-select>
</a-form-item>
</a-col>
-
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="缁翠慨鐝粍">
+ <a-tree-select v-model="queryParam.orgId" style="width: 100%" :tree-data="treeDataAlias"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ allow-clear tree-default-expand-all>
+ </a-tree-select>
+ </a-form-item>
+ </a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -74,7 +72,7 @@
<a-button type="primary" icon="download" @click="handleTemplateXlsDownload">瀵煎叆妯℃澘涓嬭浇</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="2" @click="batchDel" v-if="isShowAuth('eam:equipment:delete')">
+ <a-menu-item key="2" @click="batchDel">
<a-icon type="delete"/>
鍒犻櫎
</a-menu-item>
@@ -106,12 +104,10 @@
@change="handleTableChange"
:customRow="customTableRow"
>
- <span slot="processParametersFlag" slot-scope="text">
- <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/>
- </span>
- <span slot="precisionParametersFlag" slot-scope="text">
- <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/>
- </span>
+ <template slot="equipmentCode" slot-scope="text">
+ <a href="#" @click="handleDetail(record)" style="display: inline-block;height: 100%">{{text}}</a>
+ </template>
+
<span slot="action" slot-scope="text, record">
<a @click.stop="handleEdit(record)">缂栬緫</a>
@@ -125,7 +121,7 @@
<a-menu-item>
<a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
</a-menu-item>
- <a-menu-item v-if="isShowAuth('eam:equipment:delete')">
+ <a-menu-item>
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
<a>鍒犻櫎</a>
</a-popconfirm>
@@ -138,51 +134,44 @@
</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-tab-pane tab="璁惧娌规恫" :key="9">
- <eam-equipment-fluid-list ref="tabPaneTableListRef9" :isDisplayOperation="false"/>
- </a-tab-pane>
- </a-tabs>
+ <!--<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"></eamEquipment-modal>
- <!--閾墝寮圭獥-->
- <nameplate-modal ref="nameplateModalRef" :printedRows="printedRows"/>
+ <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :treeDataAlias="treeDataAlias"/>
<!--灞ュ巻寮圭獥-->
<resume-drawer ref="resumeDrawerRef" :currentTableRowRecord="currentTableRowRecord"/>
</a-card>
</template>
<script>
- import '@/assets/less/TableExpand.less'
import EamEquipmentModal from './modules/EamEquipmentModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction, templateXlsDownload } from '@api/manage'
- import NameplateModal from '@views/eam/equipment/modules/NameplateModal.vue'
import { getSystemConfigValue } from '@api/api'
import ResumeDrawer from '@views/eam/equipment/modules/ResumeDrawer.vue'
import EamMaintenanceStandardList from '@views/eam/base/EamMaintenanceStandardList.vue'
@@ -193,7 +182,6 @@
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'
- import EamEquipmentFluidList from '@views/eam/equipment/modules/EamEquipmentFluidList.vue'
export default {
name: 'EquipmentLedger',
@@ -203,14 +191,12 @@
EamRepairOrderList,
EamMaintenanceStandardList,
ResumeDrawer,
- NameplateModal,
EamEquipmentModal,
EamEquipmentAttachmentList,
EamEquipmentProcessList,
EamEquipmentPrecisionList,
EamSecondMaintenanceOrderList,
- EamThirdMaintenanceOrderList,
- EamEquipmentFluidList
+ EamThirdMaintenanceOrderList
},
data() {
return {
@@ -232,7 +218,7 @@
title: '鍏抽敭璁惧鏍囪瘑',
align: 'center',
width: 150,
- dataIndex: 'equipmentCode',
+ dataIndex: 'equipmentImportance',
fixed: 'left'
},
{
@@ -240,6 +226,7 @@
align: 'center',
width: 100,
dataIndex: 'equipmentCode',
+ scopedSlots: { customRender: 'equipmentCode' },
ellipsis: true,
fixed: 'left',
sorter: true
@@ -247,7 +234,6 @@
{
title: '璁惧鍚嶇О',
align: 'center',
- width: 100,
dataIndex: 'equipmentName',
ellipsis: true,
fixed: 'left'
@@ -255,233 +241,220 @@
{
title: '浣跨敤閮ㄩ棬',
align: 'center',
- width: 120,
- dataIndex: 'equipmentImportance_dictText'
- },
- {
- title: '涓績',
- align: 'center',
- width: 100,
- dataIndex: 'technologyStatus_dictText'
- },
- {
- title: '宸ュ尯',
- align: 'center',
- width: 100,
- dataIndex: 'technologyStatus_dictText'
- },
- {
- title: '宸ユ',
- align: 'center',
- width: 100,
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'factoryOrgCode'
},
{
title: '鎵�灞炲垎绫�',
align: 'center',
width: 100,
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'equipmentCategory'
},
{
- title: '璁惧鐘舵��',
+ title: '淇濆吇鐘舵��',
align: 'center',
width: 100,
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'maintenanceStatus_dicText'
+ },
+ {
+ title: '缁翠慨鐘舵��',
+ align: 'center',
+ width: 100,
+ dataIndex: 'repairStatus_dicText'
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: 'center',
+ width: 100,
+ dataIndex: 'technologyStatus_dicText'
},
{
title: 'ABC鏍囪瘑',
align: 'center',
width: 100,
- dataIndex: 'technologyStatus_dictText'
- },
- {
- title: '缁存姢閮ㄩ棬',
- align: 'center',
- width: 100,
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'abcFlag'
},
{
title: '缁翠慨鐝粍',
align: 'center',
width: 100,
- dataIndex: 'assetStatus_dictText'
+ dataIndex: 'repairDepartOrgCode'
},
{
title: '瀹夊叏閰嶇疆',
align: 'center',
width: 100,
- dataIndex: 'repairStatus_dictText'
+ dataIndex: 'securityConfiguration'
},
{
title: '鍐峰嵈绯荤粺',
align: 'center',
width: 100,
- dataIndex: 'maintenanceStatus_dictText'
+ dataIndex: 'coolSystem'
},
{
title: '鐏伀鍣�',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'fireExtinguisher'
},
{
title: '鐏伀鍣ㄦ湁鏁堟湡',
align: 'center',
width: 150,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'fireExtinguisherExpirationDate'
},
{
title: '鎿嶄綔绯荤粺',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'operationSystem'
},
{
title: '绯荤粺',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'system'
},
{
title: '璁惧绔彛',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'equipmentPort'
},
{
title: '鍧愭爣鏁伴噺',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'coordinateNum'
},
{
title: '閲嶉噺',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'equipmentWeight'
},
{
title: '閲嶉噺璁￠噺鍗曚綅',
align: 'center',
width: 150,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'weightUnit'
},
{
title: '鍔熻兘浣嶇疆',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'functionalLocation'
},
{
title: '瀹夎浣嶇疆',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'installationPosition'
},
{
title: '鍑哄巶鏃ユ湡',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'leaveFactoryDate'
},
{
title: '绔嬮」鍗″彿',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'cardNumber'
},
{
title: '璧勯噾鏉ユ簮',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'fundingSource'
},
{
title: '楠屾敹鏃ユ湡',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'acceptanceCheckDate'
},
{
title: '鍑哄巶缂栧彿',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'factoryNumber'
},
{
title: '璧勪骇鍒堕�犲晢',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'manufacturingEnterprise'
},
{
title: '璧勪骇鏉ユ簮鍥藉',
align: 'center',
width: 150,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'originCountry'
},
{
title: '鍨嬪彿',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'equipmentModel'
},
{
title: '璁惧瑙勬牸',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'equipmentSpecification'
},
{
title: '鎬诲姛鐜�',
align: 'center',
width: 100,
- dataIndex: 'equipmentManager_dictText'
+ dataIndex: 'equipmentPower'
},
{
title: '璐ㄤ繚寮�濮嬫棩鏈�',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'warrantyStartDate'
},
{
title: '璐ㄤ繚缁撴潫鏃ユ湡',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'warrantyEndDate'
},
{
title: '璧勪骇鐘舵��',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'assetStatus'
},
{
title: '鏈涓変繚鏃ユ湡',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'latestThirdMaintenance'
},
{
title: '涓嬫涓変繚鏃ユ湡',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'nextThirdMaintenance'
},
{
title: '涓変繚鍛ㄦ湡',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'thirdMaintenancePeriod'
},
{
title: '鏈鎶�鏈壌瀹氭棩鏈�',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'latestTechnologyCheck'
},
{
title: '涓嬫鎶�鏈壌瀹氭棩鏈�',
align: 'center',
- dataIndex: 'equipmentCategory_dictText'
+ dataIndex: 'nextTechnologyCheck'
},
{
title: '鎶�鏈壌瀹氬懆鏈�',
align: 'center',
- dataIndex: 'equipmentType_dictText'
+ dataIndex: 'technologyCheckPeriod'
},
{
title: '鎿嶄綔',
@@ -498,7 +471,7 @@
deleteBatch: '/eam/equipment/deleteBatch',
exportXlsUrl: 'eam/equipment/exportXls',
importExcelUrl: 'eam/equipment/importExcel',
- loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions',
+ getProductionTreeList: '/eam/BaseFactory/queryTreeList',
templateXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鍙拌处瀵煎叆妯℃澘_v1.1.xlsx'
},
treeData: [],
@@ -523,13 +496,12 @@
methods: {
loadAllProductionTree() {
//鍔犺浇杞﹂棿閫夋嫨鏍�
- getAction(this.url.loadProductionOptions).then(res => {
+ getAction(this.url.getProductionTreeList).then(res => {
if (res.success) {
this.treeData = [...res.result]
this.treeDataAlias = this.deepCopyAndModify(res.result)
- console.info('treeDataAlias====', this.treeDataAlias)
} else {
- that.$message.warning(res.message)
+ this.$message.warning(res.message)
}
})
},
--
Gitblit v1.9.3