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

k94314517

2024-04-10 9748f3f74f9f5d49d23528e9005bd82577591992

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

 company/.env.developmentShop

@@ -7,6 +7,6 @@
VUE_APP_SYSTEM_TITLE = '云易保客户服务系统-商户端'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'

VUE_APP_API = 'http://192.168.0.190:10032/'
#VUE_APP_API = 'http://192.168.0.190:10032/'

#VUE_APP_API = 'http://localhost:10032/'
VUE_APP_API = 'http://localhost:10032/'

 company/src/components/business/ApplyChangeDetails.vue

@@ -94,9 +94,9 @@
<script>
    import BaseOpera from '@/components/base/BaseOpera'
    import GlobalWindow from '@/components/common/GlobalWindow'
    import {getChangeDetailList, exportJiajianBaoExcel} from "@/api/business/insuranceApply";
    import {check } from "@/api/business/applyChange";
    import {exportComFiles} from "@/api/business/company";
import { getChangeDetailList, exportJiajianBaoExcel } from '@/api/business/insuranceApply'
import { check } from '@/api/business/applyChange'
import { exportComFiles } from '@/api/business/company'
    export default {
        name: 'ApplyChangeDetails',
        extends: BaseOpera,
@@ -161,16 +161,16 @@
                   var delDetailList = []
                   res.forEach(item1 => {
                     if (item1.type == 1) {
                       delDetailList.push(item1);
              delDetailList.push(item1)
                     } else {
                       addDetailList.push(item1);
              addDetailList.push(item1)
                     }
                   })
                   var index = addDetailList.length > delDetailList.length?addDetailList.length : delDetailList.length
                   for (var i = 0;i<index;i++) {
                     var addModel = addDetailList.length > i?addDetailList[i]:{}
                     var delModel = delDetailList.length > i?delDetailList[i]:{}
                     that.detailList.push({add:addModel,del:delModel});
            that.detailList.push({ add: addModel, del: delModel })
                   }
                 }).catch(err => {})
           },
