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

k94314517

2024-06-20 cffe7729a3c9f77ad1423bee2da82505a323ffa1

 company/src/components/business/OpearaUnionChange.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">
@@ -91,7 +91,7 @@
        </template>
      </el-table-column>
    </el-table>
    <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">（2. 请先选择至少一条申请后提交投保申请）</div>
    <div style="color: orange; font-size: 14px;width: 100%;text-align: left"><i class="el-icon-warning"></i>2. 请先选择至少一条申请后提交投保申请</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>
@@ -108,19 +108,19 @@
        append-to-body
        center>
      <div class="desc_item_from" id="selectTable">
        <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="1" :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"
            row-key="id"
            @selection-change="handleSelectionChange1"
            :data="tableData"
            stripe
        >
         <el-table-column
            type="selection"
            width="55">
         </el-table-column>
          <el-table-column label="序号" width="80px">
            <template slot-scope="scope">
              <span>{{scope.$index + 1}}</span>
@@ -133,16 +133,26 @@
          </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="addApplyNum" 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="addApplyNum" label="申请单数" min-width="80px"></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.addApplyNum >0" type="primary"   @click="selectDo(row)">选择</el-button>
            </template>
          </el-table-column>
        </el-table>
        <div class="desc_item_from_page">
          <el-pagination
              @current-change="handleCurrentChange"
              :current-page="currentPage"
              :current-page="currentPage1"
              :page-size="10"
              layout="total, prev, pager, next, jumper"
              :total="tableTotal">
@@ -150,7 +160,7 @@
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
                <el-button type="primary" @click="selectDo()">确  定</el-button>
<!--                <el-button type="primary" @click="selectDo()">确  定</el-button>-->
                <el-button @click="model=null;visibleSelect=false">取 消</el-button>
            </span>
    </el-dialog>
@@ -180,12 +190,13 @@
        applyDate: null,
        businessType: 0
      },
      hasApplying:0,
      pickerOptions: {},
      visibleSelect:false,
      visibleSelect: true,
      solutions: [],
      currentPage:0,
      currentPage1:1,
      list: [],
      tableData:[],
      tableData:null,
      tableTotal:0,
      endTime: '',
      item: null,
@@ -265,7 +276,33 @@
        return new Date()
      }
    },
    selectDo(){
    selectDo(row){
      this.model =row
      if(!this.model){
        this.$tip.apiFailed({
          type: 'error',
          message: '请选择至少一条申请记录进行操作'
        })
        return
      }
      this.form.applyDate=null
      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)
          // console.log(end )
          // console.log(time )
          return ( time.getTime() < start.getTime() ||  time.getTime()>end.getTime())
        }
      }

      this.getList();
    },
    selectDoOld(){
      if(!this.model){
        this.$tip.apiFailed({
          type: 'error',
@@ -353,24 +390,23 @@

    },
    selectBaoxiandan(){
      this.currentPage = 1
      this.currentPage1 = 1
      this.visibleSelect=true
      this.$refs.multipleTable.clearSelection();
      this.getUnionApplyList()
    },
    getUnionApplyList(){
    getUnionApplyList() {
      pageUnionList({
        capacity: 10,
        page: this.currentPage,
        page: this.currentPage1,
        model: {
          queryFlag:1,
          status: 3,
          queryFlag: 1,
          hasApplying: this.hasApplying,
          status: 3
        }
      }).then(res => {
        this.tableData.list = res.records
        this.tableTotal = res.total
        this.$nextTick(() => {
          console.log(this.$refs.multipleTable1)
          this.tableData = res.records
          this.tableTotal = res.total
          if (this.$refs.multipleTable1 && this.$refs.multipleTable1.doLayout) {
            this.$refs.multipleTable1.doLayout()
          }
@@ -379,10 +415,10 @@
    },
    getList () {
      listAll({
          solutionType:1,
          type:0,
          unionApplyId: this.model.id,
          status: 7
        solutionType: 1,
        type: 0,
        unionApplyId: this.model.id,
        status: 7
      }).then(res => {
        this.list = res
        this.$nextTick(() => {
@@ -393,7 +429,7 @@
      })
    },
    handleCurrentChange (val) {
      this.currentPage = val
      this.currentPage1 = val
      this.getUnionApplyList()
    }
  }
@@ -418,6 +454,9 @@
::v-deep .desc_item_from .el-table__header .el-checkbox{
  display:none!important;
}
::v-deep .el-checkbox__label{
  font-size: 12px;
}
.submit {
  width: 100%;
  display: flex;