Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 e9c0af3fc026823ca54f206bbe8c2666ed5013cd

Merge remote-tracking branch 'origin/master'

 company/src/api/business/notices.js

@@ -6,3 +6,13 @@
        trim: true
    })
}

// æŸ¥è¯¢æŠ•ä¿å•æé†’数量
export function getCaptcha () {
    return request.get('/business/notices/getApplyNotice')
}

// æŠ•ä¿å•å…³é—­æé†’
export function closeApplyNotice (type) {
    return request.get(`/business/notices/closeApplyNotice?type=${type}`)
}

 company/src/components/business/OperaApplyChangeDetailWindow.vue

@@ -11,8 +11,8 @@
                <div class="desc_item_label">
                    <div class="desc_item_label_left">
                        <span>投保企业：{{ apply.companyName }}</span>
                        <span v-if="model.status === 0">保单状态：<span  :class="'change-status'+model.status" >待签署</span></span>
                        <span v-if="model.status === 1">保单状态：<span  :class="'change-status'+model.status" >待审核</span></span>
                        <span v-if="model.status === 1">保单状态：<span  :class="'change-status'+model.status" >待签署</span></span>
                        <span v-if="model.status === 0">保单状态：<span  :class="'change-status'+model.status" >待审核</span></span>
                        <span v-if="model.status === 2">保单状态：<span  :class="'change-status'+model.status" >已生效</span></span>
                        <span v-if="model.status === 3 || model.status === 4">保单状态：<span  :class="'change-status'+model.status" >退回申请</span></span>
                        <span v-if="model.status === 5 || model.status === 8">保单状态：<span  :class="'change-status'+model.status" >已退回</span></span>
@@ -54,7 +54,7 @@
                            align="center"
                            label="保单号">
                            <template slot-scope="{row}">
                                <el-button type="text" @click="$refs.OperaInsuranceApplyDetails.open('投保详情', { id: row.applyId })">{{row.applyCode}}</el-button>
                                <el-button type="text" @click="$refs.insuranceApplyDetails.open('投保详情', { id: row.applyId })">{{row.applyCode}}</el-button>
                            </template>
                        </el-table-column>
                        <el-table-column
@@ -191,7 +191,7 @@
        <!--    æ¢åŽ‚申请    -->
        <factoryChange ref="factoryChange" @success="successEvent" />
        <!--    æŠ•ä¿è¯¦æƒ…    -->
        <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="successEvent" />
        <insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
      <template v-slot:footer>
        <el-button @click="visible=false">返回</el-button>
      </template>
@@ -207,7 +207,7 @@
import reinsurance from '@/components/enterprise/reinsurance'
import factoryChange from '@/components/enterprise/factoryChange'
import add_subtract_return from '@/components/enterprise/add_subtract_return'
import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
// import insuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import {
  getDetail,
  getChangeDetail,
@@ -219,7 +219,7 @@
import { mapState } from 'vuex'

