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

k94314517

2024-06-20 cffe7729a3c9f77ad1423bee2da82505a323ffa1

 company/src/components/business/OpearaUnionChangeUnit.vue

@@ -12,7 +12,7 @@
        <el-form-item label=" " prop="unionApplyId" >
          <div style=" display: flex; flex-direction: column;">
            <el-button type="primary" size="small" @click="selectBaoxiandan"> 选择保险单</el-button>
            <span style="color: #F95601; font-size: 14px;">（1. 请选择保险单后进行操作）</span>
            <span style="color: orange; font-size: 14px;"><i class="el-icon-warning"></i>1. 请选择保险单后进行操作</span>
          </div>
        </el-form-item>
        <el-form-item label="批单生效起期：" prop="applyDate" style="margin-left: 40px">
@@ -24,7 +24,8 @@
                type="date"
                format="yyyy-MM-dd"
                value-format="yyyy-MM-dd" />
            <span style="color: #F95601; font-size: 14px;">（2. 次日生效投保请于17:30前提交，超时提交以保险单为准）</span>
            <span style="color: orange; font-size: 14px;">
          <i class="el-icon-warning"></i>2. 次日生效投保请于17:30前提交，超时提交以保险单为准</span>
          </div>
        </el-form-item>
        <el-form-item label="费用" v-if="model">
@@ -87,7 +88,7 @@
        </template>
      </el-table-column>
    </el-table>
    <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">（3. 请先选择至少一条申请后提交投保申请）</div>
    <div style="color: orange; font-size: 14px;width: 100%;text-align: left"><i class="el-icon-warning"></i>3. 请先选择至少一条申请后提交投保申请</div>
    <div class="info" v-if="model">
      <span v-if="model.specialAgreement" v-html="model.specialAgreement"></span>
      <span v-if="model.specialInfo" v-html="model.specialInfo"> </span>
@@ -104,13 +105,18 @@
        append-to-body
        center>
      <div class="desc_item_from">
        <div style="width: 100%;  text-align: right; align-items: center;margin-bottom: 10px">
             <span class="tip-warn"  style="color: orange; font-size: 14px; margin-right: 20px ;text-align: left">
            <i class="el-icon-warning"></i>注：只能选择申请单数大于0的申请记录进行操作
          </span>
          <el-checkbox :true-label="2" :false-label="0"   v-model="hasApplying" style="font-size: 12px;" @change="handleCurrentChange(1)">只显示有申请单记录</el-checkbox>
        </div>
        <el-table
            border
            ref="multipleTable1"
            v-loading="isWorking.search"
            :data="tableData.list"
            @row-click="rowselect1"
            :data="tableData"
            row-key="id"
            @selection-change="handleSelectionChange1"
            stripe
        >
         <el-table-column
@@ -129,11 +135,21 @@
          </el-table-column>
          <el-table-column prop="code" label="保单号" min-width="100px"></el-table-column>
          <el-table-column prop="solutionName" label="保险方案" min-width="100px"></el-table-column>
          <el-table-column prop="insureNum" label="投保人数" min-width="100px"></el-table-column>
          <el-table-column prop="guaranteeNum" label="在保人数" min-width="100px"></el-table-column>
          <el-table-column prop="changeApplyNum" label="申请单数" min-width="100px"></el-table-column>
          <el-table-column prop="insureNum" label="投保人数" min-width="90px"></el-table-column>
          <el-table-column prop="guaranteeNum" label="在保人数" min-width="90px"></el-table-column>
          <el-table-column prop="changeApplyNum" label="申请单数" min-width="90px"></el-table-column>
          <el-table-column prop="fee" label="总费用（元）" min-width="100px"></el-table-column>
          <el-table-column prop="createDate" label="提交时间" min-width="100px"></el-table-column>
          <el-table-column prop="createDate" label="提交时间" min-width="180px"></el-table-column>
          <el-table-column
              label="操作"
              min-width="100"
              fixed="right"
              align="center"
          >
            <template slot-scope="{row}">
              <el-button v-if="row.changeApplyNum >0" type="primary"   @click="selectDo(row)">选择</el-button>
            </template>
          </el-table-column>
        </el-table>
        <div class="desc_item_from_page">
          <el-pagination
@@ -146,7 +162,9 @@
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
<!--
                <el-button type="primary" @click="selectDo()">确  定</el-button>
-->
                <el-button @click="model=null;visibleSelect=false">取 消</el-button>
            </span>
    </el-dialog>
@@ -181,6 +199,7 @@
      list: [],
      pickerOptions: {},
      tableData: [],
      hasApplying: 0,
      tableTotal: 0,
      endTime: '',
      item: null,
@@ -241,7 +260,29 @@
        this.model = null
      }
    },
    selectDo () {
    selectDo (row){
      this.model =row
      if (!this.model) {
        this.$tip.apiFailed({
          type: 'error',
          message: '请选择至少一条申请记录进行操作'
        })
        return
      }
      this.visibleSelect = false
      this.form.unionApplyId = this.model.id
      var that = this
      this.pickerOptions = {
        disabledDate (time) {
          var start = new Date(that.model.startTime)
          start.setDate(start.getDate() + 1)
          var end = new Date(that.model.endTime)
          return (time.getTime() < start.getTime() || time.getTime() > end.getTime())
        }
      }
      this.getList()
    },
    selectDo1 () {
      if (!this.model) {
        this.$tip.apiFailed({
          type: 'error',
@@ -305,6 +346,7 @@
      this.model = null
      this.list = []
      this.visibleSelect = false
      this.hasApplying= 0
      this.tableData = []
      this.tableTotal = 0
      this.item = null
@@ -335,14 +377,14 @@
        capacity: 10,
        page: this.currentPage,
        model: {
          hasApplying:this.hasApplying,
          queryFlag: 2,
          status: 3
        }
      }).then(res => {
        this.tableData.list = res.records
        this.tableData = res.records
        this.tableTotal = res.total
        this.$nextTick(() => {
          console.log(this.$refs.multipleTable1)
          if (this.$refs.multipleTable1 && this.$refs.multipleTable1.doLayout) {
            this.$refs.multipleTable1.doLayout()
          }