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/repair/EamReportProductHazardsList.vue | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/views/eam/repair/EamReportProductHazardsList.vue b/src/views/eam/repair/EamReportProductHazardsList.vue
index 24e6ddc..36d63fa 100644
--- a/src/views/eam/repair/EamReportProductHazardsList.vue
+++ b/src/views/eam/repair/EamReportProductHazardsList.vue
@@ -52,6 +52,11 @@
:pagination="ipagination" :loading="loading" :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.confirmStatus==='PENDING_SUBMIT'">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -150,6 +155,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ fixed: 'left'
+ },
+ {
title: '纭鐘舵��',
align: 'center',
dataIndex: 'confirmStatus_dictText',
--
Gitblit v1.9.3