From be0301e67768fb183df7e29f411a7e54dbf15c40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/InsuranceDetails.vue | 38 +++++++-------------------------------
1 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/company/src/components/business/InsuranceDetails.vue b/company/src/components/business/InsuranceDetails.vue
index 19d6027..28f4f54 100644
--- a/company/src/components/business/InsuranceDetails.vue
+++ b/company/src/components/business/InsuranceDetails.vue
@@ -10,32 +10,6 @@
<div class="top">
{{title}}
</div>
-<!-- <div class="box_header">
- <div class="box_header_item">
- <div class="box_header_item_label">鎶曚繚浼佷笟</div>
- <div class="box_header_item_val">{{ model.companyName }}</div>
- </div>
- <div class="box_header_item">
- <div class="box_header_item_label">淇濋櫓鏂规</div>
- <div class="box_header_item_val">{{ model.solutionsName }}</div>
- </div>
- <div class="box_header_item">
- <div class="box_header_item_label">淇濋櫓鐢熸晥璧锋湡</div>
- <div class="box_header_item_val">{{ model.startTime }}</div>
- </div>
- <div class="box_header_item">
- <div class="box_header_item_label">淇濋櫓鐢熸晥姝㈡湡</div>
- <div class="box_header_item_val">{{model.endTime}}</div>
- </div>
- <div class="box_header_item">
- <div class="box_header_item_label">鎶曚繚浜烘暟</div>
- <div class="box_header_item_val">{{ model.insureNum }}</div>
- </div>
- <div class="box_header_item">
- <div class="box_header_item_label">鎬昏垂鐢�(鍏�)</div>
- <div class="box_header_item_val">{{model.fee}}</div>
- </div>
- </div>-->
<div class="box_table">
<div class="box_table_head">
<div class="box_table_head_item">鎶曚繚浼佷笟</div>
@@ -51,7 +25,7 @@
<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.insureNum }}</div>
- <div class="box_table_content_item box_table_content_header">{{model.fee}}</div>
+ <div class="box_table_content_item box_table_content_header">{{model.fee!=null?model.fee:'-'}}</div>
</div>
</div>
<div class="box_table">
@@ -59,17 +33,19 @@
<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">鎵�灞炲伐绉�</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 detailList" :key="index">
<div class="box_table_content_item">{{index + 1}}</div>
<div class="box_table_content_item">{{ item.memberName }}</div>
<div class="box_table_content_item">{{ item.idcardNo }}</div>
- <div class="box_table_content_item">{{ item.sex==0?"鐢�":"濂�" }}</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">{{item.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.remark}}</div>
+<!-- <div class="box_table_content_item">{{ item.sex==0?"鐢�":"濂�" }}</div>-->
</div>
</div>
<div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
--
Gitblit v1.9.3