export default {
  name: 'OperaApplyChangeDetailWindow',
  name: 'OperaApplyChangeDetailWindow1',
  extends: BaseOpera,
  components: {
      GlobalWindow,
@@ -229,7 +229,7 @@
      OperaInsuranceApply,
      reinsurance,
      factoryChange,
      OperaInsuranceApplyDetails
      insuranceApplyDetails: () => import ('@/components/business/OperaInsuranceApplyWindow')
  },
  data () {
    return {
@@ -310,7 +310,7 @@
               capacity: 10,
               page: this.currentPage,
               model: {
                   applyChangId: this.modelId,
                   applyChangeId: this.modelId,
                   types:[ this.activeName]
               }
           }).then(res => {

 company/src/components/business/OperaApplyChangeUnitDetailWindow.vue

@@ -25,9 +25,9 @@
<!--                          <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="[5, 8].includes(model.status)" type="primary" @click="$refs.editFactoryChange.open('换厂申请', {id: dataId, applyChangId: modelId})">再次投保</el-button>
                          <el-button type="primary" v-if="model.status == 0"   @click="goSign">签署申请单</el-button>
                          <el-button v-if="[0, 1, 2, 3, 7].includes(model.status)" type="primary" @click="$refs.add_subtract_return.open('申请退回', { id: modelId })">申请退回</el-button>
                          <el-button v-if="[0, 1, 3, 7].includes(model.status)" type="primary" @click="$refs.add_subtract_return.open('申请退回', { id: modelId })">申请退回</el-button>
                          <el-button v-if="model.status == 5" type="primary" @click="viewApplyFile">查看申请单</el-button>
                          <el-button v-if="model.status == 5" type="primary" @click="viewPidan">查看批单</el-button>
                          <el-button v-if="model.status == 5 || model.status == 2" type="primary" @click="viewPidan">查看批单</el-button>
                          <el-button v-if="[5, 8].includes(model.status)" type="primary" @click="closeOrder">关闭订单</el-button>
                      </template>
                        <template v-else>
@@ -56,6 +56,9 @@
                            prop="applyCode"
                            align="center"
                            label="关联保单号">
                            <template slot-scope="{row}">
                                <el-button type="text" @click="$refs.insuranceApplyDetails.open('投保详情', { id: row.applyId })">{{row.applyCode}}</el-button>
                            </template>
                        </el-table-column>
                        <el-table-column
                            prop="solutionsName"
@@ -179,6 +182,8 @@
        <!--    æ¢åŽ‚申请    -->
        <factoryChange ref="factoryChange" @success="successEvent" />
        <editFactoryChange ref="editFactoryChange" @success="successEvent" />
        <!--    æŠ•ä¿è¯¦æƒ…    -->
        <insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
      <template v-slot:footer>
        <el-button @click="visible=false">返回</el-button>
      </template>
@@ -195,6 +200,7 @@
import editFactoryChange from '@/components/enterprise/editFactoryChange'
import applyReturn from '@/components/enterprise/applyReturn'
import add_subtract_return from '@/components/enterprise/add_subtract_return'
// import insuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import {
  getDetail,
  getChangeDetail,
@@ -217,7 +223,8 @@
      additionSubtractionApplication,
      factoryChange,
      add_subtract_return,
      editFactoryChange
      editFactoryChange,
      insuranceApplyDetails: () => import ('@/components/business/OperaInsuranceApplyWindow')
  },
  data () {
    return {
@@ -298,7 +305,7 @@
               capacity: 10,
               page: this.currentPage,
               model: {
                   applyChangId: this.modelId,
                   applyChangeId: this.modelId,
                   types:[2]
               }
           }).then(res => {

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -98,8 +98,8 @@
                </div>
                <div class="desc_item_cate">
                    <el-tabs v-model="activeName" @tab-click="handleClick">
                        <el-tab-pane label="在保人员" name="0"></el-tab-pane>
                        <el-tab-pane label="加/减保记录" name="1"></el-tab-pane>
                        <el-tab-pane label="在保人员" name="0" ></el-tab-pane>
                        <el-tab-pane label="加/减保记录"  name="1"></el-tab-pane>
                        <el-tab-pane label="换厂记录" name="2"></el-tab-pane>
                    </el-tabs>
                </div>
@@ -200,7 +200,8 @@
                        ref="table"
                        v-if="activeName === '0'"
                        style="width: 100%">
                        <el-table-column label="序号">
                        <el-table-column label="序号"
                                         align="center">
                            <template slot-scope="scope">
                                <span>{{scope.$index + 1}}</span>
                            </template>
@@ -208,9 +209,11 @@
                        <el-table-column
                            :key="Math.random()"
                            prop="memberName"
                            align="center"
                            label="员工姓名">
                        </el-table-column>
                        <el-table-column
                            align="center"
                            :key="Math.random()"
                            label="性别">
                            <template slot-scope="{row}">
@@ -221,30 +224,36 @@
                        <el-table-column
                            :key="Math.random()"
                            prop="idcardNo"
                            align="center"
                            label="身份证号">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="duName"
                            align="center"
                            label="派遣单位">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="workTypeName"
                            align="center"
                            label="所属工种">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="startTime"
                            align="center"
                            label="保险生效起期">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="endTime"
                            align="center"
                            label="保险生效止期">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            align="center"
                            prop="fee"
                            label="产生费用（元）">
                        </el-table-column>
@@ -255,12 +264,14 @@
                        ref="table"
                        v-if="activeName === '1'"
                        style="width: 100%">
                        <el-table-column label="序号">
                        <el-table-column label="序号"
                                         align="center">
                            <template slot-scope="scope">
                                <span>{{scope.$index + 1}}</span>
                            </template>
                        </el-table-column>
                        <el-table-column label="保单状态" :key="Math.random()">
                        <el-table-column label="保单状态" :key="Math.random()"
                                         align="center">
                            <template slot-scope="{row}">
                                <span :class="'change-status'+row.status" v-if="row.status === 0">待签署</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 1">待审核</span>
@@ -273,29 +284,35 @@
                        <el-table-column
                            :key="Math.random()"
                            prop="applyCode"
                            align="center"
                            label="批单号">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="addNum"
                            align="center"
                            label="增加人数（人）">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="delNum"
                            align="center"
                            label="减少人数（人）">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="createDate"
                            align="center"
                            label="提交时间">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="applyStartTime"
                            align="center"
                            label="批单生效起期">
                        </el-table-column>
                        <el-table-column
                            align="center"
                            :key="Math.random()"
                            label="操作">
                            <template slot-scope="{row}">
@@ -309,12 +326,14 @@
                        ref="table"
                        v-if="activeName === '2'"
                        style="width: 100%">
                        <el-table-column label="序号">
                        <el-table-column label="序号"
                                         align="center">
                            <template slot-scope="scope">
                                <span>{{scope.$index + 1}}</span>
                            </template>
                        </el-table-column>
                        <el-table-column label="保单状态" :key="Math.random()">
                        <el-table-column
                            align="center" label="保单状态" :key="Math.random()">
                            <template slot-scope="{row}">
                                <span :class="'change-status'+row.status" v-if="row.status === 0">待签署</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 1">待审核</span>
@@ -326,26 +345,31 @@
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            align="center"
                            prop="applyCode"
                            label="批单号">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="changeNum"
                            align="center"
                            label="换厂人数">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="createDate"
                            align="center"
                            label="提交时间">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="applyStartTime"
                            align="center"
                            label="批单生效起期">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            align="center"
                            label="操作">
                            <template slot-scope="{row}">
                                <el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('换厂详情', row)">查看详情</el-button>
@@ -371,7 +395,7 @@
                      <div style="display: flex; flex-direction: column;">
                        <span style="font-size: 16px; font-weight: 400; color: black;">
                            {{activity.title}}
                            <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9].includes(activity.objType)">
                            <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9, 11, 22].includes(activity.objType)">
                              {{activity.content}}
                            </span>
                        </span>
@@ -423,7 +447,7 @@
import { mapState } from 'vuex'

export default {
  name: 'OperaInsuranceApplyWindow',
  name: 'OperaInsuranceApplyWindow1',
  extends: BaseOpera,
  components: {
      GlobalWindow,
@@ -748,8 +772,10 @@
  }
}
</script>
<style>

<style scoped>
 ::v-deep .el-tabs__item{
    font-weight: 600;
 }
</style>
<style lang="scss" scoped>
    .form {

 company/src/components/business/dispatchReview.vue

@@ -14,7 +14,6 @@
          </div>
        </div>
      </div>

       <div class="box" v-for="(item, index) in duSolutionList" :key="index">
        <div   class="box_label">保险方案：{{item.solutionName}}</div>
        <el-table
@@ -104,10 +103,10 @@
                     flag = 1;
                     tempworktyps.push(item1);
                   }
                  if(flag ==1){
                    this.duSolutionList.push({duWorktypeList:tempworktyps,solutionName:item.solutionName})
                  }
                })
              if(flag ==1){
                this.duSolutionList.push({duWorktypeList:tempworktyps,solutionName:item.solutionName})
              }
            })

            console.log(this.form)

 company/src/components/common/UploadFile.vue

