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

k94314517

2024-11-23 3011b9800d6c5bee031d87bc4e225b5b1fb52571

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -68,25 +68,35 @@
                    align="center"
                    label="保险生效止期">
                </el-table-column>
                <el-table-column
                    prop="insureNum"
                    align="center"
                    label="投保人数">
                </el-table-column>
                <el-table-column
                    prop="guaranteeNum"
                    align="center"
                    label="在保人数">
<!--                <el-table-column-->
<!--                    prop="insureNum"-->
<!--                    align="center"-->
<!--                    label="投保人数">-->
<!--                </el-table-column>-->
<!--                <el-table-column-->
<!--                    prop="guaranteeNum"-->
<!--                    align="center"-->
<!--                    label="在保人数">-->
<!--                </el-table-column>-->
                <el-table-column prop="guaranteeNum"  align="center" label="当前在保人数" width="120">
                    <template slot-scope="{row}">
                        <span>{{(row.guaranteeNum||0)}} 人</span>
                    </template>
                </el-table-column>
                <el-table-column
                    prop="serviceDays"
                    align="center"
                    label="保单时长（天）">
                </el-table-column>
                <el-table-column
                    prop="currentFee"
                    align="center"
                    label="已产生费用(元)">
<!--                <el-table-column-->
<!--                    prop="currentFee"-->
<!--                    align="center"-->
<!--                    label="已产生费用(元)">-->
<!--                </el-table-column>-->
                <el-table-column prop="fee" label="批改费用合计"  align="center" width="120">
                    <template slot-scope="{row}">
                        <span>{{row.changeMoney+' 元'}}</span>
                    </template>
                </el-table-column>
                <el-table-column
                    prop="fee"
@@ -109,10 +119,13 @@
                <el-button type="danger" @click="deleItem">删除</el-button>
            </div>
            <div class="btns_item" v-if="activeName !== '1'">
                <el-button type="primary" @click="sele">选取派遣单位</el-button>
<!--                <el-button type="primary" @click="sele">选取派遣单位</el-button>-->
                <el-button type="primary" @click="sele(1)" v-if="item && item.hasDispatchUnit !== 1">选取派遣单位</el-button>
                <el-button type="primary" @click="sele(2)" v-if="item && item.hasDispatchUnit === 1">选取工种</el-button>
            </div>
        </div>
        <el-table
            v-if="item"
            :data="activeName === '0' ? form.addDetailList : form.delDetailList"
            border
            show-summary
@@ -145,6 +158,7 @@
                </template>
            </el-table-column>
            <el-table-column
                v-if="item && item.hasDispatchUnit !== 1"
                prop="duName"
                label="派遣单位">
            </el-table-column>
