From 20f77a55f8eeaceb026d1c5ad96de75d6edb712a Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 14:18:14 +0800
Subject: [PATCH] 1、报警分析页面报警页面调整比例饼图颜色 2、维修看板页面设备平均故障率柱状图Y轴去除%号以及去除柱子注释含义 3、设备管理页面新增弹窗添加禁止手输设备编号，新增安装位置字段（同时将MDC模块内所有设备名称显示调整为安装位置） 4、设备级看板页面的设备选择框新增安装位置显示 5、首页添加法士特沃克背景图 6、对比分析页面解决时间段查询选择框无法选择问题以及柱状图组件重置按钮关联设备树选择 7、OEE页面列表取消展示合格零件数量和加工零件数量字段，仅展示合格率字段
---
src/views/eam/repair/EamRepairOrderList.vue | 92 ++++++++++++++++++---------------------------
1 files changed, 37 insertions(+), 55 deletions(-)
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index d905fc3..a7c71cd 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -44,8 +44,8 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" v-if="isDisplayOperation">
- <a-button @click="handleOpenReceiveFaultModal" type="primary" icon="plus">棰嗗彇</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('缁翠慨宸ュ崟')">瀵煎嚭</a-button>
+ <a-button @click="handleOpenReceiveFaultModal" type="primary" icon="plus" v-if="isShowAuth('eam:repair:collect')">棰嗗彇</a-button>
+ <!--<a-button type="primary" icon="download" @click="handleExportXls('缁翠慨宸ュ崟')">瀵煎嚭</a-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel">
@@ -81,34 +81,16 @@
@change="handleTableChange"
:scroll="{x:'max-content'}"
>
-
<span slot="action" slot-scope="text, record">
- <a @click="handleOpenApplySparePartsModal(record)">鐢宠澶囦欢</a>
-
- <a-divider type="vertical"/>
-
- <a @click="handleOpenRepairCompletedModal(record)">瀹屾垚缁翠慨</a>
-
- <!--<a @click="handleEdit(record)">缂栬緫</a>-->
-
- <!--<a-divider type="vertical"/>-->
- <!--<a-dropdown>-->
- <!--<a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>-->
- <!--<a-menu slot="overlay">-->
- <!--<a-menu-item>-->
- <!--<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">-->
- <!--<a>鍒犻櫎</a>-->
- <!--</a-popconfirm>-->
- <!--</a-menu-item>-->
- <!--</a-menu>-->
- <!--</a-dropdown>-->
+ <a @click="handleDetail(record)">璇︽儏</a>
</span>
-
</a-table>
</div>
<!-- table鍖哄煙-end -->
<receive-fault-modal ref="receiveFaultModalRef" @ok="loadData"/>
+
+ <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/>
</a-card>
</template>
@@ -118,18 +100,20 @@
import ReceiveFaultModal from './modules/EamRepairOrderList/ReceiveFaultModal'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import RepairOrderApprovalModal from '../../flowable/workflow/repairOrder/RepairOrderApprovalModal'
export default {
name: 'EamRepairOrderList',
mixins: [JeecgListMixin],
components: {
+ RepairOrderApprovalModal,
LxSearchEquipmentSelect,
ReceiveFaultModal
},
- props:{
- isDisplayOperation:{
- type:Boolean,
- default:true
+ props: {
+ isDisplayOperation: {
+ type: Boolean,
+ default: true
}
},
data() {
@@ -167,6 +151,12 @@
width: 100
},
{
+ title: '缁翠慨璐熻矗浜�',
+ align: 'center',
+ dataIndex: 'repairer',
+ width: 100
+ },
+ {
title: '缁翠慨寮�濮嬫椂闂�',
align: 'center',
dataIndex: 'actualStartTime',
@@ -181,26 +171,20 @@
{
title: '鏁呴殰鍘熷洜',
align: 'center',
- dataIndex: 'faultReason',
- width: 150
+ dataIndex: 'faultReason'
},
{
title: '缁翠慨缁撴灉鎻忚堪',
align: 'center',
- dataIndex: 'repairDescription',
- width: 300
- },
- {
- title: '缁翠慨鍥剧墖',
- align: 'center',
- dataIndex: 'imageFiles',
- width: 100
- },
- {
- title: '缁翠慨璐熻矗浜�',
- align: 'center',
- dataIndex: 'repairer'
- },
+ dataIndex: 'repairDescription'
+ // width: 300
+ }
+ // {
+ // title: '缁翠慨鍥剧墖',
+ // align: 'center',
+ // dataIndex: 'imageFiles',
+ // width: 100
+ // },
// {
// title: '鏄惁濮斿',
// align: 'center',
@@ -233,6 +217,7 @@
// },
],
report_repair_status_list: [],
+ selectRepairOrderData: {},
url: {
list: '/eam/eamRepairOrder/list',
delete: '/eam/eamRepairOrder/delete',
@@ -255,6 +240,7 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 100,
scopedSlots: { customRender: 'action' }
}
this.columns = [...this.columns, operationColumn]
@@ -283,23 +269,19 @@
// 寮�鍚鍙栨晠闅滀繚淇崟寮圭獥
handleOpenReceiveFaultModal() {
this.$refs.receiveFaultModalRef.visible = true
- this.$refs.receiveFaultModalRef.loadData()
},
/**
- * 寮�鍚敵璇峰浠跺脊绐�
+ * 鐐瑰嚮璇︽儏瑙﹀彂
* @param record 琛ㄦ牸琛屼俊鎭�
*/
- handleOpenApplySparePartsModal(record) {
-
- },
-
- /**
- * 寮�鍚畬鎴愮淮淇脊绐�
- * @param record 琛ㄦ牸琛屼俊鎭�
- */
- handleOpenRepairCompletedModal(record) {
-
+ handleDetail(record) {
+ this.selectRepairOrderData = Object.assign({}, record)
+ this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.title = '璇︽儏'
+ this.$refs.repairOrderApprovalModal.disableSubmit = true
+ this.$refs.repairOrderApprovalModal.getAllApproveData(record)
+ this.$refs.repairOrderApprovalModal.getBasicInformation({ ...record, dataId: record.id })
}
}
}
--
Gitblit v1.9.3