From 5ec150affc0fc777b2a645a888d377f65501e08b Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 05 九月 2025 10:06:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/EamMaintenanceStandardList.vue | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index e1e7223..52406b7 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -96,9 +96,19 @@
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :customRow='clickThenSelect'
@change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryOrgCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<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 v-has="'standard:edit'" @click.stop="handleEdit(record)">缂栬緫</a>
@@ -117,12 +127,18 @@
</a-popconfirm>
</template>
- <template v-if="record.standardStatus != 'WAIT_SUBMIT'">
+ <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>
@@ -160,6 +176,12 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<eamMaintenanceStandard-modal ref="modalForm" @ok="modalFormOk"/>
+
+ <!--瀹℃壒绐楀彛-->
+ <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" :selectShenpiData="selectedRowData"/>
+
+ <!--瀵煎叆鏂囦欢-->
+ <MaintenanceStandardImportModule ref="fileImportModule" @ok="getTreeDataByApi" />
</a-card>
</template>
@@ -170,6 +192,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 {
@@ -182,6 +207,8 @@
}
},
components: {
+ MaintenanceStandardImportModule,
+ MaintenanceStandardApprovalModal,
LxSearchEquipmentSelect,
EamMaintenanceStandardModal,
EamMaintenanceStandardDetailList
@@ -190,22 +217,33 @@
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',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ },
+ {
+ title: '瑙勮寖鐘舵��',
+ align: 'center',
+ dataIndex: 'standardStatus_dictText',
},
{
title: '淇濆吇鍒嗙被',
@@ -228,30 +266,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: {
@@ -263,7 +292,7 @@
inspectionImportExcel: '/eam/maintenanceStandard/importPointInspection',
secondMaintenanceImportExcel: '/eam/maintenanceStandard/importSecondMaintenanceStandard',
thirdMaintenanceImportExcel: '/eam/maintenanceStandard/importThirdMaintenanceStandard',
- inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鐐规鏍囧噯瀵煎叆妯℃澘.xlsx',
+ inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鐐规鏍囧噯瀵煎叆妯℃澘.xls',
secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鐢熶骇璁惧浜岀骇淇濆吇瑙勮寖.docx',
thirdMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鐢熶骇璁惧涓夌骇淇濆吇瑙勮寖.docx'
},
@@ -290,7 +319,6 @@
dataIndex: 'action',
align: 'center',
scopedSlots: { customRender: 'action' },
- width: 200,
fixed: 'right'
}
this.columns = [...this.columns, operationColumn]
@@ -357,13 +385,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