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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 company/src/components/enterprise/factoryChange.vue

@@ -64,21 +64,31 @@
                    align="center"
                    label="保险生效止期">
                </el-table-column>
                <el-table-column
                    prop="insureNum"
                    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="guaranteeNum"  align="center" label="在保人数" ></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"
@@ -93,7 +103,9 @@
                <el-button type="danger" @click="deleItem">删除</el-button>
            </div>
            <div class="btns_item">
                <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
@@ -120,6 +132,7 @@
                label="身份证号">
            </el-table-column>
            <el-table-column
                v-if="item && item.hasDispatchUnit !== 1"
                prop="oldDuName"
                label="原派遣单位">
            </el-table-column>
@@ -128,6 +141,7 @@
                label="原所属工种">
            </el-table-column>
            <el-table-column
                v-if="item && item.hasDispatchUnit !== 1"
                prop="duName"
                label="变更后派遣单位">
            </el-table-column>
@@ -348,35 +362,41 @@
          //     this.$message.warning('至少添加一项员工')
          //     return
          // }
          for (let i = 0; i < this.form.factory.length; i++) {
            if (!this.form.factory[i].worktypeId || !this.form.factory[i].duId) {
              this.$message.warning('请完善派遣单位和工种信息')
              return
          if (this.item.hasDispatchUnit !== 1) {
            for (let i = 0; i < this.form.factory.length; i++) {
              if (!this.form.factory[i].worktypeId || !this.form.factory[i].duId) {
                this.$message.warning('请完善派遣单位和工种信息')
                return
              }
            }
          } else {
            for (let i = 0; i < this.form.factory.length; i++) {
              if (!this.form.factory[i].worktypeId) {
                this.$message.warning('请完善工种信息')
                return
              }
            }
          }
          this.$refs.ApplyChangeUnitDetails1.open('更换派遣单位详单', this.form.factory, { ...this.list[0], applyStartTime: this.form.applyStartTime })
          // this.form.factory.forEach(item => {
          //     item.idcardNo = item.idCard
          // })
          // let arr = JSON.parse(JSON.stringify(this.form.factory))
          // arr.forEach(item => {
          //     item.idcardNo = item.idCard
          // })
          // this.isWorking = true
          // create({
          //     applyId: this.form.id,
          //     changeDetailList: this.form.factory,
          //     validTime: this.form.applyStartTime,
          //     type: 1
          // }).then(() => {
          //     this.visible = false
          //     this.$tip.apiSuccess('操作成功')
          //     this.$emit('success')
          // }).catch(e => {
          //     this.$tip.apiFailed(e)
          // }).finally(() => {
          //     this.isWorking = false
          // })
          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.ApplyChangeUnitDetails1.open('更换派遣单位详单', this.form.factory, { ...this.list[0], applyStartTime: this.form.applyStartTime })
            }).catch(() => {

            });
          } else {
            this.$refs.ApplyChangeUnitDetails1.open('更换派遣单位详单', this.form.factory, { ...this.list[0], applyStartTime: this.form.applyStartTime })
          }
        }
      })
    },
@@ -403,7 +423,7 @@
        this.$message.warning('请先选择保险方案')
        return
      }
      this.$refs.importEmployees.open('上传名单', { arr: this.form.factory, price: this.price })
      this.$refs.importEmployees.open('上传名单', { arr: this.form.factory, price: this.price, hasDispatchUnit: this.item.hasDispatchUnit })
    },
    // 切换方案
    changeSolution1 (e) {
@@ -435,7 +455,7 @@
      this.$refs.multipleTable.clearSelection()
    },
    // 选择员工
    sele () {
    sele (type) {
      if (!this.form.solutionId) {
        this.$message.warning('请选择保险方案')
        return
@@ -444,7 +464,7 @@
        this.$message.warning('请选择员工')
        return
      }
      this.$refs.confirmJobType.open('确认工种', { solutionId: this.newVersionSolutionId })
      this.$refs.confirmJobType.open('确认工种', { solutionId: this.newVersionSolutionId, type })
    },
    // 查询全部方案
    getCompany () {