Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 3c456949b70671cc2ad95ad5395dfaceda519f17

 company/src/components/enterprise/OperaInsuranceApplyWindow.vue

@@ -26,6 +26,7 @@
                            v-model="form.applyStartTime"
                            type="date"
                            class="date_picker"
                            :clearable="false"
                            :disabled="!form.solutionId"
                            :picker-options="pickerOptions"
                            value-format="yyyy-MM-dd HH:mm:ss"
@@ -99,7 +100,10 @@
            <el-table-column
                label="年龄">
                <template slot-scope="{row}">
                    <span v-if="row.idCard">{{ getAgeByIdCard(row.idCard) }}</span>
                    <template v-if="item">
                        <span style="color: red;" v-if="row.idCard && (getAgeByIdCard(row.idCard) < item.minAge || getAgeByIdCard(row.idCard) > item.maxAge)">{{ getAgeByIdCard(row.idCard) }}</span>
                        <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
                    </template>
                </template>
            </el-table-column>
            <el-table-column
@@ -144,7 +148,7 @@
import addEmployee from '@/components/enterprise/addEmployee'
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import { all } from '@/api/business/solutions'
import { all, getNewVersion } from '@/api/business/solutions'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
export default {
  name: 'OperaInsuranceApplyWindow',
@@ -219,7 +223,7 @@
                })
            getDetail(this.form.id)
                .then(res => {
                    this.form.solutionId = res.solutionId
                    // this.form.solutionId = res.solutionId
                    this.changeSolution1(res.solutionId)
                })
        },
@@ -323,7 +327,6 @@
                this.tableData.forEach(item => {
                    item.fee = res.cyclePrice
                })
                console.log(this.tableData)
                this.$forceUpdate()
            })
        },
@@ -348,7 +351,7 @@
                        return time.getTime() <= new Date(currentDate.toLocaleString()).getTime() - 8.64e7;
                    } else if (that.item.validType === 0) {
                        // 多少日后生效
                        return time.getTime() <= new Date(that.getDate(that.item.validTypeNum)).getTime();
                        return time.getTime() <= new Date(that.getDate(that.item.validTypeNum - 1)).getTime();
                    }
                }
            };
@@ -358,7 +361,7 @@
                this.$message.warning('请先选择保险方案')
                return
            }
            this.$refs.selectEmployees.open('选取员工', { arr: this.tableData, price: this.price })
            this.$refs.selectEmployees.open('选取员工', { arr: this.tableData, price: this.price, type: 1 })
        },
      addUser() {
          if (!this.form.solutionId) {
@@ -376,7 +379,20 @@
      },
      // 切换方案
      changeSolution(e) {
          this.tableData = []
          if (!this.form.id) {
              this.tableData = []
          } else {
              this.price = ''
              this.form.applyEndTime = ''
              this.form.applyStartTime = ''
              this.tableData.forEach(item => {
                  item.fee = ''
                  item.duName = ''
                  item.duId = ''
                  item.workTypeName = ''
                  item.workTypeId = ''
              })
          }
          this.company.forEach(item => {
              if (item.id === e) {
                  // this.price = item.price
@@ -390,13 +406,17 @@
      },
        // 切换方案
        changeSolution1(e) {
            this.company.forEach(item => {
                if (item.id === e) {
                    // this.price = item.price
                    this.item = item
                    this.updatePickerOptions()
                }
            })
            getNewVersion(e)
                .then(res => {
                    this.form.solutionId = res.id
                    this.company.forEach(item => {
                        if (item.id === res.id) {
                            // this.price = item.price
                            this.item = item
                            this.updatePickerOptions()
                        }
                    })
                })
            this.tableData.forEach(item => {
                item.fee = this.price
            })
@@ -405,9 +425,9 @@
          this.tableData.splice(index, 1)
      },
      getUser(obj) {
          this.seleData.forEach(item => {
          this.seleData.forEach(id => {
              this.tableData.forEach(row => {
                   if (item === row.name) {
                   if (id === row.id) {
                       row.workTypeName = obj.workTypeName
                       row.worktypeId = obj.worktypeId
                       row.duName = obj.duName
@@ -462,7 +482,7 @@
          return sexAndAge.age
      },
      handleSelectionChange (e) {
          this.seleData = e.map(item => item.name)
          this.seleData = e.map(item => item.id)
      },
      getValue(list) {
          this.tableData.push(...list)