Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-06-20 cffe7729a3c9f77ad1423bee2da82505a323ffa1

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -195,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'
@@ -284,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
        })
@@ -352,12 +352,12 @@
            this.form.addDetailList.forEach(item => {
              total += item.fee || 0
            })
            sums[index] =  (total || 0).toFixed(2)
            sums[index] = (total || 0).toFixed(2)
          } else {
            this.form.delDetailList.forEach(item => {
              total += item.reducePrice
            })
            sums[index] =  (total || 0).toFixed(2)
            sums[index] = (total || 0).toFixed(2)
          }
        }
      })
@@ -480,10 +480,10 @@
        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 })
      } else {
@@ -496,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 () {
@@ -506,10 +506,11 @@
        this.$message.warning('请先选择保险方案')
        return
      }

      if (this.activeName === '0') {
        this.$refs.importEmployees.open('加保员工名单', { arr: this.form.addDetailList,type:1, 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,type:0, price: this.reducePrice, solutionId: this.form.solutionId,insuranceApplyId: this.form.id  })
        this.$refs.importEmployees.open('减保员工名单', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
      }
    },
    // 切换方案