From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把

---
 company/src/components/business/UnionChangeDetails.vue |   65 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/company/src/components/business/UnionChangeDetails.vue b/company/src/components/business/UnionChangeDetails.vue
index ae0f531..719859a 100644
--- a/company/src/components/business/UnionChangeDetails.vue
+++ b/company/src/components/business/UnionChangeDetails.vue
@@ -12,30 +12,32 @@
           </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" 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">淇濆崟鍙�</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" style="flex: 0.5">鍑忎繚浜烘暟</div>
+              <div class="box_table_head_item">鎵瑰鐢熸晥鏃ユ湡</div>
+              <div class="box_table_head_item">鎵瑰噺鐢熸晥鏃ユ湡</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" 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">{{ 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" 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>
           </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: 1.5;border-bottom: 0px">琚繚闄╀汉</div>
+              <div class="box_table_content_item box_table_content_header" style=" flex: 7.5;">
                 <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;" >
@@ -115,7 +121,7 @@
 <script>
     import BaseOpera from '@/components/base/BaseOpera'
     import GlobalWindow from '@/components/common/GlobalWindow'
-    import {getChangeDetailList, exportJiajianBaoExcel} from "@/api/business/insuranceApply";
+    import {getChangeDetailList} from "@/api/business/insuranceApply";
     import {check } from "@/api/business/applyChange";
     import {exportDetailExcel} from "@/api/business/unionChange";
     export default {
@@ -359,12 +365,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 +386,14 @@
                 }
                 &:nth-child(9) {
                 }
+                span{
+                  width: 100%;
+                  white-space: nowrap;
+                  word-wrap: break-word;
+                  text-overflow: ellipsis;
+                  overflow: hidden;
                 }
+              }
             }
         }
     }

--
Gitblit v1.9.3