提交一把

nidapeng

2024-04-11 556227f639fc5d5bc7b35c3da437634d8215d263

提交一把

 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/OperaApplyChangeDetailWindow.vue

@@ -434,7 +434,7 @@
    },
    handleCurrentChange(val){
        console.log(val)
        this.page = val
        this.currentPage = val
        this.getList()
    },
    onSubmit(){

 company/src/components/business/OperaApplyChangeUnitDetailWindow.vue

@@ -23,7 +23,7 @@
                  </div>
                  <div class="desc_item_label_right">
                    <template v-if="userInfo.type === 1">
                      <el-button type="primary" v-if="[5,8].includes(model.status)" @click="$refs.reinsurance.open('更换派遣单位申请', {id: dataId, applyChangId: modelId})">再次投保</el-button>
                      <el-button type="primary" v-if="[5,8].includes(model.status)" @click="$refs.editFactoryChange.open('更换派遣单位申请', {id: dataId, applyChangId: modelId})">再次投保</el-button>
                      <el-button type="primary"  @click="$refs.ApplyChangeDetails.open('更换派遣单位详情',apply,model,0)">导出详单</el-button>
                      <el-button type="primary" v-if="model.status == 0" @click="getSignLink(0)">签署申请单</el-button>
                      <el-button v-if="[0, 1, 3, 7].includes(model.status) && model.solutionType == 0" type="danger" @click="$refs.add_subtract_return.open('申请退回', { id: modelId })">申请退回</el-button>
@@ -431,7 +431,7 @@
    },
    handleCurrentChange (val) {
      console.log(val)
      this.page = val
      this.currentPage = val
      this.getList()
    },
    onSubmit () {

 company/src/components/business/OperaWtbApplyShopWindow.vue

@@ -28,7 +28,7 @@
                      <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>
                        <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">查看申请单</el-button>
                        <el-button v-if="[22,23,24,25,26,27].includes(model.status)  && model.shenqingdanFile" type="primary" @click="viewShenqingdan">查看申请单</el-button>
                        <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">查看投保单</el-button>
                        <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">查看保险单</el-button>
                        <!--                          goSign-->
@@ -39,7 +39,7 @@
                      </template>
                    <template v-if="userInfo.type === 2">
                      <el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">查看确认书</el-button>
                      <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">查看申请单</el-button>
                      <el-button v-if="[22,23,24,25,26,27].includes(model.status)  && model.shenqingdanFile" type="primary" @click="viewShenqingdan">查看申请单</el-button>
                      <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">查看投保单</el-button>
                      <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">查看保险单</el-button>
                      <el-button v-if="model.status == 22" type="primary" @click="$refs.InsuranceDetails.open('投保审核',model,1)">投保审核</el-button>
@@ -48,7 +48,7 @@
                    </template>
                    <template v-if="userInfo.type === 0">
                      <el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">查看确认书</el-button>
                      <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">查看申请单</el-button>
                      <el-button v-if="[22,23,24,25,26,27].includes(model.status)  && model.shenqingdanFile" type="primary" @click="viewShenqingdan">查看申请单</el-button>
                      <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">查看投保单</el-button>
                      <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">查看保险单</el-button>
                    </template>
@@ -180,6 +180,8 @@
                                    <el-option label="申请退回" value="3"></el-option>
                                    <el-option label="已退回" value="5"></el-option>
                                    <el-option label="已关闭" value="6"></el-option>
                                    <el-option label="待出单" value="7"></el-option>
                                    <el-option label="投保中" value="9"></el-option>
                                </el-select>
                            </el-form-item>
                            <el-form-item label="批单生效起期" prop="end">

 company/src/components/enterprise/OperaInsuranceApplyWindow.vue

@@ -298,11 +298,15 @@
        if (index === 0) {
          sums[index] = '总价'
        } else if (index === 7) {
          let total = 0
          this.tableData.forEach(item => {
            total += item.fee
          })
          sums[index] = total.toFixed(2)
          if(this.item.type == 1){
            sums[index] = "-"
          }else{
            let total = 0
            this.tableData.forEach(item => {
              total += item.fee
            })
            sums[index] = total.toFixed(2)
          }
        }
      })
      return sums

 company/src/components/enterprise/editFactoryChange.vue

