From 0ab4270609402545b9bd8dc42f471c8ee0fd8370 Mon Sep 17 00:00:00 2001
From: zhaowei
Date: 星期一, 08 七月 2024 14:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/site/AreaList.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/views/eam/modules/site/AreaList.vue b/src/views/eam/modules/site/AreaList.vue
index 3382b7a..ef83e73 100644
--- a/src/views/eam/modules/site/AreaList.vue
+++ b/src/views/eam/modules/site/AreaList.vue
@@ -8,7 +8,7 @@
class="action-jeecg actionarea1"
style="font-size: 18px;"
/>
- 杞﹂棿
+ 宸ュ尯
</template>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -23,12 +23,12 @@
:sm="8"
>
<a-form-item
- label="杞﹂棿缂栧彿"
+ label="宸ュ尯缂栧彿"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヨ溅闂寸紪鍙锋煡璇�"
+ placeholder="璇疯緭鍏ュ伐鍖虹紪鍙锋煡璇�"
v-model="queryParam.num"
></j-input>
</a-form-item>
@@ -38,12 +38,12 @@
:sm="8"
>
<a-form-item
- label="杞﹂棿鍚嶇О"
+ label="宸ュ尯鍚嶇О"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヨ溅闂村悕绉版煡璇�"
+ placeholder="璇疯緭鍏ュ伐鍖哄悕绉版煡璇�"
v-model="queryParam.name"
></j-input>
</a-form-item>
@@ -160,6 +160,16 @@
:length="15"
/>
</span>
+ <span
+ slot="teamNames"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="15"
+ />
+ </span>
+
<!--鐘舵�佹爮涓�у睍绀�-->
<span
slot="status"
@@ -282,17 +292,24 @@
}
},
{
- title: '杞﹂棿缂栧彿',
+ title: '宸ュ尯缂栧彿',
align: "center",
dataIndex: 'num',
sorter: true,
},
{
- title: '杞﹂棿鍚嶇О',
+ title: '宸ュ尯鍚嶇О',
dataIndex: 'name',
align: "center",
sorter: true,
},
+ {
+ title: '缁翠慨鐝粍',
+ dataIndex: 'teamNames',
+ align: "center",
+ sorter: true,
+ scopedSlots: { customRender: 'teamNames' },
+ },
// {
// title: '閮ㄩ棬',
// align: 'center',
--
Gitblit v1.9.3