@@ -208,16 +208,15 @@
                })
                .catch(() => {
                })

          },
            handleSizeChange(val) {
                console.log(`每页 ${val} 条`);
      console.log(`每页 ${val} 条`)
            },
            handleCurrentChange(val) {
                console.log(`当前页: ${val}`);
      console.log(`当前页: ${val}`)
            },
            handleClick(tab, event) {
                console.log(tab, event);
      console.log(tab, event)
            },
            onSubmit() {


 company/src/components/business/OpearaUnionChange.vue

@@ -20,7 +20,8 @@
            <el-date-picker
                v-model="form.applyDate"
                type="date"
                format="yyyy 年 MM 月 dd 日"
                :picker-options="pickerOptions"
                format="yyyy-MM-dd"
                placeholder="前选择日期"
                value-format="yyyy-MM-dd" />
            <span style="color: #F95601; font-size: 14px;">（2. 次日生效投保请于17:30前提交，超时提交以保险单为准）</span>
@@ -97,12 +98,12 @@
    <el-dialog
        title="选择保险单"
        :visible.sync="visibleSelect"
        width="70%"
        width="80%"
        :modal="true"
        :show-close="false"
        append-to-body
        center>
      <div class="desc_item_from">
      <div class="desc_item_from" id="selectTable">
        <el-table
            ref="multipleTable1"
            v-loading="isWorking.search"
@@ -129,6 +130,7 @@
          <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="addApplyNum" label="申请单数" min-width="100px"></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>
@@ -160,6 +162,7 @@
import ApplyChangeDetails from '@/components/business/ApplyChangeDetails'
import { fetchList as pageUnionList } from '@/api/business/unionApply'
import {getDetail} from "@/api/business/insuranceApply";
import {compareDates, getDate, getTomorrow} from "@/utils/util";
export default {
  name: 'add_subtract_entrust',
  extends: BaseOpera,
@@ -172,6 +175,7 @@
        applyDate: null,
        businessType: 0
      },
      pickerOptions: {},
      visibleSelect:false,
      solutions: [],
      currentPage:0,
@@ -198,6 +202,15 @@
      api: '/business/insuranceApply',
      'field.id': 'id'
    })
 /*   var now = new Date()
    var start = now.setDate(now.getDate()+1)
    var end = now.setDate(now.getDate()+10)
    this.pickerOptions = {
      disabledDate (time) {
        console.log(( time.getTime() < start.getTime() ||  time.getTime()>end.getTime()))
        return ( time.getTime() < start.getTime() ||  time.getTime()>end.getTime())
      }
    }*/
  },
  methods: {
    rowselect(row){
@@ -237,6 +250,16 @@
        this.model = null
      }
    },
    convertToDate(dateString) {
      try {
        const parts = dateString.split(/[- : \/]/);
        const monthIndex = parts[1] - 1
        const convertedDate = new Date( parts[0], monthIndex, parts[2], parts[3], parts[5], parts[6] )
        return convertedDate
      }catch (e) {
        return new Date()
      }
    },
    selectDo(){
      if(!this.model){
        this.$tip.apiFailed({
@@ -245,8 +268,21 @@
        })
        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();
    },
    confirm () {
@@ -322,6 +358,7 @@
        capacity: 10,
        page: this.currentPage,
        model: {
          queryFlag:1,
          status: 3,
        }
      }).then(res => {
@@ -373,6 +410,9 @@
    align-items: center;
  }
}
::v-deep .desc_item_from .el-table__header .el-checkbox{
  display:none!important;
}
.submit {
  width: 100%;
  display: flex;

 company/src/components/business/OpearaUnionChangeUnit.vue

@@ -20,8 +20,9 @@
            <el-date-picker
                v-model="form.applyDate"
                placeholder="前选择日期"
                :picker-options="pickerOptions"
                type="date"
                format="yyyy 年 MM 月 dd 日"
                format="yyyy-MM-dd"
                value-format="yyyy-MM-dd" />
            <span style="color: #F95601; font-size: 14px;">（2. 次日生效投保请于17:30前提交，超时提交以保险单为准）</span>
          </div>
@@ -97,7 +98,7 @@
    <el-dialog
        title="选择保险单"
        :visible.sync="visibleSelect"
        width="70%"
        width="80%"
        :modal="true"
        :show-close="false"
        append-to-body
@@ -129,6 +130,7 @@
          <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="changeApplyNum" label="申请单数" min-width="100px"></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>
@@ -176,6 +178,7 @@
      solutions: [],
      currentPage:0,
      list: [],
      pickerOptions: {},
      tableData:[],
      tableTotal:0,
      endTime: '',
@@ -247,6 +250,15 @@
      }
      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();
    },
    confirm () {
@@ -322,6 +334,7 @@
        capacity: 10,
        page: this.currentPage,
        model: {
          queryFlag:2,
          status: 3,
        }
      }).then(res => {
@@ -373,6 +386,9 @@
    align-items: center;
  }
}
::v-deep .desc_item_from .el-table__header .el-checkbox{
  display:none!important;
}
.submit {
  width: 100%;
  display: flex;

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -286,6 +286,8 @@
                                <span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">申请退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">已退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 6">已关闭</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 7">待出单</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 9">投保中</span>
                            </template>
                        </el-table-column>
                        <el-table-column
@@ -348,6 +350,8 @@
                                <span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">申请退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">已退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 6">已关闭</span>
                              <span :class="'change-status'+row.status" v-if="row.status === 7">待出单</span>
                              <span :class="'change-status'+row.status" v-if="row.status === 9">投保中</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/business/OperaWtbApplyShopWindow.vue

@@ -292,6 +292,8 @@
                                <span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">申请退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">已退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 6">已关闭</span>
                              <span :class="'change-status'+row.status" v-if="row.status === 7">待出单</span>
                              <span :class="'change-status'+row.status" v-if="row.status === 9">投保中</span>
                            </template>
                        </el-table-column>
                        <el-table-column
@@ -354,6 +356,8 @@
                                <span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">申请退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">已退回</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 6">已关闭</span>
                              <span :class="'change-status'+row.status" v-if="row.status === 7">待出单</span>
                              <span :class="'change-status'+row.status" v-if="row.status === 9">投保中</span>
                            </template>
                        </el-table-column>
                        <el-table-column

 company/src/components/enterprise/commissionDetails.vue

@@ -189,7 +189,7 @@
                        data.forEach(item => {
                            price += item.totalFee
                        })
                        sums[index] = price
                        sums[index] = price.toFixed(2)
                    }
                })
                return sums;

 company/src/components/enterprise/directInsuranceDetails.vue

@@ -32,7 +32,7 @@
              </div>
              <div class="info_list_item" style="width: 100%;">
                <div class="info_list_item_label">开票金额：</div>
                <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
                <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price?model.price.toFixed(2):0}}</div>
              </div>
                <div class="list" style="width: 100%;" v-if="form.type === 0">
                    <div class="list_label">
@@ -210,7 +210,7 @@
                        data.forEach(item => {
                            price += item.totalFee
                        })
                        sums[index] = price
                        sums[index] = price.toFixed(2)
                    }
                })
                return sums;
@@ -226,7 +226,7 @@
                        data.forEach(item => {
                            price += item.totalFee
                        })
                        sums[index] = price
                        sums[index] = price.toFixed(2)
                    }
                })
                return sums;

 company/src/components/enterprise/directInvoicingApplication.vue