@@ -175,7 +175,7 @@
            return {
                form: {
                    id: null,
                    applyChangId: '',
                    applyChangeId: '',
                    solutionId: '',
                    solutionsName: '',
                    applyStartTime: '',
@@ -219,7 +219,7 @@
                    this.$nextTick(() => {
                        this.$refs.form.resetFields()
                        this.form.id = target.id
                        this.form.applyChangId = target.applyChangId
                        this.form.applyChangeId = target.applyChangId
                        this.getDetails()
                        this.getapplyChagneDetailList()
                    })
@@ -236,7 +236,7 @@
            // 获取换厂人员
            getapplyChagneDetailList() {
                applyChagneDetailList({
                    applyChangId: this.form.applyChangId,
                    applyChangeId: this.form.applyChangeId,
                    types: [2]
                }).then(res => {
                    res.forEach(item => {
@@ -282,7 +282,7 @@
                        this.pickerOptions = {
                            disabledDate(time) {
                                // - 8.64e7
                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() <new Date(res.startTime).getTime()
                            }
                        };
                        this.changeSolution1(res.solutionId)
@@ -323,7 +323,7 @@
                        // })
                        this.isWorking = true
                        update({
                            id: this.form.applyChangId,
                            id: this.form.applyChangeId,
                            applyId: this.form.id,
                            changeDetailList: this.form.factory,
                            validTime: this.form.applyStartTime,

 company/src/views/business/insuranceApplyShop.vue

@@ -11,6 +11,7 @@
                  <el-option label="已关闭" value="25"></el-option>
                  <el-option label="投保中" value="26"></el-option>
                  <el-option label="保障中" value="27"></el-option>
                  <el-option label="已过期" value="3"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="投保企业" prop="companyId">

 company/src/views/enterprise/insuranceApply.vue

@@ -84,7 +84,7 @@
                  <span>{{row.fee!=null?row.fee: '-'}}</span>
                </template>
              </el-table-column>
                <el-table-column prop="checkDate" label="提交日期"></el-table-column>
                <el-table-column prop="createDate" 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

 company/src/views/enterprise/myPolicy.vue

@@ -25,6 +25,7 @@
                    <el-option label="已退回" value="4"></el-option>
                    <el-option label="退回申请中" value="5"></el-option>
                    <el-option label="已关闭" value="6"></el-option>
                    <el-option label="投保中" value="26"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="保险生效起期" prop="time1">
@@ -114,7 +115,7 @@
                    <span>{{row.fee!=null?row.fee: '-'}}</span>
                  </template>
                </el-table-column>
                <el-table-column prop="checkDate" label="提交日期"></el-table-column>
                <el-table-column prop="createDate" 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

 company/src/views/index.vue

@@ -126,6 +126,7 @@
      </div>
    </div>
    <OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
    <OperaInsuranceApplyShopWindow ref="operaInsuranceApplyShopWindow" @success="handleCurrentChange0()"/>
    <dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handleCurrentChange0()"/>
    <OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handleCurrentChange2()"/>
    <OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
@@ -138,6 +139,7 @@
import * as echarts from 'echarts'
import { mapState } from 'vuex'
import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
import OperaInsuranceApplyShopWindow from '@/components/business/OperaInsuranceApplyShopWindow'
import dispatchUnitDetailsPlat from '@/components/business/dispatchUnitDetailsPlat'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
@@ -151,7 +153,8 @@
    OperaTaxesWindow,
    OperaSettleClaimsWindow,
    OperaApplyChangeDetailWindow,
    OperaApplyChangeUnitDetailWindow
    OperaApplyChangeUnitDetailWindow,
    OperaInsuranceApplyShopWindow
  },
  name: 'Index',
  data () {
@@ -241,7 +244,11 @@
  methods: {
    detail (obj) {
      if (obj.objType === 0) {
        this.$refs.operaInsuranceApplyWindow.open('投保申请详情', { id: obj.objId })
        if(obj.solutionType == 1){
          this.$refs.operaInsuranceApplyWindow.open('投保申请详情', { id: obj.objId })
        }else{
          this.$refs.operaInsuranceApplyWindow.open('投保申请详情', { id: obj.objId })
        }
      } else if (obj.objType === 1) {
        this.$refs.operaApplyChangeDetailWindow.open('加减保详情', { id: obj.objId, applyId: obj.param1 })
      } else if (obj.objType === 2) {

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

@@ -707,7 +707,7 @@
    }

    public  enum ApplyCollectStatus {
        DSP(0, "待审批"),
        DSP(0, "待审核"),
        DCD(1, "待出单"),
        BZZ(2, "保障中"),
        YGQ(3, "已过期"),
@@ -1235,9 +1235,9 @@

    public  enum NoticeType {

        ZERO(0, "待审批","","","待审核","待处理","处理中"),
        ZERO(0, "待审核","","","待审核","待处理","处理中"),
        ONE(1, "企业待签署","","","工种待审核","","已结案"),
        TWO(2, "待出单","待审批","待审批","","",""),
        TWO(2, "待出单","待审核","待审核","","",""),
        THREE(3, "申请退回","申请退回","申请退回","","",""),
        FOUR(4, "已退回","已退回","已退回","","","已撤销"),
        FIVE(5, "申请驳回","申请驳回","申请驳回","","",""),