@@ -110,17 +110,14 @@
  height: 90px !important;
}
::v-deep .el-upload-list__item {
  width: 90px !important;
  height: 90px !important;
  width: 80% !important;
  height: 50px !important;
}
.icon {
  -webkit-transform: translate(-50%,-50%);
  -ms-transform: translate(-50%,-50%);
  transform: translate(0%, -85%);
}
::v-deep .el-upload-list__item {
  width: 90px !important;
  height: 90px !important;
}

</style>


 company/src/components/enterprise/OperaInsuranceApplyWindow.vue

@@ -151,7 +151,7 @@
import { all, getNewVersion } from '@/api/business/solutions'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
export default {
  name: 'OperaInsuranceApplyWindow',
  name: 'OperaInsuranceApplyWindow2',
  extends: BaseOpera,
  components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
  data () {

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -184,7 +184,7 @@
    import { all } from '@/api/business/solutions'
    import { getDetail } from '@/api/business/insuranceApply'
    import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
    import { getDate } from '@/utils/util'
    import { getDate, compareDates, getTomorrow } from '@/utils/util'
    export default {
        name: 'additionSubtractionApplication',
        extends: BaseOpera,
@@ -286,11 +286,22 @@
                        this.form.solutionsName = res.solutionsName
                        this.pickerOptions = {
                            disabledDate(time) {
                                // - 8.64e7
                                if (getDate()) {

                                // å½“前日期大于等于生效日期并且最后一次操作时间等于空
                                if ([1,3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
                                    return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
                                // å½“前日期小于生效日期并且最后一次操作时间等于空
                                } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
                                    return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
                                // æœ€åŽä¸€æ¬¡æ“ä½œæ—¶é—´æœ‰å€¼
                                } else if (res.lastChangeDate) {
                                    // å½“前日期大于最后一次操作时间
                                    if ([1,3].includes(compareDates(getDate(), res.lastChangeDate))) {
                                        return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
                                    // å½“前时间小于最后一次操作时间
                                    } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
                                        return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
                                    }
                                }
                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
                            }
                        };
                        // this.changeSolution1(res.solutionId)
@@ -485,7 +496,7 @@
                    this.$message.warning('请选择员工')
                    return
                }
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.form.solutionId })
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.item.newVersionSolutionId })
            },
            // æŸ¥è¯¢å…¨éƒ¨æ–¹æ¡ˆ
            getCompany() {

 company/src/components/enterprise/commissionDetails.vue

@@ -10,29 +10,29 @@
            <div class="info_list">
                <div class="info_list_item">
                    <div class="info_list_item_label">开票名称：</div>
                    <div class="info_list_item_val">{{userInfo.company.name}}</div>
                    <div class="info_list_item_val">{{model.companyName}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">纳税人识别号：</div>
                    <div class="info_list_item_val">{{userInfo.company.code}}</div>
                    <div class="info_list_item_val">{{model.taxCode}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">开户行：</div>
                    <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
                    <div class="info_list_item_val">{{model.taxBank}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">账号：</div>
                    <div class="info_list_item_val">
                        {{userInfo.company.taxAccount}}
                        {{model.taxAccount}}
                    </div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">地址、电话：</div>
                    <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
                    <div class="info_list_item_val">{{model.taxAddr}}</div>
                </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);">{{model.price}}</div>
                </div>
                <div class="list" style="width: 100%;" v-if="form.type === 0">
                    <div class="list_label">
@@ -40,7 +40,7 @@
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址：</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
                <div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址：</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
            </div>
@@ -111,7 +111,8 @@
                    id: null,
                    type: '',
                    addr: ''
                }
                },
              model:{}
            }
        },
        created () {
@@ -129,6 +130,7 @@
                this.visible = true
                this.list1 = []
                this.list2 = []
                this.model ={}
                this.$nextTick(() => {
                    for (const key in this.form) {
                        this.form[key] = target[key]
@@ -142,6 +144,7 @@
            getData() {
                getDetail(this.form.id)
                    .then(res => {
                      this.model =res
                        let price = 0
                        this.list1 = res.applyList
                        this.list2 = res.delTaxList

 company/src/components/enterprise/directInsuranceDetails.vue

@@ -8,39 +8,39 @@
    >
        <div class="info">
            <div class="info_list">
                <div class="info_list_item">
                    <div class="info_list_item_label">开票名称：</div>
                    <div class="info_list_item_val">{{userInfo.company.name}}</div>
              <div class="info_list_item">
                <div class="info_list_item_label">开票名称：</div>
                <div class="info_list_item_val">{{model.companyName}}</div>
              </div>
              <div class="info_list_item">
                <div class="info_list_item_label">纳税人识别号：</div>
                <div class="info_list_item_val">{{model.taxCode}}</div>
              </div>
              <div class="info_list_item">
                <div class="info_list_item_label">开户行：</div>
                <div class="info_list_item_val">{{model.taxBank}}</div>
              </div>
              <div class="info_list_item">
                <div class="info_list_item_label">账号：</div>
                <div class="info_list_item_val">
                  {{model.taxAccount}}
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">纳税人识别号：</div>
                    <div class="info_list_item_val">{{userInfo.company.code}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">开户行：</div>
                    <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">账号：</div>
                    <div class="info_list_item_val">
                        {{userInfo.company.taxAccount}}
                    </div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">地址、电话：</div>
                    <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
                </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>
              </div>
              <div class="info_list_item" style="width: 100%;">
                <div class="info_list_item_label">地址、电话：</div>
                <div class="info_list_item_val">{{model.taxAddr}}</div>
              </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>
                <div class="list" style="width: 100%;" v-if="form.type === 0">
                    <div class="list_label">
                        æŽ¥æ”¶æ–¹å¼ï¼šç”µå­å‘票
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址：</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
                <div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址：</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
            </div>
@@ -103,17 +103,17 @@
                </el-table-column>
                <el-table-column
                    align="center"
                    prop="solutionsName"
                    prop="solutionName"
                    label="保险方案">
                </el-table-column>
                <el-table-column
                    align="center"
                    prop="downCode"
                    prop="taxDoneCode"
                    label="发票号">
                </el-table-column>
                <el-table-column
                    align="center"
                    prop="createTime"
                    prop="createDate"
                    label="申请开票时间">
                </el-table-column>
                <el-table-column
@@ -149,7 +149,8 @@
                    id: null,
                    type: '',
                    addr: ''
                }
                },
              model:{}
            }
        },
        created () {
@@ -167,6 +168,7 @@
                this.visible = true
                this.list1 = []
                this.list2 = []
                this.model={}
                this.$nextTick(() => {
                    for (const key in this.form) {
                        this.form[key] = target[key]
@@ -181,6 +183,7 @@
                getDetail(this.form.id)
                    .then(res => {
                        let price = 0
                        this.model = res
                        this.list1 = res.applyList
                        this.list2 = res.delTaxList
                        if (this.list1 && this.list1.length > 0) {
@@ -202,7 +205,7 @@
                columns.forEach((column, index) => {
                    if (index === 0) {
                        sums[index] = '合计'
                    } else if (index == 4) {
                    } else if (index == 3) {
                        let price = 0
                        data.forEach(item => {
                            price += item.totalFee
@@ -218,7 +221,7 @@
                columns.forEach((column, index) => {
                    if (index === 0) {
                        sums[index] = '合计'
                    } else if (index == 5) {
                    } else if (index == 4) {
                        let price = 0
                        data.forEach(item => {
                            price += item.totalFee
@@ -236,7 +239,10 @@
    ::v-deep .el-table__footer-wrapper tbody td {
        cursor: pointer;
        text-align: center;
        &:nth-child(5) {
        &:nth-child(5),&:nth-child(4) {
            color:rgba(249, 86, 1, 0.996078431372549);
        }
        &:nth-child(4) {
            color:rgba(249, 86, 1, 0.996078431372549);
        }
    }
@@ -260,7 +266,8 @@
        .info_list {
            width: 100%;
            display: flex;
            align-items: left;
            /*align-items: left;*/
            align-items: flex-start;
            flex-wrap: wrap;
            .list::v-deep {
                width: 100%;

 company/src/components/enterprise/directInvoicingApplication.vue

@@ -208,7 +208,15 @@
                    this.$message.warning('请输入接收地址')
                    return
                }
                if (this.list2.length > 0 && this.setectData.length === 0) {
                // if (this.list2.length > 0 && this.setectData.length === 0) {
                //     this.$message.warning('至少勾选一项冲红单数据')
                //     return
                // }
                let price = 0
                this.list1.forEach(item => {
                    price += item.amount
                })
                if (price < 0 && this.setectData.length === 0) {
                    this.$message.warning('至少勾选一项冲红单数据')
                    return
                }

 company/src/components/enterprise/entrustedInvoicingApplication.vue

@@ -28,7 +28,7 @@
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">地址、电话：</div>
                    <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
                    <div class="info_list_item_val">{{userInfo.company.taxAddr}}</div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">开票金额：</div>
@@ -38,14 +38,14 @@
                    <el-radio v-model="type" label="0">电子发票</el-radio>
                    <div class="list_val">
                        <div class="list_val_label">接收地址：</div>
                        <el-input v-model="val" :disabled="type === '1'" placeholder="111222333@qq.com"></el-input>
                        <el-input v-model="val" :disabled="type === '1'" placeholder="" ></el-input>
                    </div>
                </div>
                <div class="list" style="width: 100%;">
                    <el-radio v-model="type" label="1">纸质发票</el-radio>
                    <div class="list_val">
                        <div class="list_val_label">接收地址：</div>
                        <el-input v-model="val1" :disabled="type === '0'" placeholder="安徽省合肥市经济技术开发区莲花路以东、石门路以南莲花路1＃     0551-63450845"></el-input>
                        <el-input v-model="val1" :disabled="type === '0'" placeholder=""></el-input>
                    </div>
                </div>
            </div>
@@ -139,14 +139,14 @@
            open (title, target) {
                this.title = title
                this.type = '0'
                this.val = ''
                this.val1 = ''
                this.visible = true
                this.$nextTick(() => {
                    for (const key in this.form) {
                        this.form[key] = target[key]
                    }
                })
              this.val = this.userInfo.company.invoiceEmail
              this.val1 = this.userInfo.company.invoiceAddr
            },
            confirm () {
                if (!this.val && !this.val1) {

 company/src/components/enterprise/factoryChange.vue

@@ -181,6 +181,7 @@
                    applyEndTime: '',
                    factory: []
                },
                newVersionSolutionId: '',
                pickerOptions: {},
                price: '',
                endTime: '',    //     å®žé™…保险生效止期
@@ -253,9 +254,11 @@
                    })
                getDetail(this.form.id)
                    .then(res => {
                        console.log(res)
                        this.list.push(res)
                        this.endTime = res.endTime
                        this.form.solutionId = res.solutionId
                        this.newVersionSolutionId = res.newVersionSolutionId
                        this.form.solutionsName = res.solutionsName
                        this.pickerOptions = {
                            disabledDate(time) {
@@ -381,7 +384,7 @@
                    this.$message.warning('请选择员工')
                    return
                }
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.form.solutionId })
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.newVersionSolutionId })
            },
            // æŸ¥è¯¢å…¨éƒ¨æ–¹æ¡ˆ
            getCompany() {

 company/src/components/enterprise/reinsurance.vue

@@ -15,13 +15,13 @@
                <el-form-item label="批单生效起期" prop="applyStartTime">
                    <div style="display: flex; flex-direction: column;">
                        <el-date-picker
                                @change="changeApplyStartTime"
                                v-model="form.applyStartTime"
                                type="date"
                                :picker-options="pickerOptions"
                                value-format="yyyy-MM-dd"
                                format="yyyy å¹´ MM æœˆ dd æ—¥"
                                placeholder="选择日期">
                            @change="changeApplyStartTime"
                            v-model="form.applyStartTime"
                            type="date"
                            :picker-options="pickerOptions"
                            value-format="yyyy-MM-dd HH:mm:ss"
                            format="yyyy-MM-dd HH:mm:ss"
                            placeholder="选择日期">
                        </el-date-picker>
                        <span style="color: #F95601; font-size: 14px;">（次日生效投保请于17:30前提交，超时提交以保险单为准）</span>
                    </div>
@@ -105,13 +105,14 @@
            </div>
        </div>
        <el-table
                :data="activeName === '0' ? form.addDetailList : form.delDetailList"
                border
                show-summary
                :summary-method="getSummaries"
                ref="multipleTable"
                @selection-change="handleSelectionChange"
                style="width: 100%;margin-bottom: 15px;">
            v-if="activeName === '0'"
            :data="form.addDetailList"
            border
            show-summary
            :summary-method="getSummaries"
            ref="multipleTable"
            @selection-change="handleSelectionChange"
            style="width: 100%;margin-bottom: 15px;">
            <el-table-column
                type="selection"
                width="55">
@@ -122,14 +123,17 @@
                </template>
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                prop="memberName"
                label="姓名">
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                prop="idCard"
                label="身份证号">
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                label="年龄">
                <template slot-scope="{row}">
                    <template v-if="item">
@@ -139,21 +143,83 @@
                </template>
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                prop="duName"
                label="派遣单位">
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                prop="workTypeName"
                label="所属工种">
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                prop="fee"
                label="费用">
                <template slot-scope="{row}">
                    <span v-if="activeName === '0'">{{row.fee}}</span>
                    <span v-else>-{{row.fee}}</span>
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                label="操作">
                <template slot-scope="scope">
                    <el-button type="text" style="color: red;" @click="dele(scope.$index)">删除</el-button>
                </template>
            </el-table-column>
        </el-table>
        <el-table
            v-if="activeName === '1'"
            :data="form.delDetailList"
            border
            show-summary
            :summary-method="getSummaries"
            ref="multipleTable"
            @selection-change="handleSelectionChange"
            style="width: 100%;margin-bottom: 15px;">
            <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>
                </template>
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    prop="memberName"
                    label="姓名">
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    prop="idCard"
                    label="身份证号">
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    label="年龄">
                <template slot-scope="{row}">
                    <template v-if="item">
                        <span style="color: red;" v-if="(getAgeByIdCard(row.idCard) < item.minAge) || (getAgeByIdCard(row.idCard) > item.maxAge)">{{getAgeByIdCard(row.idCard)}}</span>
                        <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
                    </template>
                </template>
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    prop="duName"
                    label="派遣单位">
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    prop="workTypeName"
                    label="所属工种">
            </el-table-column>
            <el-table-column
                :key="Math.random()"
                prop="fee"
                label="费用">
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    label="操作">
                <template slot-scope="scope">
                    <el-button type="text" style="color: red;" @click="dele(scope.$index)">删除</el-button>
@@ -185,6 +251,7 @@
    import confirmJobType from '@/components/enterprise/confirmJobType'
    import { all } from '@/api/business/solutions'
    import { getDetail } from '@/api/business/insuranceApply'
    import { getDate, compareDates, getTomorrow } from '@/utils/util'
    import { update, getChangeCountCyclePriceVO, applyChagneDetailList } from '@/api/business/applyChange'
    export default {
        name: 'reinsurance',
@@ -202,6 +269,7 @@
                    addDetailList: [],
                    delDetailList: [],
                },
                newVersionSolutionId: '',
                activeName: '0',
                pickerOptions: {},
                price: '',
@@ -263,7 +331,7 @@
                        item.fee = res.cyclePrice
                    })
                    this.form.delDetailList.forEach(item => {
                        item.fee = res.cyclePrice
                        item.fee = -res.cyclePrice
                    })
                })
            },
@@ -273,7 +341,7 @@
            // èŽ·å–投保详情
            getDetails() {
                applyChagneDetailList({
                    applyChangId: this.form.applyChangId,
                    applyChangeId: this.form.applyChangId,
                    types: [0]
                }).then(res => {
                    res.forEach(item => {
@@ -287,32 +355,51 @@
                    this.form.addDetailList = res
                })
                applyChagneDetailList({
                    applyChangId: this.form.applyChangId,
                    applyChangeId: this.form.applyChangId,
                    types: [1]
                }).then(res => {
                    res.forEach(item => {
                        item.fee = ''
                        // item.fee = ''
                        item.idCard = item.memberIdcardNo
                        item.workTypeName = ''
                        item.worktypeId = ''
                        item.duName = ''
                        item.duId = ''
                        // item.workTypeName = ''
                        // item.worktypeId = ''
                        // item.duName = ''
                        // item.duId = ''
                    })
                    this.form.delDetailList = res
                })
                getDetail(this.form.id)
                    .then(res => {
                        console.log(res)
                        this.list.push(res)
                        this.item = res
                        this.endTime = res.endTime
                        this.form.solutionId = res.solutionId
                        this.newVersionSolutionId = res.newVersionSolutionId
                        this.form.solutionsName = res.solutionsName
                        this.pickerOptions = {
                            disabledDate(time) {
                                // å½“前日期大于等于生效日期并且最后一次操作时间等于空
                                if ([1,3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
                                    return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
                                    // å½“前日期小于生效日期并且最后一次操作时间等于空
                                } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
                                    return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
                                    // æœ€åŽä¸€æ¬¡æ“ä½œæ—¶é—´æœ‰å€¼
                                } else if (res.lastChangeDate) {
                                    // å½“前日期大于最后一次操作时间
                                    if ([1,3].includes(compareDates(getDate(), res.lastChangeDate))) {
                                        return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
                                        // å½“前时间小于最后一次操作时间
                                    } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
                                        return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
                                    }
                                }
                                // - 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().getTime()
                            }
                        };
                        this.changeSolution1(res.solutionId)
                        // this.changeSolution1(res.solutionId)
                    })
            },
            getSummaries(param) {
@@ -334,7 +421,11 @@
                            this.form.delDetailList.forEach(item => {
                                total += item.fee
                            })
                            sums[index] = '-' + total
                            // if (total < 0) {
                            sums[index] = total
                            // } else {
                            //     sums[index] = '-' + total
                            // }
                            return
                        }
                        sums[index] = ''
@@ -500,7 +591,7 @@
                    this.$message.warning('请选择员工')
                    return
                }
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.form.solutionId })
                this.$refs.confirmJobType.open('确认工种', { solutionId: this.newVersionSolutionId })
            },
            // æŸ¥è¯¢å…¨éƒ¨æ–¹æ¡ˆ
            getCompany() {

 company/src/components/enterprise/renewalInsurance.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
<template>
    <GlobalWindow
        :title="title"
        width="100%"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm"
    >
        <el-table
            :data="tableData"
            border
            style="width: 100%">
            <el-table-column label="序号" width="80px">
                <template slot-scope="scope">
                    <span>{{scope.$index + 1}}</span>
                </template>
            </el-table-column>
            <el-table-column prop="statusInfo" label="状态">
                <template slot-scope="{row}">
                    <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
                </template>
            </el-table-column>
            <el-table-column prop="solutionsName" label="保险方案"></el-table-column>
            <el-table-column label="保单号">
                <template slot-scope="{row}">
                    <span>{{row.code ? row.code : '-'}}</span>
                </template>
            </el-table-column>
            <el-table-column prop="insureNum" label="投保人数"></el-table-column>
            <el-table-column prop="serviceDays" label="投保时长（天）"></el-table-column>
            <el-table-column prop="currentFee" label="产生费用"></el-table-column>
            <el-table-column prop="fee" label="总费用（元）"></el-table-column>
            <el-table-column prop="checkDate" 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="address"
                label="操作">
            </el-table-column>
        </el-table>
    </GlobalWindow>
</template>

<script>
    import BaseOpera from '@/components/base/BaseOpera'
    import GlobalWindow from '@/components/common/GlobalWindow'
    export default {
        name: 'renewalInsurance',
        extends: BaseOpera,
        components: { GlobalWindow },
        data () {
            return {
                form: {
                    id: null
                },
                tableData: []
            }
        },
        created () {
            this.config({
                api: '/business/insuranceApply',
                'field.id': 'id'
            })
        },
        methods: {

        }
    }
</script>

<style lang="scss" scoped>

</style>

 company/src/utils/util.js

@@ -75,3 +75,24 @@
  let day = currentDate.getDate(); // èŽ·å–当前日期
  return `${year}-${month}-${day}`
}

// å¯¹æ¯”日期
export function compareDates(date1, date2) {
  if (new Date(date1).getTime() > new Date(date2).getTime()) {
    return 1
  } else if (new Date(date1).getTime() < new Date(date2).getTime()) {
    return 2
  } else {
    return 3
  }
}

// èŽ·å–明天的日期
export function getTomorrow() {
  var today = new Date();
  today.setDate(today.getDate() + 1);
  var year = today.getFullYear();
  var month = today.getMonth() + 1;
  var day = today.getDate();
  return year + "-" + month + "-" + day;
}

 company/src/views/business/applyChange.vue

@@ -5,8 +5,8 @@
      <el-form-item label="保单状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="待签署" value="1"></el-option>
          <el-option label="待审核" value="0"></el-option>
          <el-option label="待签署" value="0"></el-option>
          <el-option label="待审核" value="1"></el-option>
          <el-option label="已生效" value="2"></el-option>
          <el-option label="申请退回" value="3"></el-option>
          <!--                    3 4 éƒ½æ˜¯é€€å›žç”³è¯·ä¸­-->
@@ -64,8 +64,8 @@
        </el-table-column>
        <el-table-column prop="status" label="保单状态" min-width="100px">
          <template slot-scope="{row}">
            <span  :class="'change-status'+row.status" v-if="row.status === 1">待签署</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 0">待审核</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 0">待签署</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 1">待审核</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 2">已生效</span>
            <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>

 company/src/views/business/switchCourt.vue

@@ -5,8 +5,8 @@
      <el-form-item label="保单状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="待签署" value="1"></el-option>
          <el-option label="待审核" value="0"></el-option>
          <el-option label="待签署" value="0"></el-option>
          <el-option label="待审核" value="1"></el-option>
          <el-option label="已生效" value="2"></el-option>
          <el-option label="申请退回" value="3"></el-option>
          <!--                    3 4 éƒ½æ˜¯é€€å›žç”³è¯·ä¸­-->
@@ -64,8 +64,8 @@
        </el-table-column>
        <el-table-column prop="status" label="保单状态" min-width="100px">
          <template slot-scope="{row}">
            <span :class="'change-status'+ row.status" v-if="row.status === 1">待签署</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 0">待审核</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 0">待签署</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 1">待审核</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 2">已生效</span>
            <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>

 company/src/views/enterprise/myPolicy.vue

@@ -56,6 +56,18 @@
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <div style="margin-bottom: 30px;" v-if="obj.waitSignNum > 0 && obj.renewalNum > 0">
                <el-alert type="warning" show-icon :closable="false" style="margin-bottom: 15px;" v-if="obj.renewalNum > 0">
                    <span style="margin-right: 15px;">续保提醒: æ‚¨æœ‰å³å°†åˆ°æœŸä¿é™©</span>
                    <el-button type="text" @click="$refs.renewalInsurance.open('续保提醒')">查看详情</el-button>
                    <el-button type="text" @click="closeRemind(1)">关闭提醒</el-button>
                </el-alert>
                <el-alert type="warning" :closable="false" show-icon v-if="obj.waitSignNum > 0">
                    <span style="margin-right: 15px;">投保提醒: æ‚¨æœ‰æŠ•ä¿ç”³è¯·å¾…签署</span>
                    <el-button type="text" @click="see">查看详情</el-button>
                    <el-button type="text" @click="closeRemind(2)">关闭提醒</el-button>
                </el-alert>
            </div>
            <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('投保申请')">投保申请</el-button></li>
            </ul>
@@ -114,6 +126,8 @@
        <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
        <!--    åŠ å‡ä¿ç”³è¯·    -->
        <additionSubtractionApplication ref="additionSubtractionApplication" @success="handlePageChange" />
        <!--    ç»­ä¿å¼¹çª—    -->
        <renewalInsurance ref="renewalInsurance" @success="handlePageChange" />
    </TableLayout>
</template>

@@ -124,12 +138,21 @@
    import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
    import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
    import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
    import renewalInsurance from '@/components/enterprise/renewalInsurance'

    import { all as solutionAll} from '@/api/business/solutions'
    import { getCaptcha, closeApplyNotice } from '@/api/business/notices'
    export default {
        name: 'myPolicy',
        extends: BaseTable,
        components: { TableLayout, Pagination, OperaInsuranceApplyWindow, OperaInsuranceApplyDetails, additionSubtractionApplication },
        components: {
            TableLayout,
            Pagination,
            OperaInsuranceApplyWindow,
            OperaInsuranceApplyDetails,
            renewalInsurance,
            additionSubtractionApplication
        },
        data () {
            return {
                // æœç´¢
@@ -141,6 +164,10 @@
                    startTimeS: '',
                    baseSolutionId: '',
                    statusCollect: '2'
                },
                obj: {
                    renewalNum: 0,
                    waitSignNum: 0
                },
                time1: [],
                time2: [],
@@ -156,8 +183,34 @@
            })
            this.search()
            this.loadSelectList()
            this.getNum()
        },
        methods:{
            see() {
                this.searchForm.statusCollect = '7'
                this.search()
            },
            closeRemind(type) {
                this.$confirm('确定关闭此提示吗?', '提示', {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
                    type: 'warning'
                }).then(() => {
                    closeApplyNotice(type)
                        .then(res => {
                            this.getNum()
                        })
                }).catch(() => {

                });
            },
            getNum() {
                getCaptcha()
                    .then(res => {
                        this.obj.renewalNum = res.renewalNum
                        this.obj.waitSignNum = res.waitSignNum
                    })
            },
            reset() {
                this.time1 = []
                this.time2 = []