From ffe01cb9dac3782f6f5f766a60491c12f5e42f19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 09:58:59 +0800
Subject: [PATCH] art: 设备管理-点检工单-确认意见
---
src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue | 144 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 116 insertions(+), 28 deletions(-)
diff --git a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
index 39ccbf6..8693a78 100644
--- a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
@@ -2,7 +2,7 @@
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
+ <div class="table-page-search-wrapper" v-if="isDisplayOperation">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -37,7 +37,7 @@
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator">
+ <div class="table-operator" v-if="isDisplayOperation">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
@@ -45,8 +45,8 @@
<a-icon type="delete" />
浣滃簾
</a-menu-item>
- <a-menu-item key="1" @click="handlerBatchCollect">
- <a-icon type="delete" />
+ <a-menu-item key="2" @click="handlerBatchCollect">
+ <a-icon type="form" />
棰嗗彇
</a-menu-item>
</a-menu>
@@ -58,7 +58,7 @@
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;" v-if="isDisplayOperation">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a
style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
@@ -74,6 +74,7 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
+ :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
@@ -106,6 +107,7 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<eamWeekMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"></eamWeekMaintenanceOrder-modal>
+ <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"></week-maintenance-approval-modal>
</a-card>
</template>
@@ -115,17 +117,27 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { deleteAction, getAction } from '@api/manage'
+import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
export default {
name: 'EamWeekMaintenanceOrderList',
mixins: [JeecgListMixin],
components: {
LxSearchEquipmentSelect,
- EamWeekMaintenanceOrderModal
+ EamWeekMaintenanceOrderModal,
+ WeekMaintenanceApprovalModal
+ },
+ props: {
+ isDisplayOperation: {
+ type: Boolean,
+ default: true
+ }
},
data() {
return {
description: '鍛ㄤ繚宸ュ崟绠＄悊椤甸潰',
+ disableMixinCreated: true,
+ selectWeekMaintenanceData:{},
// 琛ㄥご
columns: [
{
@@ -134,6 +146,7 @@
key: 'rowIndex',
width: 60,
align: 'center',
+ fixed: 'left',
customRender: function(t, r, index) {
return parseInt(index) + 1
}
@@ -141,80 +154,134 @@
{
title: '宸ュ崟鍙�',
align: 'center',
- dataIndex: 'orderNum'
+ dataIndex: 'orderNum',
+ fixed: 'left',
+ width: 60,
},
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentCode'
+ dataIndex: 'equipmentCode',
+ fixed: 'left',
+ width: 60,
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentName',
+ fixed: 'left',
+ width: 60,
},
{
title: '鏍囧噯鍚嶇О',
align: 'center',
- dataIndex: 'standardId_dictText'
+ dataIndex: 'standardId_dictText',
+ width: 100,
},
{
title: '璁″垝淇濆吇鏃ユ湡',
align: 'center',
- dataIndex: 'maintenanceDate'
+ dataIndex: 'maintenanceDate',
+ width: 60,
},
{
title: '瀹為檯寮�濮嬫椂闂�',
align: 'center',
- dataIndex: 'actualStartTime'
+ dataIndex: 'actualStartTime',
+ width: 60,
},
{
title: '瀹為檯缁撴潫鏃堕棿',
align: 'center',
- dataIndex: 'actualEndTime'
+ dataIndex: 'actualEndTime',
+ width: 60,
},
{
title: '淇濆吇浜�',
align: 'center',
- dataIndex: 'operator_dictText'
+ dataIndex: 'operator_dictText',
+ width: 60,
},
{
title: '淇濆吇鐘舵��',
align: 'center',
- dataIndex: 'maintenanceStatus_dictText'
+ dataIndex: 'maintenanceStatus_dictText',
+ width: 60,
},
{
title: '鍒涘缓鏂瑰紡',
align: 'center',
- dataIndex: 'creationMethod_dictText'
+ dataIndex: 'creationMethod_dictText',
+ width: 60,
},
{
title: '纭浜�',
align: 'center',
- dataIndex: 'confirmUser_dictText'
+ dataIndex: 'confirmUser_dictText',
+ width: 60,
},
{
title: '纭鏃堕棿',
align: 'center',
- dataIndex: 'confirmTime'
+ dataIndex: 'confirmTime',
+ width: 60,
},
{
- title: '淇濆吇鍥剧墖',
+ title: '纭鎰忚',
align: 'center',
- dataIndex: 'imageFiles'
+ dataIndex: 'confirmComment',
+ width: 60,
+ },
+ {
+ title: '鍒濋獙鏀朵汉',
+ align: 'center',
+ dataIndex: 'initialAcceptanceUser_dictText',
+ width: 60,
+ },
+ {
+ title: '鍒濋獙鏀舵椂闂�',
+ align: 'center',
+ dataIndex: 'initialAcceptanceTime',
+ width: 60,
+ },
+ {
+ title: '鍒濋獙鏀舵剰瑙�',
+ align: 'center',
+ dataIndex: 'initialAcceptanceComment',
+ width: 60,
+ },
+ {
+ title: '缁堥獙鏀朵汉',
+ align: 'center',
+ dataIndex: 'finalAcceptanceUser_dictText',
+ width: 60,
+ },
+ {
+ title: '缁堥獙鏀舵椂闂�',
+ align: 'center',
+ dataIndex: 'finalAcceptanceTime',
+ width: 60,
+ },
+ {
+ title: '缁堥獙鏀舵剰瑙�',
+ align: 'center',
+ dataIndex: 'finalAcceptanceComment',
+ width: 60,
},
{
title: '澶囨敞',
align: 'center',
dataIndex: 'remark',
- editable: true,
+ width: 60,
},
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: 'center',
- scopedSlots: { customRender: 'action' }
- }
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // align: 'center',
+ // fixed: 'right',
+ // width: 100,
+ // scopedSlots: { customRender: 'action' }
+ // }
],
url: {
list: '/eam/weekMaintenanceOrder/list',
@@ -223,6 +290,21 @@
collect: '/eam/weekMaintenanceOrder/collect',
}
}
+ },
+ created() {
+ if (!this.isDisplayOperation) {
+ return
+ }
+ const operationColumn = {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ fixed: 'right',
+ width: 147,
+ scopedSlots: { customRender: 'action' }
+ }
+ this.columns = [...this.columns, operationColumn]
+ this.loadData(1)
},
computed: {},
methods: {
@@ -309,7 +391,7 @@
this.$message.error("璇疯缃畊rl.collect灞炴��!")
return
}
- var that = this;
+ let that = this;
getAction(that.url.collect, {id: id}).then((res) => {
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
@@ -332,6 +414,12 @@
//鎵归噺棰嗗彇
handlerBatchCollect(){
+ },
+ handleDetail(record) {
+ this.selectWeekMaintenanceData = Object.assign({}, record)
+ this.$refs.weekMaintenanceApprovalModal.recordDetail(record)
+ this.$refs.weekMaintenanceApprovalModal.title = '璇︽儏';
+ this.$refs.weekMaintenanceApprovalModal.disableSubmit = true
}
}
}
--
Gitblit v1.9.3