From ccd5b8d5eebece61106ab8d36389d69357371ac5 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 26 三月 2025 14:38:49 +0800
Subject: [PATCH] art: 设备管理-设备台账-导出，导入，导入模板下载，铭牌修改
---
src/views/eam/equipment/modules/EamEquipmentModal.vue | 11 +----
src/views/eam/equipment/modules/NameplateModal.vue | 2
src/api/manage.js | 7 +++
src/views/eam/equipment/EamEquipmentList.vue | 48 +++++++++++++++++++++---
4 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/src/api/manage.js b/src/api/manage.js
index dc790e6..97937bd 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -269,3 +269,10 @@
return
}
}
+
+export function templateXlsDownload(fileUrl) {
+ let downloadUrl = getFileAccessHttpUrl(fileUrl)
+ if (downloadUrl) {
+ window.open(downloadUrl)
+ }
+}
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index 4073dd0..802b6ca 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -82,6 +82,7 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload>
+ <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="1" @click="batchDel">
@@ -167,8 +168,9 @@
import '@/assets/less/TableExpand.less'
import EamEquipmentModal from './modules/EamEquipmentModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { getAction } from '@api/manage'
+import { getAction, templateXlsDownload } from '@api/manage'
import NameplateModal from '@views/eam/equipment/modules/NameplateModal.vue'
+import { getSystemConfigValue } from '@api/api'
export default {
name: 'EamEquipmentList',
@@ -390,6 +392,26 @@
dataIndex: 'coordinateNum'
},
{
+ title: '鍒涘缓浜�',
+ align: "center",
+ dataIndex: 'createBy_dictText'
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: "center",
+ dataIndex: 'createTime',
+ },
+ {
+ title: '鏇存柊浜�',
+ align: "center",
+ dataIndex: 'updateBy_dictText'
+ },
+ {
+ title: '鏇存柊鏃堕棿',
+ align: "center",
+ dataIndex: 'updateTime',
+ },
+ {
title: '澶囨敞',
align: 'center',
width: 100,
@@ -410,9 +432,11 @@
deleteBatch: '/eam/equipment/deleteBatch',
exportXlsUrl: 'eam/equipment/exportXls',
importExcelUrl: 'eam/equipment/importExcel',
- loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions'
+ loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions',
+ templateXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鍙拌处瀵煎叆妯℃澘_v1.0.xlsx',
},
- treeData: []
+ treeData: [],
+ appHomeUrl: '',
}
},
computed: {
@@ -421,7 +445,8 @@
}
},
created() {
- this.loadAllProductionTree()
+ this.loadAllProductionTree();
+ this.loadAppHomeUrlConfigValue();
},
methods: {
loadAllProductionTree() {
@@ -441,10 +466,21 @@
*/
handleOpenNameplateModal(record) {
this.$refs.nameplateModalRef.model = Object.assign({}, record)
- this.$refs.nameplateModalRef.httpUrl = 'http://www.baidu.com'
+ this.$refs.nameplateModalRef.httpUrl = this.appHomeUrl + record.equipmentCode;
this.$refs.nameplateModalRef.visible = true
- }
+ },
+ handleTemplateXlsDownload(){
+ templateXlsDownload(this.url.templateXlsDownloadUrl);
+ },
+ loadAppHomeUrlConfigValue() {
+ let params = {settingKey: 'app_home_url'};
+ getSystemConfigValue(params).then(res => {
+ if (res.success) {
+ this.appHomeUrl = res.result.settingValue;
+ }
+ })
+ },
}
}
</script>
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index 83ae66a..2a07f73 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -189,7 +189,7 @@
</a-col>
<a-col :span="6">
<a-form-model-item prop="mdcFlag" label="鏄惁瀹炴柦MDC">
- <lx-switch checked-children='鏄�' un-checked-children='鍚�' @change="handleMdcFlagChange" v-model="model.mdcFlag" :disabled="disableSubmit"/>
+ <lx-switch checked-children='鏄�' un-checked-children='鍚�' v-model="model.mdcFlag" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
<a-col :span="6" v-if="model.mdcFlag === '1'">
@@ -238,6 +238,7 @@
import { getAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
+import { getSystemConfigValue } from '@api/api'
export default {
name: 'EamEquipmentModal',
@@ -370,14 +371,6 @@
}
})
},
- handleMdcFlagChange(checked){
- this.model.deviceType = '';
- if (checked) {
- this.validatorRules.deviceType[0].required = true
- } else {
- this.validatorRules.deviceType[0].required = false
- }
- }
}
}
</script>
diff --git a/src/views/eam/equipment/modules/NameplateModal.vue b/src/views/eam/equipment/modules/NameplateModal.vue
index 4ed53ff..af606bf 100644
--- a/src/views/eam/equipment/modules/NameplateModal.vue
+++ b/src/views/eam/equipment/modules/NameplateModal.vue
@@ -34,7 +34,7 @@
<tr>
<td>璁惧绠＄悊</td>
- <td>浣跨敤閮ㄩ棬</td>
+ <td>浣跨敤杞﹂棿</td>
<td>{{ model.orgId_dictText }}</td>
</tr>
--
Gitblit v1.9.3