提交一把

nidapeng

2024-04-07 6b63f7cb1a90b2b365ed9a6baafa406f6ef98c1d

提交一把

 company/src/assets/style/style.scss

@@ -87,7 +87,7 @@
.apply-status23,.apply-status2 , .apply-status3, .apply-status10,
.change-status0,.change-status1,.change-status9,
.settle-status0,.settle-status2,.settle-status3,
.tax-status0,
.tax-status0,.change-status7,
.union-apply-status0,.union-apply-status1,.union-apply-status2,
.du-status0 {
  color: #216EEE  !important;
@@ -102,7 +102,7 @@
  color: #F95601 !important;
}
.union-change-status2,
  .apply-status5,.apply-status27,.change-status7,.settle-status7,.change-status2,
  .apply-status5,.apply-status27,.settle-status7,.change-status2,
  .tax-status1,.du-status1,.settle-status4 ,.union-apply-status3 {
  color: #00BA92  !important;
}

 company/src/components/business/OperaApplyChangeDetailWindow.vue

@@ -352,13 +352,7 @@
      }, 1000)
    },
    getSignLink (flag) {
      if (flag === 0) {
        this.signTitle = '签署方案确认书'
      } else if (flag === 1) {
        this.signTitle = '签署申请单'
      } else if (flag === 2) {
        this.signTitle = '签署投保单'
      }
      this.form.type = flag
      this.visiblePhone = true
      this.$nextTick(() => {

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -24,10 +24,10 @@
                    </div>
                  <div class="desc_item_label_right">
                      <template v-if="userInfo.type === 1">
                          <el-button v-if="[0, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('申请退回', {id: dataId})">申请退回</el-button>
                          <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('投保申请', {id: dataId})">再次投保</el-button>
                          <el-button v-if="model.status == 4" type="primary" @click="closeOrder">关闭订单</el-button>
                          <el-button type="primary" @click="$refs.InsuranceDetails.open('投保详情单',model,0)">导出详单</el-button>
                        <el-button type="primary" @click="$refs.InsuranceDetails.open('投保详情单',model,0)">导出详单</el-button>
                        <el-button v-if="[0, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('申请退回', {id: dataId})">申请退回</el-button>
                        <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('投保申请', {id: dataId})">再次投保</el-button>
                        <el-button v-if="model.status == 4" type="primary" @click="closeOrder">关闭订单</el-button>
                          <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">查看投保单</el-button>
                          <el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">查看保险单</el-button>
<!--                          goSign-->
@@ -260,6 +260,9 @@
                            align="center"
                            prop="fee"
                            label="产生费用">
                          <template slot-scope="{row}">
                            <span>{{row.fee!=null?row.fee: '-'}}</span>
                          </template>
                        </el-table-column>
                    </el-table>
                    <el-table

 company/src/components/business/OperaUnionApplyCheckWindow.vue

@@ -73,7 +73,7 @@
              </el-form-item>
            </div>
            <div class="box_table_content_item">  <el-input style="width: 60%" v-model="form.bxdMultifileList[index].serverMoney" placeholder="请输入"  ></el-input>
              <span style="margin-left: 15px">元/人</span></div>
              <span style="margin-left: 15px">元/天/人</span></div>
          </div>
        </div>
<!--        <div v-for="(item,index) in this.model.applyList" :key="index">
@@ -283,7 +283,7 @@
      this.form.bxdMultifileList[data.index].fileName = data.name
    },
    backDo () {
      this.$dialog.messageConfirm('确认进行该操作吗？')
      this.$dialog.messageConfirm('您确认进行该操作吗？')
        .then(() => {
          this.isWorking = true
          cancel({ id: this.model.id, reason: this.form.backCheckInfo })
@@ -296,7 +296,7 @@
        })
    },
    uploadToubaodan () {
      this.$dialog.messageConfirm('确认进行该操作吗？')
      this.$dialog.messageConfirm('提交后不可修改，请再次核对后确认提交！')
        .then(() => {
          this.isWorking = true
          console.log(this.form.tbdMultifileList )
@@ -311,7 +311,7 @@
    },

    uploadBaoxiandan () {
      this.$dialog.messageConfirm('确认进行该操作吗？')
      this.$dialog.messageConfirm('提交后不可修改，请再次核对后确认提交！')
        .then(() => {
          this.isWorking = true
          var param ={

 company/src/components/business/OperaUnionChangeCheckWindow.vue

@@ -218,7 +218,7 @@
        })
    },
    uploadBaoxiandan () {
      this.$dialog.messageConfirm('确认进行该操作吗？')
      this.$dialog.messageConfirm('提交后不可修改，请再次核对后确认提交！')
        .then(() => {
          this.isWorking = true
          var param ={

 company/src/components/business/OperaUnionChangeDetailWindow.vue

@@ -365,7 +365,7 @@
      }, 1000)
    },
    getSignLink (flag) {
        this.signTitle = '签署方案确认书'
        this.signTitle = '签署申请单'
      this.form.type = flag
      this.visiblePhone = true
      this.$nextTick(() => {

 company/src/components/business/OperaUnionChangeUnitDetailWindow.vue

@@ -344,7 +344,7 @@
      }, 1000)
    },
    getSignLink (flag) {
        this.signTitle = '签署方案确认书'
        this.signTitle = '签署申请单'
      this.form.type = flag
      this.visiblePhone = true
      this.$nextTick(() => {

 company/src/components/business/OperaWtbApplyShopWindow.vue

@@ -8,7 +8,7 @@
    >
        <div class="desc">
            <div class="desc_item">
                <div class="desc_item_label" v-if="userInfo.type === 1 &&(model.statusCollect ===27)">
                <div class="desc_item_label" v-if="userInfo.type === 1 && model.status ===27 ">
                    <div class="desc_item_label_left">
                        <span>保险到期还有 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 天</span>
                        <el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApply.open('续保', { id: dataId, type: 1 })">一键续保</el-button>
@@ -24,6 +24,7 @@
                        <span>提交时间：{{ model.createDate }}</span>
                    </div>
                  <div class="desc_item_label_right">
                    <el-button type="primary" @click="$refs.InsuranceDetails.open('投保详情单',model,0)">导出详单</el-button>
                      <template v-if="userInfo.type === 1">
                          <el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApply.open('投保申请', {id: dataId})">再次投保</el-button>
                          <el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">查看确认书</el-button>
@@ -98,6 +99,9 @@
                            prop="fee"
                            align="center"
                            label="总费用(元)">
                          <template slot-scope="{row}">
                            <span>{{row.fee!=null?row.fee: '-'}}</span>
                          </template>
                        </el-table-column>
                    </el-table>
                </div>
@@ -261,6 +265,9 @@
                            align="center"
                            prop="fee"
                            label="产生费用">
                          <template slot-scope="{row}">
                            <span>{{row.fee!=null?row.fee: '-'}}</span>
                          </template>
                        </el-table-column>
                    </el-table>
                    <el-table

 company/src/components/business/add_subtract_entrust.vue

@@ -23,7 +23,7 @@
                        <span style="color: #F95601; font-size: 14px;">（次日生效投保请于17:30前提交，超时提交以保险单为准）</span>
                    </div>
                </el-form-item>
                <el-form-item label="费用" v-if="item">
                <el-form-item label="费用" v-if="item && item.solutionType==0">
                    <span>{{item.price}}元</span>
                    <span v-if="item.timeUnit === 0">/天</span>
                    <span v-if="item.timeUnit === 1">/半月</span>

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -29,7 +29,7 @@
                <el-form-item label="投保年龄" v-if="item">
                    <span>{{item.minAge}} 至 {{item.maxAge}}</span>
                </el-form-item>
                <el-form-item label="费用" v-if="item">
                <el-form-item label="费用" v-if="item && item.solutionType==0">
                    <span>{{item.price}}元</span>
                    <span v-if="item.timeUnit === 0">/天</span>
                    <span v-if="item.timeUnit === 1">/半月</span>

 company/src/components/enterprise/editFactoryChange.vue

@@ -28,7 +28,7 @@
                <el-form-item label="投保年龄" v-if="item">
                    <span>{{item.minAge}} 至 {{item.maxAge}}</span>
                </el-form-item>
                <el-form-item label="费用" v-if="item">
                <el-form-item label="费用" v-if="item && item.type==0">
                    <span>{{item.price}}元</span>
                    <span v-if="item.timeUnit === 0">/天</span>
                    <span v-if="item.timeUnit === 1">/半月</span>

 company/src/components/enterprise/factoryChange.vue

@@ -28,7 +28,7 @@
                <el-form-item label="投保年龄" v-if="item">
                    <span>{{item.minAge}} 至 {{item.maxAge}}</span>
                </el-form-item>
                <el-form-item label="费用" v-if="item">
                <el-form-item label="费用" v-if="item&& item.type==0">
                    <span>{{item.price}}元</span>
                    <span v-if="item.timeUnit === 0">/天</span>
                    <span v-if="item.timeUnit === 1">/半月</span>

 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java

@@ -1919,11 +1919,11 @@
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
        if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.YGQ.getKey()) ){
            //如果是已過期
            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
//            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
            queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
        }else if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.BZZ.getKey()) ){
            //如果是保障中
            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
//            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
            queryWrapper.gt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();