From bf15135228cbb9ac186cc8cc39e9da32d3f1d90f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 六月 2024 15:51:19 +0800
Subject: [PATCH] 提交一把
---
 company/src/components/enterprise/additionSubtractionApplication.vue |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 68c4c64..f382fa1 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -71,9 +71,14 @@
                     label="鎶曚繚浜烘暟">
                 </el-table-column>
                 <el-table-column
+                    prop="guaranteeNum"
+                    align="center"
+                    label="鍦ㄤ繚浜烘暟">
+                </el-table-column>
+                <el-table-column
                     prop="serviceDays"
                     align="center"
-                    label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�">
+                    label="淇濆崟鏃堕暱锛堝ぉ锛�">
                 </el-table-column>
                 <el-table-column
                     prop="currentFee"
@@ -96,7 +101,7 @@
         <div class="btns">
             <div class="btns_item">
                 <el-button type="primary" @click="seleUser">閫夊彇鍛樺伐</el-button>
-                <el-button type="primary" @click="uploadUser" v-if="activeName !== '1'">瀵煎叆鍛樺伐</el-button>
+                <el-button type="primary" @click="uploadUser">瀵煎叆鍛樺伐</el-button>
                 <el-button type="primary" @click="addUser" v-if="activeName !== '1'">娣诲姞鍛樺伐</el-button>
                 <el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
             </div>
@@ -345,14 +350,14 @@
           let total = 0
           if (this.activeName === '0') {
             this.form.addDetailList.forEach(item => {
-              total += item.fee
+              total += item.fee || 0
             })
-            sums[index] = total.toFixed(2)
+            sums[index] =  (total || 0).toFixed(2)
           } else {
             this.form.delDetailList.forEach(item => {
               total += item.reducePrice
             })
-            sums[index] =  total.toFixed(2)
+            sums[index] =  (total || 0).toFixed(2)
           }
         }
       })
@@ -480,9 +485,9 @@
         return
       }*/
       if (this.activeName === '0') {
-        this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
+        this.$refs.selectEmployees.open('閫夊彇鍔犱繚鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
       } else {
-        this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
+        this.$refs.selectEmployees.open('閫夊彇鍑忎繚鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
       }
     },
     addUser () {
@@ -491,9 +496,9 @@
         return
       }
       if (this.activeName === '0') {
-        this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.addDetailList, price: this.price })
+        this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, price: this.price })
       } else {
-        this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice })
+        this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice })
       }
     },
     uploadUser () {
@@ -502,9 +507,9 @@
         return
       }
       if (this.activeName === '0') {
-        this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.addDetailList, price: this.price, solutionId: this.form.solutionId })
+        this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList,type:1, price: this.price, solutionId: this.form.solutionId })
       } else {
-        this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.delDetailList, price: this.reducePrice, solutionId: this.form.solutionId })
+        this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList,type:0, price: this.reducePrice, solutionId: this.form.solutionId,insuranceApplyId: this.form.id  })
       }
     },
     // 鍒囨崲鏂规
--
Gitblit v1.9.3