@@ -324,14 +338,6 @@
    },
    // 获取投保详情
    getDetails () {
      // findList({ applyId: this.form.id })
      //     .then(res => {
      //         res.forEach(item => {
      //             item.idCard = item.idcardNo
      //             item.fee = ''
      //         })
      //         this.tableData = res
      //     })
      getDetail(this.form.id)
        .then(res => {
          this.list.push(res)
@@ -368,7 +374,20 @@
      columns.forEach((column, index) => {
        if (index === 0) {
          sums[index] = '总价'
        } else if (index === 7) {
        } else if (this.item.hasDispatchUnit === 1 && index === 6) {
          let total = 0
          if (this.activeName === '0') {
            this.form.addDetailList.forEach(item => {
              total += item.fee || 0
            })
            sums[index] = (total || 0).toFixed(2)
          } else {
            this.form.delDetailList.forEach(item => {
              total += item.reducePrice
            })
            sums[index] = (total || 0).toFixed(2)
          }
        } else if (this.item.hasDispatchUnit !== 1 && index === 7) {
          let total = 0
          if (this.activeName === '0') {
            this.form.addDetailList.forEach(item => {
@@ -450,56 +469,67 @@
          //     this.$message.warning('至少添加一项员工')
          //     return
          // }
          for (let i = 0; i < this.form.addDetailList.length; i++) {
            if (!this.form.addDetailList[i].worktypeId || !this.form.addDetailList[i].duId) {
              this.$message.warning('请完善加保派遣单位和工种信息')
              return
          if (this.item.hasDispatchUnit !== 1) {
            for (let i = 0; i < this.form.addDetailList.length; i++) {
              if (!this.form.addDetailList[i].worktypeId || !this.form.addDetailList[i].duId) {
                this.$message.warning('请完善加保派遣单位和工种信息')
                return
              }
            }
            for (let i = 0; i < this.form.delDetailList.length; i++) {
              if (!this.form.delDetailList[i].worktypeId || !this.form.delDetailList[i].duId) {
                this.$message.warning('请完善减保派遣单位和工种信息')
                return
              }
            }
          } else {
            for (let i = 0; i < this.form.addDetailList.length; i++) {
              if (!this.form.addDetailList[i].worktypeId) {
                this.$message.warning('请完善加保工种信息')
                return
              }
            }
            for (let i = 0; i < this.form.delDetailList.length; i++) {
              if (!this.form.delDetailList[i].worktypeId) {
                this.$message.warning('请完善减保工种信息')
                return
              }
            }
          }
          for (let i = 0; i < this.form.delDetailList.length; i++) {
            if (!this.form.delDetailList[i].worktypeId || !this.form.delDetailList[i].duId) {
              this.$message.warning('请完善减保派遣单位和工种信息')
              return
            }
          let arr = this.company.filter(item => item.id === this.form.solutionId)
          const endTime = Number(arr[0].correctWarnTime.split(':')[0] + arr[0].correctWarnTime.split(':')[1])
          const now = new Date();
          const hours = now.getHours();
          const minutes = now.getMinutes();
          const date = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
          const startTime = Number(date.split(':')[0] + date.split(':')[1])
          if (startTime > endTime) {
            this.$confirm('您已超过当天最晚批改时间，保单实际生效时间以保险公司审核为准！', '提示', {
              confirmButtonText: '确定',
              cancelButtonText: '取消',
              type: 'warning'
            }).then(() => {
              this.$refs.ApplyChangeDetails1.open('加减保详单', this.form.addDetailList, this.form.delDetailList, {
                companyName: this.item.companyName,
                solutionsName: this.form.solutionsName,
                code: this.list[0].code,
                startTime: this.list[0].startTime,
                endTime: this.list[0].endTime,
                applyStartTime: this.form.applyStartTime
              })
            }).catch(() => {

            });
          } else {
            this.$refs.ApplyChangeDetails1.open('加减保详单', this.form.addDetailList, this.form.delDetailList, {
              companyName: this.item.companyName,
              solutionsName: this.form.solutionsName,
              code: this.list[0].code,
              startTime: this.list[0].startTime,
              endTime: this.list[0].endTime,
              applyStartTime: this.form.applyStartTime
            })
          }

          this.$refs.ApplyChangeDetails1.open('加减保详单', this.form.addDetailList, this.form.delDetailList, {
            companyName: this.userInfo.company.name,
            solutionsName: this.form.solutionsName,
            code: this.list[0].code,
            startTime: this.list[0].startTime,
            endTime: this.list[0].endTime,
            applyStartTime: this.form.applyStartTime
          })

          // return

          // this.form.addDetailList.forEach(item => {
          //     item.idcardNo = item.idCard
          // })
          // this.form.delDetailList.forEach(item => {
          //     item.idcardNo = item.idCard
          // })
          // // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
          // // arr.forEach(item => {
          // //     item.idcardNo = item.idCard
          // // })
          // this.isWorking = true
          // create({
          //     applyId: this.form.id,
          //     addDetailList: this.form.addDetailList,
          //     delDetailList: this.form.delDetailList,
          //     validTime: this.form.applyStartTime,
          //     type: 0
          // }).then(() => {
          //     this.visible = false
          //     this.$tip.apiSuccess('操作成功')
          //     this.$emit('success')
          // }).catch(e => {
          //     this.$tip.apiFailed(e)
          // }).finally(() => {
          //     this.isWorking = false
          // })
        }
      })
    },
@@ -534,9 +564,9 @@
        return
      }
      if (this.activeName === '0') {
        this.$refs.addEmployee.open('添加加保员工', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price })
        this.$refs.addEmployee.open('添加加保员工', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
      } else {
        this.$refs.addEmployee.open('添加减保员工', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
        this.$refs.addEmployee.open('添加减保员工', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
      }
    },
    uploadUser () {
@@ -551,9 +581,9 @@
      }

      if (this.activeName === '0') {
        this.$refs.importEmployees.open('加保员工名单', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId })
        this.$refs.importEmployees.open('加保员工名单', { arr: this.form.addDetailList, type: 1, price: this.price, hasDispatchUnit: this.item.hasDispatchUnit, solutionId: this.item.newVersionSolutionId })
      } else {
        this.$refs.importEmployees.open('减保员工名单', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
        this.$refs.importEmployees.open('减保员工名单', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, hasDispatchUnit: this.item.hasDispatchUnit, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
      }
    },
    // 切换方案
@@ -603,7 +633,7 @@
      this.$refs.multipleTable.clearSelection()
    },
    // 选择员工
    sele () {
    sele (type) {
      if (this.activeName === '0') {
        if (this.addTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      } else {
@@ -617,7 +647,7 @@
        this.$message.warning('请选择员工')
        return
      }
      this.$refs.confirmJobType.open('确认工种', { solutionId: this.item.newVersionSolutionId })
      this.$refs.confirmJobType.open('确认工种', { solutionId: this.item.newVersionSolutionId, type })
    },
    // 查询全部方案
    getCompany () {