Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 3c456949b70671cc2ad95ad5395dfaceda519f17

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -148,7 +148,7 @@
                label="费用">
                <template slot-scope="{row}">
                    <span v-if="activeName === '0'">{{row.fee}}</span>
                    <span v-else>-{{row.fee}}</span>
                    <span v-else>{{row.fee ? '-' + row.fee : ''}}</span>
                </template>
            </el-table-column>
            <el-table-column
@@ -184,6 +184,7 @@
    import { all } from '@/api/business/solutions'
    import { getDetail } from '@/api/business/insuranceApply'
    import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
    import { getDate } from '@/utils/util'
    export default {
        name: 'additionSubtractionApplication',
        extends: BaseOpera,
@@ -279,16 +280,20 @@
                getDetail(this.form.id)
                    .then(res => {
                        this.list.push(res)
                        this.item = res
                        this.endTime = res.endTime
                        this.form.solutionId = res.solutionId
                        this.form.solutionsName = res.solutionsName
                        this.pickerOptions = {
                            disabledDate(time) {
                                // - 8.64e7
                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
                                if (getDate()) {

                                }
                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
                            }
                        };
                        this.changeSolution1(res.solutionId)
                        // this.changeSolution1(res.solutionId)
                    })
            },
            getSummaries(param) {
@@ -304,13 +309,15 @@
                            this.form.addDetailList.forEach(item => {
                                total += item.fee
                            })
                            sums[index] = total
                            return
                        } else {
                            this.form.delDetailList.forEach(item => {
                                total += item.fee
                            })
                        }
                        sums[index] = '-' + total
                        return
                        }
                    }
                })
                return sums
@@ -391,10 +398,14 @@
                    this.$message.warning('请先选择保险方案')
                    return
                }
                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 })
                    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.price, insuranceApplyId: this.form.id })
                    this.$refs.selectEmployees.open('选取员工', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
                }
            },
            addUser() {
@@ -422,7 +433,9 @@
            // 切换方案
            changeSolution1(e) {
                this.company.forEach(item => {
                    console.log(item.id + '-----' + e)
                    if (item.id === e) {
                        console.log(item)
                        this.item = item
                    }
                })
@@ -476,7 +489,7 @@
            },
            // 查询全部方案
            getCompany() {
                all({})
                all({ dataType: 2 })
                    .then(res => {
                        this.company = res
                    })
@@ -509,7 +522,6 @@
                this.seleData = e.map(item => item.name)
            },
            getValue(list) {
                console.log(list)
                if (this.activeName === '0') {
                    this.form.addDetailList.push(...list)
                } else {