提交一把

jiangping

2024-06-26 75f1f8dfa1c53f38f66c384ef151012aca5905c1

提交一把

 company/src/components/base/BaseOpera.vue

@@ -59,6 +59,36 @@
        }
      })
    },
    getApplyTimeTitle (type, solutionType, model) {
      if (type == 0) {
        // 如果是起期
        if (solutionType === 1) {
          // 如果是委托投保申请
          return [3].includes(model.unionApplyTbdStatus) ? '保险生效起期' : '期望生效起期'
        } else {
          // 如果是直保申请
          return model.status === 5 ? '保险生效起期' : '期望生效起期'
        }
      } else {
        // 如果是止期
        if (solutionType === 1) {
          // 如果是委托投保申请
          return [3].includes(model.unionApplyTbdStatus) ? '保险生效止期' : '预计生效止期'
        } else {
          // 如果是直保申请
          return model.status === 5 ? '保险生效止期' : '预计生效止期'
        }
      }
    },
    getChangApplyTimeTitle (changeType, model) {
      if (changeType === 2) {
        return model.status === 2 ? '批单生效期' : '期望批单生效期'
      }else if (changeType === 1) {
        return model.status === 2 ? '批增生效起期' : '期望批增生效起期'
      } else {
        return model.status === 2 ? '批减生效起期' : '期望批减生效起期'
      }
    },
    close () {
      this.visible = false
    },

 company/src/components/business/ApplyChangeDetails.vue

@@ -19,8 +19,8 @@
              <div class="box_table_head_item">保险生效止期</div>
              <div class="box_table_head_item">加保人数</div>
              <div class="box_table_head_item">减保人数</div>
              <div class="box_table_head_item">批增生效日期</div>
              <div class="box_table_head_item">批减生效日期</div>
              <div class="box_table_head_item">{{getChangApplyTimeTitle(1,model)}}</div>
              <div class="box_table_head_item">{{getChangApplyTimeTitle(0,model)}}</div>
            </div>
            <div class="box_table_content "  >
              <div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>

 company/src/components/business/ApplyChangeUnitDetails.vue

@@ -12,22 +12,22 @@
          </div>
          <div class="box_table">
            <div class="box_table_head">
              <div class="box_table_head_item">投保企业</div>
              <div class="box_table_head_item">保险方案</div>
              <div class="box_table_head_item" style="flex: 3">投保企业</div>
              <div class="box_table_head_item" style="flex: 2">保险方案</div>
              <div class="box_table_head_item">保单号</div>
              <div class="box_table_head_item">保险生效起期</div>
              <div class="box_table_head_item">保险生效止期</div>
              <div class="box_table_head_item" style="flex: 2">保险生效起期</div>
              <div class="box_table_head_item" style="flex: 2">保险生效止期</div>
              <div class="box_table_head_item">更换派遣单位人数</div>
              <div class="box_table_head_item">批单生效期</div>
              <div class="box_table_head_item" style="flex: 2">{{getChangApplyTimeTitle(2,model)}}</div>
            </div>
            <div class="box_table_content "  >
              <div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
              <div class="box_table_content_item box_table_content_header">{{ apply.solutionsName }}</div>
              <div class="box_table_content_item box_table_content_header">{{ apply.code }}</div>
              <div class="box_table_content_item box_table_content_header">{{ apply.startTime }}</div>
              <div class="box_table_content_item box_table_content_header">{{ apply.endTime }}</div>
              <div class="box_table_content_item box_table_content_header" style="flex: 3">{{ apply.companyName }}</div>
              <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ apply.solutionsName }}</div>
              <div class="box_table_content_item box_table_content_header" >{{ apply.code }}</div>
              <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ apply.startTime }}</div>
              <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ apply.endTime }}</div>
              <div class="box_table_content_item box_table_content_header">{{ model.changeNum}}</div>
              <div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
              <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.applyStartTime}}</div>
            </div>
          </div>
            <div class="box_table">
