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/technical/EamTechnicalStatusEvaluationApplicationList.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
index 450b710..f8a68a2 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
@@ -20,8 +20,7 @@
show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨鐢宠閮ㄩ棬"
- allow-clear tree-default-expand-all>
- </a-tree-select>
+ allow-clear tree-default-expand-all/>
</a-form-item>
</a-col>
<a-col :xl="5" :lg="6" :md="8" :sm="12">
@@ -53,6 +52,11 @@
<!-- table鍖哄煙-begin -->
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
<span slot="action" slot-scope="text, record">
<template v-if="record.applicationStatus=='WAIT_SUBMIT'">
@@ -139,6 +143,12 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ scopedSlots: { customRender: 'factoryCode' },
+ fixed: 'left'
+ },
+ {
title: '鐢宠鍗曠姸鎬�',
align: 'center',
dataIndex: 'applicationStatus_dictText',
--
Gitblit v1.9.3