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/enterprise/additionSubtractionApplication.vue |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 25e43f9..647d7a6 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>
@@ -167,9 +172,9 @@
             </el-table-column>
         </el-table>
         <div class="info" v-if="item">
-            <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
-            <span v-if="item.specialInfo">{{item.specialInfo}}</span>
-            <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+          <span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
+          <span v-if="item.specialInfo" v-html="item.specialInfo"> </span>
+          <span v-if="item.ortherInfo" v-html="item.ortherInfo"> </span>
         </div>
         <!--    閫夋嫨鍛樺伐    -->
         <selectEmployees ref="selectEmployees" @result="getValue" />
@@ -190,7 +195,7 @@
 import BaseOpera from '@/components/base/BaseOpera'
 import GlobalWindow from '@/components/common/GlobalWindow'
 import selectEmployees from '@/components/enterprise/selectEmployees'
-import addEmployee from '@/components/enterprise/addEmployee'
+import addEmployee from '@/components/enterprise/addEmployeeWithDu'
 import importEmployees from '@/components/enterprise/importEmployees'
 import confirmJobType from '@/components/enterprise/confirmJobType'
 import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
@@ -279,7 +284,7 @@
         validTime: e
       }).then(res => {
         this.price = res.cyclePrice
-        this.reducePrice= 0
+        this.reducePrice = 0
         this.form.addDetailList.forEach(item => {
           item.fee = res.cyclePrice
         })
@@ -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)
           }
         }
       })
@@ -402,7 +407,7 @@
       }).then(res => {
         this.visible = false
         this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
-          // this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
+        this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
         this.$emit('success')
       }).catch(e => {
         this.$tip.apiFailed(e)
@@ -475,14 +480,14 @@
         this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
         return
       }
-    /* if (!this.form.applyStartTime) {
+      /* if (!this.form.applyStartTime) {
         this.$message.warning('璇峰厛閫夋嫨鎵瑰崟鐢熸晥璧锋湡')
         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, solutionId: this.item.newVersionSolutionId, price: this.price })
       } else {
-        this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice })
+        this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
       }
     },
     uploadUser () {
@@ -501,10 +506,11 @@
         this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
         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.item.newVersionSolutionId })
       } 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.item.newVersionSolutionId, insuranceApplyId: this.form.id })
       }
     },
     // 鍒囨崲鏂规

--
Gitblit v1.9.3