From 109e430dc06c581ed7b1073ef6396aa887a2e20f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 07 四月 2024 17:26:50 +0800
Subject: [PATCH] 提交一把

---
 company/src/components/business/InsuranceDetailsWtb.vue       |    2 +-
 company/src/components/business/OperaInsuranceApplyWindow.vue |    6 ++++++
 company/src/views/enterprise/myPolicy.vue                     |   12 ++++++++++--
 company/src/components/business/InsuranceDetails.vue          |   28 +---------------------------
 company/src/views/enterprise/insuranceApply.vue               |   11 ++++++++++-
 5 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/company/src/components/business/InsuranceDetails.vue b/company/src/components/business/InsuranceDetails.vue
index 19d6027..9951c2e 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">
diff --git a/company/src/components/business/InsuranceDetailsWtb.vue b/company/src/components/business/InsuranceDetailsWtb.vue
index 495870a..ff02f77 100644
--- a/company/src/components/business/InsuranceDetailsWtb.vue
+++ b/company/src/components/business/InsuranceDetailsWtb.vue
@@ -27,7 +27,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">
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index e7e599e..594607a 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -86,11 +86,17 @@
                             prop="currentFee"
                             align="center"
                             label="宸蹭骇鐢熻垂鐢�(鍏�)">
+                          <template slot-scope="{row}">
+                            <span>{{row.currentFee!=null?row.currentFee: '-'}}</span>
+                          </template>
                         </el-table-column>
                         <el-table-column
                             prop="fee"
                             align="center"
                             label="鎬昏垂鐢�(鍏�)">
+                          <template slot-scope="{row}">
+                            <span>{{row.fee!=null?row.fee: '-'}}</span>
+                          </template>
                         </el-table-column>
                     </el-table>
                 </div>
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index f157646..47769b1 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -74,7 +74,16 @@
                         <span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : row.serviceDays - row.loseEfficacyDays}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
+              <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�">
+                <template slot-scope="{row}">
+                  <span>{{row.currentFee!=null?row.currentFee: '-'}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級">
+                <template slot-scope="{row}">
+                  <span>{{row.fee!=null?row.fee: '-'}}</span>
+                </template>
+              </el-table-column>
                 <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
                 <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
                 <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index c1289e4..0498c59 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -104,8 +104,16 @@
                         <span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : row.serviceDays - row.loseEfficacyDays}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�"></el-table-column>
-                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
+                <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�">
+                    <template slot-scope="{row}">
+                      <span>{{row.currentFee!=null?row.currentFee: '-'}}</span>
+                    </template>
+                  </el-table-column>
+                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級">
+                  <template slot-scope="{row}">
+                    <span>{{row.fee!=null?row.fee: '-'}}</span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
                 <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
                 <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>

--
Gitblit v1.9.3