From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
company/src/components/business/UnionChangeDetails.vue | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/company/src/components/business/UnionChangeDetails.vue b/company/src/components/business/UnionChangeDetails.vue
index a07bb67..f7ea623 100644
--- a/company/src/components/business/UnionChangeDetails.vue
+++ b/company/src/components/business/UnionChangeDetails.vue
@@ -7,35 +7,37 @@
@confirm="confirm"
>
<div class="box">
- <div class="top">
+ <div class="top" style="border-right: 1px solid #b4bbc5;">
{{title}}
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item">鎶曚繚浜�</div>
- <div class="box_table_head_item">淇濋櫓鏂规</div>
- <div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
- <div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
+ <div class="box_table_head_item" style="flex: 2">鎶曚繚浜�</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鏂规</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鐢熸晥璧锋湡</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鐢熸晥姝㈡湡</div>
<div class="box_table_head_item">淇濆崟鍙�</div>
- <div class="box_table_head_item">鍔犱繚浜烘暟</div>
- <div class="box_table_head_item">鍑忎繚浜烘暟</div>
- <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+ <div class="box_table_head_item" >鍔犱繚浜烘暟</div>
+ <div class="box_table_head_item" >鍑忎繚浜烘暟</div>
+ <div class="box_table_head_item" style="flex: 2">{{ getUnionChangTimeTitle(1,model) }}</div>
+ <div class="box_table_head_item" style="flex: 2">{{ getUnionChangTimeTitle(0,model) }}</div>
</div>
<div class="box_table_content " >
- <div class="box_table_content_item box_table_content_header">{{ model.shopName }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.solutionsName }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.startTime }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.endTime }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.shopName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.solutionsName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.startTime }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.endTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.applyCode }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.addNum}}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.delNum}}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
+ <div class="box_table_content_item box_table_content_header" >{{ model.addNum}}</div>
+ <div class="box_table_content_item box_table_content_header" >{{ model.delNum}}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.applyStartTime}}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.delValidTime}}</div>
</div>
</div>
<div class="box_table">
<div class="box_table_head box_table_content">
- <div class="box_table_head_item" style=" flex: 1;border-bottom: 0px">琚繚闄╀汉</div>
- <div class="box_table_content_item box_table_content_header" style=" flex: 7;">
+ <div class="box_table_head_item" style=" flex: 2; border-bottom: 0px">琚繚闄╀汉</div>
+ <div class="box_table_content_item box_table_content_header" style=" flex: 14.7;">
<p v-for="(item, index) in companyList" :key="index" >
{{index>0?'锛�':''}} {{ item[1]}}
</p>
@@ -47,22 +49,24 @@
<div class="box_table_head_item1">鍔犱繚鍛樺伐</div>
</div>
<div class="box_table_head">
- <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item" style="flex: 0.5">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
- <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item" style="flex: 0.5">鎬у埆</div>
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">琚繚闄╀汉</div>
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in addList" :key="index">
- <div class="box_table_content_item">{{(index + 1)}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{(index + 1)}}</div>
<div class="box_table_content_item" >{{ item.memberName }}</div>
- <div class="box_table_content_item">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
<div class="box_table_content_item">{{ item.memberIdcardNo }}</div>
<div class="box_table_content_item">{{ item.companyName }}</div>
<div class="box_table_content_item">{{ item.duName }}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
+ <div class="box_table_content_item" style="align-items: baseline;cursor: pointer; " :title="item.remark">{{item.remark}}</div>
</div>
</div>
<div class="box_table" v-if="delList && delList.length>0">
@@ -70,22 +74,24 @@
<div class="box_table_head_item1">鍑忎繚鍛樺伐</div>
</div>
<div class="box_table_head">
- <div class="box_table_head_item">搴忓彿</div>
- <div class="box_table_head_item">鍛樺伐濮撳悕</div>
+ <div class="box_table_head_item" style="flex: 0.5">搴忓彿</div>
+ <div class="box_table_head_item" >鍛樺伐濮撳悕</div>
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">琚繚闄╀汉</div>
- <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item" style="flex: 0.5">鎬у埆</div>
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in delList" :key="index">
- <div class="box_table_content_item">{{(index + 1)}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{(index + 1)}}</div>
<div class="box_table_content_item" >{{ item.memberName }}</div>
- <div class="box_table_content_item">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
<div class="box_table_content_item">{{ item.memberIdcardNo }}</div>
<div class="box_table_content_item">{{ item.companyName }}</div>
<div class="box_table_content_item">{{ item.duName }}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
+ <div class="box_table_content_item" style="align-items: baseline;cursor: pointer; " :title="item.remark">{{item.remark}}</div>
</div>
</div>
<div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
@@ -295,6 +301,7 @@
height: 50px;
background: #f2f2f2;
display: flex;
+ padding: 10px;
align-items: center;
justify-content: center;
font-size: 14px;
@@ -308,6 +315,7 @@
height: 50px;
background: #f2f2f2;
display: flex;
+ padding: 10px;
align-items: center;
justify-content: center;
font-size: 14px;
@@ -359,12 +367,18 @@
border-bottom: 0px solid #b4bbc5 !important;
}
.box_table_content_item {
- flex: 1;
- height: 50px;
+ //white-space: nowrap;
+ overflow: hidden;
+ //text-overflow: ellipsis;
+ flex: 1;
+ height: 50px;
+ padding: 10px;
background: #ffffff;
display: flex;
align-items: center;
justify-content: center;
+ word-wrap: break-word;
+ word-break: break-all;
font-size: 14px;
color: black;
border-right: 1px solid #b4bbc5;
@@ -374,7 +388,14 @@
}
&:nth-child(9) {
}
+ span{
+ width: 100%;
+ white-space: nowrap;
+ word-wrap: break-word;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
+ }
}
}
}
--
Gitblit v1.9.3