From e3ac616c2a3ef63073a454b9c91e6bff1e4243d0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 六月 2024 18:45:26 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/UnionChangeDetails.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/company/src/components/business/UnionChangeDetails.vue b/company/src/components/business/UnionChangeDetails.vue
index 44cc266..f7ea623 100644
--- a/company/src/components/business/UnionChangeDetails.vue
+++ b/company/src/components/business/UnionChangeDetails.vue
@@ -12,32 +12,32 @@
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item" style="flex: 1.5">鎶曚繚浜�</div>
- <div class="box_table_head_item" style="flex: 1.5">淇濋櫓鏂规</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" style="flex: 0.5">鍔犱繚浜烘暟</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: 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" style="flex: 1.5">{{ model.shopName }}</div>
- <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ 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" style="flex: 0.5">{{ model.addNum}}</div>
- <div class="box_table_content_item box_table_content_header" style="flex: 0.5">{{ 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.delValidTime}}</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.5;border-bottom: 0px">琚繚闄╀汉</div>
- <div class="box_table_content_item box_table_content_header" style=" flex: 7.5;">
+ <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>
@@ -66,7 +66,7 @@
<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 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">
@@ -301,6 +301,7 @@
height: 50px;
background: #f2f2f2;
display: flex;
+ padding: 10px;
align-items: center;
justify-content: center;
font-size: 14px;
@@ -314,6 +315,7 @@
height: 50px;
background: #f2f2f2;
display: flex;
+ padding: 10px;
align-items: center;
justify-content: center;
font-size: 14px;
--
Gitblit v1.9.3