@@ -276,6 +276,7 @@
                .box_table_head_item {
                    flex: 1;
                    height: 50px;
                  padding: 10px;
                    background: #f2f2f2;
                    display: flex;
                    align-items: center;

 company/src/components/business/InsuranceDetails.vue

@@ -14,8 +14,8 @@
            <div class="box_table_head">
              <div class="box_table_head_item">{{model.solutionType == 1?'被保险人':'投保企业'}}</div>
              <div class="box_table_head_item">保险方案</div>
              <div class="box_table_head_item">保险生效起期</div>
              <div class="box_table_head_item">保险生效止期</div>
              <div class="box_table_head_item">{{ getApplyTimeTitle(0,model.solutionType,model)}}</div>
              <div class="box_table_head_item">{{ getApplyTimeTitle(1,model.solutionType,model)}}</div>
              <div class="box_table_head_item">在保/投保人数</div>
              <div class="box_table_head_item">总费用(元)</div>
            </div>

 company/src/components/business/OperaApplyChangeDetailWindow.vue

@@ -90,12 +90,12 @@
                      <el-table-column
                          prop="applyStartTime"
                          align="center"
                          label="批增生效日期">
                          :label="getChangApplyTimeTitle(1,model)">
                      </el-table-column>
                      <el-table-column
                          prop="delValidTime"
                          align="center"
                          label="批减生效日期">
                          :label="getChangApplyTimeTitle(0,model)">
                      </el-table-column>
                        <el-table-column
                            prop="addNum"

 company/src/components/business/OperaApplyChangeUnitDetailWindow.vue

@@ -91,7 +91,7 @@
                      <el-table-column
                          prop="applyStartTime"
                          align="center"
                          label="批单生效起期">
                          :label="getChangApplyTimeTitle(2,model)">
                      </el-table-column>
                        <el-table-column
                            prop="changeNum"

 company/src/components/business/OperaWtbApplyShopWindow.vue

@@ -73,12 +73,12 @@
                        <el-table-column
                            prop="startTime"
                            align="center"
                            label="保险生效起期">
                            :label="getApplyTimeTitle(0,model.solutionType,model)">
                        </el-table-column>
                        <el-table-column
                            prop="endTime"
                            align="center"
                            label="保险生效止期">
                            :label="getApplyTimeTitle(1,model.solutionType,model)">
                        </el-table-column>
                        <el-table-column
                            prop="insureNum"

 company/src/components/enterprise/importEmployees.vue

@@ -123,6 +123,7 @@
        .then(res => {
          res.forEach(item => {
            item.memberName = item.name
            item.reducePrice = item.fee
          })
          this.delList = res
          this.fileName = e.target.files[0].name

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java

@@ -517,8 +517,8 @@
            header1.setHeight((short) 500);
            header1.createCell(0).setCellValue(Constants.equalsInteger(data.getSolutionType(), Constants.ZERO)?"投保企业":"被保险人");
            header1.createCell(1).setCellValue("保险方案");
            header1.createCell(2).setCellValue("保险生效起期");
            header1.createCell(3).setCellValue("保险生效止期");
            header1.createCell(2).setCellValue(Constants.getApplyTimeTitle(0,data));
            header1.createCell(3).setCellValue(Constants.getApplyTimeTitle(1,data));
            header1.createCell(4).setCellValue("在保/投保人数");
            header1.createCell(5).setCellValue("总费用（元）");
            for (int i = 0; i < 6; i++) {
@@ -650,8 +650,8 @@
            header1.createCell(5).setCellValue("");
            header1.createCell(6).setCellValue("保险生效止期");
            header1.createCell(7).setCellValue("");
            header1.createCell(8).setCellValue("期望批增生效日期");
            header1.createCell(9).setCellValue("期望批减生效日期");
            header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
            header1.createCell(9).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
            header1.createCell(10).setCellValue("加保人数");
            header1.createCell(11).setCellValue("减保人数");
            for (int i = 0; i < 12; i++) {
@@ -967,7 +967,7 @@
            header1.createCell(4).setCellValue("保险生效起期");
            header1.createCell(5).setCellValue("保险生效止期");
            header1.createCell(6).setCellValue("换厂人数");
            header1.createCell(7).setCellValue("期望批单生效期");
            header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(2,data));
            for (int i = 0; i < 8; i++) {
                configFirstCell(sxssfWorkbook,header1.getCell(i));
            }

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -4,7 +4,9 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.dto.CountCyclePriceDTO;
import com.doumee.dao.business.model.ApplyChange;
import com.doumee.dao.business.model.ApplyDetail;
import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.dao.business.model.Solutions;
import com.doumee.dao.business.vo.ChangeDealTypeVO;
import com.doumee.dao.business.vo.CountCyclePriceVO;
@@ -98,6 +100,45 @@
    public static final int FOUR = 4;
    public static final String COMPANY_PHONE_AUTH ="COMPANY_PHONE_AUTH" ;


    /**
     * 获取申请单时间列标题
     * @param type 0开始时间 1截止时间
     * @param model
     * @return
     */
    public static String getApplyTimeTitle(int type, InsuranceApply model){
        if(type ==1){
            if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){
                return  Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"保险生效起期":"期望保险生效起期";
            }else{
                return  Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"保险生效起期":"期望保险生效起期";
            }
        }else{
            if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){
                return  Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"保险生效止期":"期望保险生效止期";
            }else{
                return  Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"保险生效止期":"期望保险生效止期";
            }
        }

    }

    /**
     * 获取批改单时间标题列
     * @param type 0更换派遣单位 1加保 0减保
     * @param model
     * @return
     */
    public static String getChangeApplyTimeTitle(int type, ApplyChange model){
        if(type ==2){
             return  Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"批单生效期":"期望批单生效期";
        }else  if(type ==1){
            return  Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"批增生效起期":"期望批增生效起期";
        }else{
            return  Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"批减生效起期":"期望批减生效起期";
        }
    }
    /**
     * 企业数据来源 0平台注册 1后台导入
     */