From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue | 80 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 31 deletions(-)
diff --git a/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue b/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue
index e10a508..b200121 100644
--- a/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue
+++ b/src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue
@@ -43,26 +43,26 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<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-dropdown v-if="selectedRowKeys.length > 0">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel">
- <a-icon type="delete"/>
- 鍒犻櫎
- </a-menu-item>
- </a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
- <a-icon type="down"/>
- </a-button>
- </a-dropdown>
+ <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>
</div>
<!-- table鍖哄煙-begin -->
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
- :pagination="ipagination" :loading="loading" @change="handleTableChange">
+ :scroll="{x:'max-content'}" :pagination="ipagination" :loading="loading" @change="handleTableChange">
<!--鏄惁鏈夊畨鍏ㄨ缃鏌�-->
<template slot="hasSafetyEquipmentCheck" slot-scope="text">
@@ -87,10 +87,16 @@
<a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="handleSubmit(record)">
<a @click.stop="event=>event.stopPropagation()">鎻愪氦</a>
</a-popconfirm>
+ <a-divider type="vertical"/>
</template>
- <a @click="handleUpgrade(record)" v-if="record.standardStatus=='ENABLE'">鍗囩増</a>
- </span>
+ <template v-if="record.standardStatus=='ENABLE'">
+ <a @click="handleUpgrade(record)">鍗囩増</a>
+ <a-divider type="vertical"/>
+ </template>
+
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </span>
</a-table>
<!-- table鍖哄煙-end -->
@@ -144,6 +150,12 @@
dataIndex: 'equipmentModel'
},
{
+ title: '瑙勮寖鐘舵��',
+ align: 'center',
+ dataIndex: 'standardStatus_dictText',
+ width: 150
+ },
+ {
title: '瑙勮寖缂栫爜',
align: 'center',
dataIndex: 'standardCode'
@@ -154,55 +166,60 @@
dataIndex: 'standardName'
},
{
- title: '閴村畾鍛ㄦ湡锛堝勾锛�',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'evaluationPeriod',
- width: 150
- },
- {
- title: '瑙勮寖鐘舵��',
- align: 'center',
- dataIndex: 'standardStatus_dictText',
- width: 150
+ dataIndex: 'standardVersion',
+ width: 100
},
{
title: '鏄惁鏈夊畨鍏ㄨ缃鏌�',
align: 'center',
dataIndex: 'hasSafetyEquipmentCheck',
scopedSlots: { customRender: 'hasSafetyEquipmentCheck' },
- width: 150
+ width: 200
},
{
title: '鏄惁鏈夎澶囩簿搴︽鏌�',
align: 'center',
dataIndex: 'hasPrecisionCheck',
scopedSlots: { customRender: 'hasPrecisionCheck' },
- width: 150
+ width: 200
},
{
title: '鏄惁鏈夊叾浠栨鏌�',
align: 'center',
dataIndex: 'hasOtherCheck',
scopedSlots: { customRender: 'hasOtherCheck' },
- width: 150
+ width: 200
},
{
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ fixed: 'right',
+ width: 200,
scopedSlots: { customRender: 'action' }
}
],
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: {
@@ -227,6 +244,7 @@
handleUpgrade(record) {
this.$refs.modalForm.edit(record, true)
this.$refs.modalForm.title = '鍗囩増'
+ this.$refs.modalForm.disableSubmit = false
}
}
}
--
Gitblit v1.9.3