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/maintenance/EamSecondMaintenanceOrderList.vue | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index a675c0b..f96349d 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -93,6 +93,12 @@
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
:pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :scroll="{x:'max-content'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryOrgCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
<template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
<a v-has="'secondMaintenanceOrder:edit'" @click="handleEdit(record)">缂栬緫</a>
@@ -220,6 +226,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '淇濆吇鐘舵��',
align: 'center',
dataIndex: 'maintenanceStatus_dictText',
--
Gitblit v1.9.3