From 1cb38dbdb58bc3966453ca43585140323e50d1b8 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 20 八月 2025 09:15:51 +0800
Subject: [PATCH] 1、二、三保工单增加批量打印及导出完工单和验收单功能 2、二保工单审批流程图展示增加滚动条 3、html导出成excel工具方法增加单元格换行展示以及自适应换行高度功能
---
src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue | 118 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 38 deletions(-)
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index 3880652..e5a267a 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -39,26 +39,47 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" v-if="isDisplayOperation">
<a-button v-has="'secondMaintenanceOrder:add'" @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button v-has="'secondMaintenanceOrder:batchAdd'" @click="handleBatchAdd" type="primary" icon="plus">鎵归噺鏂板</a-button>
- <a-dropdown v-if="selectedRowKeys.length > 0">
- <a-menu slot="overlay">
- <a-menu-item v-has="'secondMaintenanceOrder:batchAbolish'" key="1" @click="handlerBatchAbolish">
- <a-icon type="delete"/>
- 浣滃簾
- </a-menu-item>
- <a-menu-item v-has="'secondMaintenanceOrder:batchCollect'" key="2" @click="handlerBatchCollect">
- <a-icon type="form"/>
- 棰嗗彇
- </a-menu-item>
- <a-menu-item v-has="'secondMaintenanceOrder:batchRestore'" key="3" @click="handlerBatchRestore">
- <a-icon type="reload"/>
- 杩樺師
- </a-menu-item>
- </a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
- <a-icon type="down"/>
- </a-button>
- </a-dropdown>
+ <a-button v-has="'secondMaintenanceOrder:batchAdd'" @click="handleBatchAdd" type="primary" icon="plus">鎵归噺鏂板
+ </a-button>
+ <a-button v-has="'secondMaintenanceOrder:batchAbolish'" @click="handlerBatchAbolish" type="primary"
+ icon="delete" :disabled="selectedRowKeys.length===0">
+ 鎵归噺浣滃簾
+ </a-button>
+ <a-button v-has="'secondMaintenanceOrder:batchCollect'" @click="handlerBatchCollect" type="primary" icon="form"
+ :disabled="selectedRowKeys.length===0">
+ 鎵归噺棰嗗彇
+ </a-button>
+ <a-button v-has="'secondMaintenanceOrder:batchRestore'" @click="handlerBatchRestore" type="primary"
+ :disabled="selectedRowKeys.length===0"
+ icon="reload">
+ 鎵归噺杩樺師
+ </a-button>
+ <a-button v-has="'secondMaintenanceOrder:batchAdd'" @click="handleBatchPrint" type="primary" icon="monitor"
+ :disabled="selectedRowKeys.length===0">鎵归噺棰勮
+ </a-button>
+ <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item v-has="'secondMaintenanceOrder:batchAbolish'" key="1" @click="handlerBatchAbolish">
+ <a-icon type="delete"/>
+ 浣滃簾
+ </a-menu-item>
+ <a-menu-item v-has="'secondMaintenanceOrder:batchCollect'" key="2" @click="handlerBatchCollect">
+ <a-icon type="form"/>
+ 棰嗗彇
+ </a-menu-item>
+ <a-menu-item v-has="'secondMaintenanceOrder:batchRestore'" key="3" @click="handlerBatchRestore">
+ <a-icon type="reload"/>
+ 杩樺師
+ </a-menu-item>
+ <a-menu-item key="4" @click="handleBatchPrint">
+ <a-icon type="monitor"/>
+ 棰勮
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>-->
</div>
@@ -79,7 +100,8 @@
<a-divider v-has="'secondMaintenanceOrder:edit'" type="vertical"/>
- <a-popconfirm v-has="'secondMaintenanceOrder:collect'" title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)">
+ <a-popconfirm v-has="'secondMaintenanceOrder:collect'" title="纭畾棰嗗彇鍚�?"
+ @confirm="() => handlerCollect(record.id)">
<a>棰嗗彇</a>
</a-popconfirm>
@@ -89,7 +111,8 @@
<a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item>
- <a-popconfirm v-has="'secondMaintenanceOrder:abolish'" title="纭畾浣滃簾鍚�?" @confirm="() => handlerAbolish(record.id)">
+ <a-popconfirm v-has="'secondMaintenanceOrder:abolish'" title="纭畾浣滃簾鍚�?"
+ @confirm="() => handlerAbolish(record.id)">
<a>浣滃簾</a>
</a-popconfirm>
</a-menu-item>
@@ -104,14 +127,16 @@
<a @click="handleDetail(record)">璇︽儏</a>
- <a-divider v-has="'secondMaintenanceOrder:restore'" v-if="record.maintenanceStatus === 'ABOLISH'" type="vertical"/>
+ <a-divider v-has="'secondMaintenanceOrder:restore'" v-if="record.maintenanceStatus === 'ABOLISH'"
+ type="vertical"/>
- <a-popconfirm v-has="'secondMaintenanceOrder:restore'" v-if="record.maintenanceStatus === 'ABOLISH'" title="纭畾杩樺師鍚�?" @confirm="() => handlerRestore(record.id)">
+ <a-popconfirm v-has="'secondMaintenanceOrder:restore'" v-if="record.maintenanceStatus === 'ABOLISH'"
+ title="纭畾杩樺師鍚�?" @confirm="() => handlerRestore(record.id)">
<a>杩樺師</a>
</a-popconfirm>
-<!-- <a-divider v-has="'secondMaintenanceOrder:print'" type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>-->
-<!-- <a v-has="'secondMaintenanceOrder:print'" v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">鎵撳嵃</a>-->
+ <a-divider type="vertical"/>
+ <a @click="handlePrint(record)">棰勮</a>
</template>
</span>
</a-table>
@@ -121,10 +146,15 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<eamSecondMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"/>
+ <!--鎵归噺鏂板-->
<eam-second-maintenance-batch-order-modal ref="batchModalForm" @ok="modalFormOk"/>
+ <!--瀹℃壒寮圭獥-->
<second-maintenance-approval-modal ref="secondMaintenanceApprovalModal"
:selectShenpiData="selectSecondMaintenanceData"/>
+
+ <!--鎵归噺鎵撳嵃寮圭獥-->
+ <eam-second-maintenance-order-batch-print-modal ref="batchPrintModal"/>
</a-card>
</template>
@@ -136,11 +166,13 @@
from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
import EamSecondMaintenanceBatchOrderModal from './modules/EamSecondMaintenanceBatchOrderModal'
+ import EamSecondMaintenanceOrderBatchPrintModal from './modules/EamSecondMaintenanceOrderBatchPrintModal'
export default {
name: 'EamSecondMaintenanceOrderList',
mixins: [JeecgListMixin],
components: {
+ EamSecondMaintenanceOrderBatchPrintModal,
EamSecondMaintenanceBatchOrderModal,
LxSearchEquipmentSelect,
EamSecondMaintenanceOrderModal,
@@ -189,6 +221,12 @@
fixed: 'left'
},
{
+ title: '淇濆吇鐘舵��',
+ align: 'center',
+ dataIndex: 'maintenanceStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'orderNum'
@@ -222,11 +260,6 @@
title: '缁翠慨宸�',
align: 'center',
dataIndex: 'repairman_dictText'
- },
- {
- title: '淇濆吇鐘舵��',
- align: 'center',
- dataIndex: 'maintenanceStatus_dictText'
},
{
title: '鍒涘缓鏂瑰紡',
@@ -263,10 +296,10 @@
list: '/eam/secondMaintenanceOrder/list',
abolish: '/eam/secondMaintenanceOrder/abolish',
collect: '/eam/secondMaintenanceOrder/collect',
- restore:'/eam/secondMaintenanceOrder/restore',
+ restore: '/eam/secondMaintenanceOrder/restore',
abolishBatch: '/eam/secondMaintenanceOrder/abolishBatch',
collectBatch: '/eam/secondMaintenanceOrder/collectBatch',
- restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch',
+ restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch'
}
}
},
@@ -288,7 +321,7 @@
methods: {
handleBatchAdd() {
this.$refs.batchModalForm.title = '鎵归噺鏂板'
- this.$refs.batchModalForm.visible = true
+ this.$refs.batchModalForm.add()
},
/**
@@ -325,7 +358,7 @@
this.$refs.secondMaintenanceApprovalModal.title = '璇︽儏'
this.$refs.secondMaintenanceApprovalModal.visible = true
this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
- this.$refs.secondMaintenanceApprovalModal.recordDetail(record)
+ this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
},
/**
@@ -333,9 +366,10 @@
* @param record 鍒楄〃琛岃褰�
*/
handlePrint(record) {
- let href = `${window._CONFIG['domianURL']}/jmreport/view/1094834721929232384?id=` + record.id //缃戠珯閾炬帴
+ let href = `${window._CONFIG['domianURL']}/jmreport/view/1110733537193545728?id=` + record.id //缃戠珯閾炬帴
window.open(href, '_blank')
},
+
handlerAbolish(id) {
var that = this
deleteAction(that.url.abolish, { id })
@@ -387,8 +421,9 @@
}
})
},
+
//杩樺師
- handlerRestore(id){
+ handlerRestore(id) {
let that = this
this.loading = true
getAction(that.url.restore, { id })
@@ -408,8 +443,9 @@
}
})
},
+
//鎵归噺杩樺師
- handlerBatchRestore(){
+ handlerBatchRestore() {
if (!this.url.restoreBatch) {
this.$message.error('璇疯缃畊rl.restoreBatch灞炴��!')
return
@@ -457,6 +493,7 @@
})
}
},
+
//鎵归噺棰嗗彇
handlerBatchCollect() {
if (!this.url.collectBatch) {
@@ -507,6 +544,11 @@
}
},
+ // 鎵归噺鎵撳嵃
+ handleBatchPrint() {
+ this.$refs.batchPrintModal.handlePreview(this.selectedRowKeys.join())
+ },
+
onMaintenanceDateChange: function(dataArray) {
this.queryParam.maintenanceDateBegin = dataArray[0]
this.queryParam.maintenanceDateEnd = dataArray[1]
--
Gitblit v1.9.3