From 47fb16c999f25c08ec64d73abc1b8e709b8d71ad Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 18:09:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue b/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue
index e10a508..79820cf 100644
--- a/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue
+++ b/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue
@@ -43,9 +43,20 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+ <a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
+ :action="importSafetyEquipmentCheck"
@change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
+ <a-button type="primary" icon="import">瀹夊叏瑁呯疆妫�鏌ュ鍏�</a-button>
+ </a-upload>
+ <a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
+ :action="importPrecisionCheck"
+ @change="handleImportExcel">
+ <a-button type="primary" icon="import">璁惧绮惧害妫�鏌ュ鍏�</a-button>
+ </a-upload>
+ <a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
+ :action="importOtherCheck"
+ @change="handleImportExcel">
+ <a-button type="primary" icon="import">鍏朵粬妫�鏌ュ鍏�</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
@@ -153,17 +164,22 @@
align: 'center',
dataIndex: 'standardName'
},
- {
- title: '閴村畾鍛ㄦ湡锛堝勾锛�',
- align: 'center',
- dataIndex: 'evaluationPeriod',
- width: 150
- },
+ // {
+ // title: '閴村畾鍛ㄦ湡锛堝勾锛�',
+ // align: 'center',
+ // dataIndex: 'evaluationPeriod',
+ // width: 150
+ // },
{
title: '瑙勮寖鐘舵��',
align: 'center',
dataIndex: 'standardStatus_dictText',
width: 150
+ },
+ {
+ title: '鐗堟湰',
+ align: 'center',
+ dataIndex: 'standardVersion',
},
{
title: '鏄惁鏈夊畨鍏ㄨ缃鏌�',
@@ -196,13 +212,22 @@
url: {
list: '/eam/eamTechnicalStatusEvaluationStandard/list',
submit: '/eam/eamTechnicalStatusEvaluationStandard/submit',
- importExcelUrl: 'eam/eamTechnicalStatusEvaluationStandard/importExcel'
+ importSafetyEquipmentCheck: 'eam/eamTechnicalStatusEvaluationStandard/importSafetyEquipmentCheck',
+ importPrecisionCheck: 'eam/eamTechnicalStatusEvaluationStandard/importPrecisionCheck',
+ importOtherCheck: 'eam/eamTechnicalStatusEvaluationStandard/importOtherCheck',
+
}
}
},
computed: {
- importExcelUrl: function() {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ importSafetyEquipmentCheck: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importSafetyEquipmentCheck}`
+ },
+ importPrecisionCheck: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importPrecisionCheck}`
+ },
+ importOtherCheck: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importOtherCheck}`
}
},
methods: {
--
Gitblit v1.9.3