From 4dfdc774c2e742764848177e44e75b7de518f285 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 15 九月 2025 19:46:19 +0800
Subject: [PATCH] 设备台账导入
---
src/views/eam/equipment/modules/EamEquipmentModal.vue | 21 +++++-----
src/views/eam/base/EamProcessParametersList.vue | 2
src/views/eam/base/EamMaintenanceStandardList.vue | 54 ++++++++++++++-------------
src/views/eam/equipment/EamEquipmentList.vue | 30 +++++++-------
4 files changed, 55 insertions(+), 52 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index 9c270f6..63de293 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -123,11 +123,11 @@
icon="import"
>鐐规鏍囧噯瀵煎叆</a-button>
</a-upload>
- <a-button
- type="primary"
- icon="download"
- @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)"
- >鐐规鏍囧噯妯℃澘涓嬭浇</a-button>
+<!-- <a-button-->
+<!-- type="primary"-->
+<!-- icon="download"-->
+<!-- @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)"-->
+<!-- >鐐规鏍囧噯妯℃澘涓嬭浇</a-button>-->
<a-upload
name="file"
:showUploadList="false"
@@ -141,11 +141,11 @@
icon="import"
>瀛ｄ繚鏍囧噯瀵煎叆</a-button>
</a-upload>
- <a-button
- type="primary"
- icon="download"
- @click="handleTemplateXlsDownload(url.secondMaintenanceXlsDownloadUrl)"
- >瀛ｄ繚鏍囧噯妯℃澘涓嬭浇</a-button>
+<!-- <a-button-->
+<!-- type="primary"-->
+<!-- icon="download"-->
+<!-- @click="handleTemplateXlsDownload(url.secondMaintenanceXlsDownloadUrl)"-->
+<!-- >瀛ｄ繚鏍囧噯妯℃澘涓嬭浇</a-button>-->
<a-upload
name="file"
:showUploadList="false"
@@ -159,11 +159,11 @@
icon="import"
>骞翠繚鏍囧噯瀵煎叆</a-button>
</a-upload>
- <a-button
- type="primary"
- icon="download"
- @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)"
- >骞翠繚鏍囧噯妯℃澘涓嬭浇</a-button>
+<!-- <a-button-->
+<!-- type="primary"-->
+<!-- icon="download"-->
+<!-- @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)"-->
+<!-- >骞翠繚鏍囧噯妯℃澘涓嬭浇</a-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item
@@ -340,11 +340,11 @@
align: 'center',
dataIndex: 'fileCode'
},
- {
- title: '淇濆吇鍛ㄦ湡(澶�)',
- align: 'center',
- dataIndex: 'maintenancePeriod'
- },
+ // {
+ // title: '淇濆吇鍛ㄦ湡(澶�)',
+ // align: 'center',
+ // dataIndex: 'maintenancePeriod'
+ // },
{
title: '鍒濆鏃ユ湡',
align: 'center',
@@ -383,9 +383,14 @@
deleteBatch: '/eam/maintenanceStandard/deleteBatch',
exportXlsUrl: 'eam/maintenanceStandard/exportXls',
inspectionImportExcel: 'eam/maintenanceStandard/inspectionImportExcel',
- weekMaintenanceImportExcel: 'eam/maintenanceStandard/weekMaintenanceImportExcel',
- secondMaintenanceImportExcel: 'eam/maintenanceStandard/secondMaintenanceImportExcel',
- thirdMaintenanceImportExcel: 'eam/maintenanceStandard/thirdMaintenanceImportExcel',
+ /**
+ * 瀛ｄ繚
+ */
+ secondMaintenanceImportExcel: 'eam/maintenanceStandard/maintenanceImportExcel',
+ /**
+ * 骞翠繚
+ */
+ thirdMaintenanceImportExcel: 'eam/maintenanceStandard/annualMaintenanceImportExcel',
inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/鐐规鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
weekMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鍛ㄤ繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/浜屼繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
@@ -400,9 +405,6 @@
computed: {
inspectionImportExcel: function () {
return `${window._CONFIG['domianURL']}/${this.url.inspectionImportExcel}`
- },
- weekMaintenanceImportExcel: function () {
- return `${window._CONFIG['domianURL']}/${this.url.weekMaintenanceImportExcel}`
},
secondMaintenanceImportExcel: function () {
return `${window._CONFIG['domianURL']}/${this.url.secondMaintenanceImportExcel}`
diff --git a/src/views/eam/base/EamProcessParametersList.vue b/src/views/eam/base/EamProcessParametersList.vue
index 1736c69..ede4816 100644
--- a/src/views/eam/base/EamProcessParametersList.vue
+++ b/src/views/eam/base/EamProcessParametersList.vue
@@ -6,7 +6,7 @@
<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="鍙傛暟缂栫爜4444">
+ <a-form-item label="鍙傛暟缂栫爜">
<j-input placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" v-model="queryParam.parameterCode"></j-input>
</a-form-item>
</a-col>
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index 923380a..cc98fef 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -289,7 +289,7 @@
<eam-week-maintenance-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>
</a-tab-pane>-->
<a-tab-pane
- tab="浜屼繚宸ュ崟"
+ tab="瀛ｆ姤宸ュ崟"
:key="3"
>
<eam-second-maintenance-order-list
@@ -298,7 +298,7 @@
/>
</a-tab-pane>
<a-tab-pane
- tab="涓変繚宸ュ崟"
+ tab="骞翠繚宸ュ崟"
:key="4"
>
<eam-third-maintenance-order-list
@@ -344,15 +344,15 @@
:isDisplayOperation="false"
/>
</a-tab-pane>
- <a-tab-pane
- tab="璁惧娌规恫"
- :key="9"
- >
- <eam-equipment-fluid-list
- ref="tabPaneTableListRef9"
- :isDisplayOperation="false"
- />
- </a-tab-pane>
+<!-- <a-tab-pane-->
+<!-- tab="璁惧娌规恫"-->
+<!-- :key="9"-->
+<!-- >-->
+<!-- <eam-equipment-fluid-list-->
+<!-- ref="tabPaneTableListRef9"-->
+<!-- :isDisplayOperation="false"-->
+<!-- />-->
+<!-- </a-tab-pane>-->
</a-tabs>
<!-- 琛ㄥ崟鍖哄煙 -->
@@ -377,25 +377,25 @@
import '@/assets/less/TableExpand.less'
import EamEquipmentModal from './modules/EamEquipmentModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { getAction, templateXlsDownload } from '@api/manage'
+import { getAction } 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'
import EamRepairOrderList from '../repair/EamRepairOrderList'
-// import EamInspectionOrderList from '../maintenance/EamInspectionOrderList'
+import EamInspectionOrderList from '../maintenance/EamInspectionOrderList'
import EamEquipmentAttachmentList from '@views/eam/equipment/EamEquipmentAttachmentList.vue'
// import EamWeekMaintenanceOrderList from '@views/eam/maintenance/EamWeekMaintenanceOrderList.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'
-import EamEquipmentFluidList from '@views/eam/equipment/modules/EamEquipmentFluidList.vue'
import { hasPermission } from '@/utils/hasPermission' // 娣诲姞杩欎竴琛�
export default {
name: 'EamEquipmentList',
mixins: [JeecgListMixin],
components: {
+ EamInspectionOrderList,
EamMaintenanceStandardList,
ResumeDrawer,
NameplateModal,
@@ -403,7 +403,7 @@
EamEquipmentAttachmentList,
EamEquipmentProcessList,
EamEquipmentPrecisionList,
- EamEquipmentFluidList
+
},
data() {
return {
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index 8c3454f..8a3ccfb 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -50,11 +50,16 @@
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item prop="equipmentType"
- label="璁惧绉嶇被">
- <j-tree-dict placeholder="璇烽�夋嫨璁惧绉嶇被" v-model="model.equipmentType" parent-code="equipment_category" field="code" :async="true" :disabled="disableSubmit"></j-tree-dict>
+ <a-form-model-item prop="overallDimensions" label="澶栧舰灏哄">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ褰㈠昂瀵�'" v-model="model.overallDimensions" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+<!-- <a-col :span="8">-->
+<!-- <a-form-model-item prop="equipmentType"-->
+<!-- label="璁惧绉嶇被">-->
+<!-- <j-tree-dict placeholder="璇烽�夋嫨璁惧绉嶇被" v-model="model.equipmentType" parent-code="equipment_category" field="code" :async="true" :disabled="disableSubmit"></j-tree-dict>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
</a-row>
<a-row>
<a-col :span="8">
@@ -97,11 +102,7 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ラ噸閲�'" v-model="model.equipmentWeight" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- <a-col :span="6">
- <a-form-model-item prop="overallDimensions" label="澶栧舰灏哄">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ褰㈠昂瀵�'" v-model="model.overallDimensions" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
+
</a-row>
<a-row :gutter="24">
@@ -183,12 +184,12 @@
<a-row :gutter="24">
<a-col :span="6">
- <a-form-model-item prop="orgId" label="浣跨敤杞﹂棿">
+ <a-form-model-item prop="orgId" label="鎵�灞炰骇绾�">
<a-tree-select v-model="model.orgId"
style="width: 100%"
:tree-data="treeData"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
- placeholder="璇烽�夋嫨浣跨敤杞﹂棿"
+ placeholder="璇烽�夋嫨鎵�灞炰骇绾�"
allow-clear
tree-default-expand-all
:disabled="editable || disableSubmit"
--
Gitblit v1.9.3