From ae9b400eae985f6b6f2e33f66ee1575f72675898 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 09 八月 2025 00:18:41 +0800
Subject: [PATCH] 添加流程节点
---
src/views/eam/base/EamMaintenanceStandardList.vue | 125 ++++++++++++++++++++++++++++++-----------
1 files changed, 92 insertions(+), 33 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index 5f8eec9..ffc3205 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -44,29 +44,31 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ <a-button v-has="'standard:add'" @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
<a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
:action="inspectionImportExcel"
@change="handleImportExcel">
- <a-button type="primary" icon="import">鐐规鏍囧噯瀵煎叆</a-button>
+ <a-button v-has="'standard:pointInspection'" type="primary" icon="import">鐐规鏍囧噯瀵煎叆</a-button>
</a-upload>
- <a-button type="primary" icon="download" @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)">
+ <a-button v-has="'standard:pointInspectionDownload'" type="primary" icon="download"
+ @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)">
鐐规鏍囧噯妯℃澘涓嬭浇
</a-button>
<a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
:action="secondMaintenanceImportExcel"
@change="handleImportExcel">
- <a-button type="primary" icon="import">浜屼繚鏍囧噯瀵煎叆</a-button>
+ <a-button v-has="'standard:secondMaintenance'" type="primary" icon="import">浜屼繚鏍囧噯瀵煎叆</a-button>
</a-upload>
- <a-button type="primary" icon="download"
+ <a-button v-has="'standard:secondMaintenanceDownload'" type="primary" icon="download"
@click="handleTemplateXlsDownload(url.secondMaintenanceXlsDownloadUrl)">浜屼繚鏍囧噯妯℃澘涓嬭浇
</a-button>
<a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
:action="thirdMaintenanceImportExcel"
@change="handleImportExcel">
- <a-button type="primary" icon="import">涓変繚鏍囧噯瀵煎叆</a-button>
+ <a-button v-has="'standard:ThirdMaintenance'" type="primary" icon="import">涓変繚鏍囧噯瀵煎叆</a-button>
</a-upload>
- <a-button type="primary" icon="download" @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)">
+ <a-button v-has="'standard:ThirdMaintenanceDownload'" type="primary" icon="download"
+ @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)">
涓変繚鏍囧噯妯℃澘涓嬭浇
</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -91,27 +93,46 @@
</div>
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
- :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
+ :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :customRow='clickThenSelect'
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a v-if="record.standardStatus === 'START'" @click.stop="handleUpgrade(record)">鍗囩増</a>
+ <a v-has="'standard:upgrade'" v-if="record.standardStatus === 'START'"
+ @click.stop="handleUpgrade(record)">鍗囩増</a>
+
+ <a-divider v-has="'standard:add:upgrade'" v-if="record.standardStatus === 'START'" type="vertical"/>
+
+ <a v-has="'standard:add:upgrade'" v-if="record.standardStatus === 'START'" @click="handleAddUpgrade(record.id)" >鍗囩増瀵煎叆</a>
<template v-if="record.standardStatus === 'WAIT_SUBMIT'">
- <a @click.stop="handleEdit(record)">缂栬緫</a>
+ <a v-has="'standard:edit'" @click.stop="handleEdit(record)">缂栬緫</a>
- <a-divider type="vertical"/>
+ <a-divider v-has="'standard:edit'" type="vertical"/>
- <a-popconfirm title="纭畾鍙戣捣娴佺▼鍚�?" @confirm="() => startProcess(record.id)">
- <a @click.stop="event=>event.stopPropagation()">鍙戣捣娴佺▼</a>
+ <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => startProcess(record.id)">
+ <a v-has="'standard:saveFlow'" @click.stop="event=>event.stopPropagation()">鎻愪氦</a>
</a-popconfirm>
- <a-divider type="vertical"/>
+ <a-divider v-has="'standard:saveFlow'" type="vertical"/>
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
- <a @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
+ <a v-has="'standard:del'" @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
</a-popconfirm>
+ </template>
+
+ <template v-if="record.standardStatus !== 'WAIT_SUBMIT'">
+ <a-divider v-has="'standard:delete'" type="vertical" v-if="record.standardStatus=='START'"/>
+
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a v-has="'standard:delete'" @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
+ </a-popconfirm>
+ </template>
+
+ <template>
+ <a-divider type="vertical"/>
+
+ <a @click.stop="handleDetail(record)">璇︽儏</a>
</template>
</span>
</a-table>
@@ -149,6 +170,12 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<eamMaintenanceStandard-modal ref="modalForm" @ok="modalFormOk"/>
+
+ <!--瀹℃壒绐楀彛-->
+ <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" :selectShenpiData="selectedRowData"/>
+
+ <!--瀵煎叆鏂囦欢-->
+ <MaintenanceStandardImportModule ref="fileImportModule" @ok="getTreeDataByApi" />
</a-card>
</template>
@@ -159,6 +186,9 @@
import EamMaintenanceStandardDetailList from '@views/eam/base/modules/EamMaintenanceStandardDetailList'
import { deleteAction, getAction, templateXlsDownload } from '@api/manage'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
+ import MaintenanceStandardApprovalModal
+ from '../../flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal'
+ import MaintenanceStandardImportModule from "@views/base/modules/file/MaintenanceStandardImportModule.vue";
export default {
@@ -171,6 +201,8 @@
}
},
components: {
+ MaintenanceStandardImportModule,
+ MaintenanceStandardApprovalModal,
LxSearchEquipmentSelect,
EamMaintenanceStandardModal,
EamMaintenanceStandardDetailList
@@ -179,22 +211,28 @@
return {
description: '淇濆吇瑙勮寖椤甸潰',
disableMixinCreated: true,
+ selectedRowData: {},
// 琛ㄥご
columns: [
{
title: '缁熶竴缂栫爜',
align: 'center',
- dataIndex: 'equipmentCode'
+ dataIndex: 'equipmentCode',
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentName',
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'equipmentModel'
+ dataIndex: 'equipmentModel',
+ },
+ {
+ title: '瑙勮寖鐘舵��',
+ align: 'center',
+ dataIndex: 'standardStatus_dictText',
},
{
title: '淇濆吇鍒嗙被',
@@ -217,30 +255,21 @@
title: '淇濆吇鍛ㄦ湡',
align: 'center',
dataIndex: 'maintenancePeriod',
- width: 100
},
{
title: '淇濆吇鍛ㄦ湡鍗曚綅',
align: 'center',
dataIndex: 'periodUnit',
- width: 120
},
{
title: '鍒濆鏃ユ湡',
align: 'center',
dataIndex: 'initialDate',
- width: 100
- },
- {
- title: '瑙勮寖鐘舵��',
- align: 'center',
- dataIndex: 'standardStatus_dictText'
},
{
title: '瑙勮寖鐗堟湰',
align: 'center',
dataIndex: 'standardVersion',
- width: 100
}
],
url: {
@@ -252,10 +281,9 @@
inspectionImportExcel: '/eam/maintenanceStandard/importPointInspection',
secondMaintenanceImportExcel: '/eam/maintenanceStandard/importSecondMaintenanceStandard',
thirdMaintenanceImportExcel: '/eam/maintenanceStandard/importThirdMaintenanceStandard',
- inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/鐐规鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
- weekMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鍛ㄤ繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
- secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/浜屼繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx',
- thirdMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/涓変繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx'
+ inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鐐规鏍囧噯瀵煎叆妯℃澘.xlsx',
+ secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鐢熶骇璁惧浜岀骇淇濆吇瑙勮寖.docx',
+ thirdMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鐢熶骇璁惧涓夌骇淇濆吇瑙勮寖.docx'
},
standardId: '-1'
}
@@ -279,7 +307,9 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
- scopedSlots: { customRender: 'action' }
+ scopedSlots: { customRender: 'action' },
+ width: 200,
+ fixed: 'right'
}
this.columns = [...this.columns, operationColumn]
this.loadData(1)
@@ -345,13 +375,42 @@
})
},
+ /**
+ * 鐐瑰嚮鍗囩増鏃惰Е鍙戞椂瑙﹀彂
+ * @param record
+ */
handleUpgrade(record) {
- //鍗囩増
this.$refs.modalForm.upgrade(record)
this.$refs.modalForm.title = '鍗囩増'
this.$refs.modalForm.disableSubmit = false
},
+ /**
+ * 鐐瑰嚮璇︽儏鏃惰Е鍙戞椂瑙﹀彂
+ * @param record
+ */
+ handleDetail(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.maintenanceStandardApprovalModal.title = '璇︽儏'
+ this.$refs.maintenanceStandardApprovalModal.disableSubmit = true
+ this.$refs.maintenanceStandardApprovalModal.visible = true
+ this.$refs.maintenanceStandardApprovalModal.handleDetail(record)
+ },
+
+ /**
+ * 鐐瑰嚮鍗囩増瀵煎叆鏃惰Е鍙戞椂瑙﹀彂
+ * @param record
+ */
+ handleAddUpgrade(id){
+ this.$refs.fileImportModule.upload(id);
+ this.$refs.fileImportModule.title="鍗囩増瀵煎叆"
+ },
+
+
+ getTreeDataByApi(){
+ this.loadData();
+ },
+
batchDel() {
var ids = ''
for (var a = 0; a < this.selectedRowKeys.length; a++) {
--
Gitblit v1.9.3