@@ -32,7 +32,7 @@
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">开票金额：</div>
                    <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
                    <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice ?totalPrice.toFixed(2):0}}</div>
                </div>
                <div class="list" style="width: 100%;">
                    <el-radio v-model="type" label="0">电子发票</el-radio>
@@ -263,7 +263,7 @@
                        data.forEach(item => {
                            price += item.amount
                        })
                        sums[index] = price
                        sums[index] = price.toFixed(2)
                    }
                })
                return sums;
@@ -279,7 +279,7 @@
                        data.forEach(item => {
                            price += item.amount
                        })
                        sums[index] = price
                        sums[index] = price.toFixed(2)
                    }
                })
                return sums;

 company/src/components/enterprise/entrustedInvoicingApplication.vue

@@ -121,8 +121,8 @@
        watch: {
            type: {
                handler(news) {
                    this.val = ''
                    this.val1 = ''
                    // this.val = ''
                    // this.val1 = ''
                }
            }
        },
@@ -156,7 +156,7 @@
                }
                this.isWorking = true
                entrustInvoicing({
                    address: this.val || this.val1,
                    address: this.type === 0?this.val : this.val1,
                    invoicingMoney: this.total,
                    taxDetialList: this.form.list.map(item => {
                        return {
@@ -188,7 +188,7 @@
                        data.forEach(item => {
                            price += item.totalPrice
                        })
                        sums[index] = price
                        sums[index] = price.toFixed(2)
                    }
                })
                return sums;

 company/src/components/enterprise/onlineReporting.vue

@@ -90,7 +90,7 @@
            :visible.sync="centerDialogVisible"
            width="50%"
            center>
            <div class="fuwenben">
            <div class="fuwenben" style="font-size: 12px">
                    尊敬的客户：

                首先感谢您对于我们的信任与支持，我们很荣幸成为贵司的保险咨询服务商！

 company/src/components/enterprise/selectSolutions.vue

@@ -41,14 +41,14 @@
                prop="worktypeName"
                label="所属工种">
            </el-table-column>
<!--            <el-table-column-->
<!--                prop="startTime"-->
<!--                label="保险生效起期">-->
<!--            </el-table-column>-->
<!--            <el-table-column-->
<!--                prop="endTime"-->
<!--                label="保险生效止期">-->
<!--            </el-table-column>-->
            <el-table-column
                prop="startTime"
                label="保险生效起期">
            </el-table-column>
            <el-table-column
                prop="endTime"
                label="保险生效止期">
            </el-table-column>
        </el-table>
    </GlobalWindow>
</template>

 company/src/views/business/unionChange.vue

@@ -75,7 +75,7 @@
            </pagination>
        </template>
        <!--    提交申请    -->
        <OpearaUnionChange ref="OpearaUnionChange" />
        <OpearaUnionChange ref="OpearaUnionChange" @success="handlerSuccess"/>
        <OperaUnionChangeDetailWindow ref="OperaUnionChangeDetailWindow" @success="handlerSuccess"/>
    </TableLayout>
</template>
@@ -114,7 +114,7 @@
        },
        methods: {
           handlerSuccess(){
             this.reset();
             this.reset()
           },
            changeTime(e) {
                if (e.length > 0) {

 server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java

@@ -119,6 +119,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false)
    private Date queryStartTime;
    @ApiModelProperty(value = "查询类型 1子查询可合并单数", example = "1")
    @TableField(exist = false)
    private  int queryFlag;

    @ApiModelProperty(value = "查询结束日期", example = "1")
    @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -1496,7 +1496,7 @@
                        Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
                        Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
                .eq(!Objects.isNull(model.getUnionApplyId()),InsuranceApply::getUnionApplyId,model.getUnionApplyId())
//                .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
                .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
                .eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
                .eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
                .eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())

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

@@ -785,9 +785,10 @@
        if(Constants.equalsInteger(company.getType(),Constants.ONE)){
//                return new ArrayList<>();
        }else  {
            company.setType(Constants.ZERO);
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                //如果是商户
                wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//设置无效访问
                wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.company_id=company.id and  c.shop_id="+user.getCompanyId());//设置无效访问
            }else{
                //如果查询企业数据
                if(company.getQueryFlag() == 0){

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

@@ -158,12 +158,19 @@
                .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
        queryWrapper.select("(select count(b.id) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");

        if(pageWrap.getModel().getQueryFlag() == 1){
            queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                    "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 0  ) as addApplyNum ");
        }else  if(pageWrap.getModel().getQueryFlag() ==2){
            queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                    "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 1  ) as changeApplyNum ");
        }else{
        queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0  ) as addApplyNum ");

        queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1  ) as changeApplyNum ");

        }
        queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.equalsInteger(user.getType(),Constants.TWO)){