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

k94314517

2024-05-08 0f409b25f91717e00e10c37738740b22583cb4ff

 company/src/components/business/OperaWtbApplyShopWindow.vue

@@ -271,6 +271,11 @@
                            <span>{{row.fee!=null?row.fee: '-'}}</span>
                          </template>
                        </el-table-column>
                      <el-table-column
                          prop="remark"
                          align="center"
                          label="备注">
                      </el-table-column>
                    </el-table>
                    <el-table
                        :data="list1"
@@ -326,8 +331,20 @@
                            :key="Math.random()"
                            prop="applyStartTime"
                            align="center"
                            label="批单生效起期">
                            label="批增生效日期">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="delValidTime"
                            align="center"
                            label="批减生效日期">
                        </el-table-column>
                      <el-table-column
                          :key="Math.random()"
                          prop="remark"
                          align="center"
                          label="备注">
                      </el-table-column>
                        <el-table-column
                            align="center"
                            :key="Math.random()"
@@ -387,6 +404,11 @@
                            label="批单生效起期">
                        </el-table-column>
                        <el-table-column
                            prop="remark"
                            align="center"
                            label="备注">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            align="center"
                            label="操作">
@@ -432,7 +454,7 @@
        <!--    企业申请退回    -->
        <applyReturn ref="applyReturn" @success="successEvent" />
        <!--    新增投保    -->
        <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
        <OperaInsuranceApplyWindow ref="OperaInsuranceApply" @success="successEvent" />
        <!--    加减保申请    -->
        <additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
        <!--    更换派遣单位申请    -->
@@ -485,6 +507,7 @@
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'

import applyReturn from '@/components/enterprise/applyReturn'
@@ -500,7 +523,6 @@
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
import { mapState } from 'vuex'
import {sendSms} from "@/api/business/smsEmail";

@@ -512,7 +534,7 @@
    InsuranceDetails,
    OperaWtbApplyCheckWindow,
    applyReturn,
    OperaInsuranceApply,
    OperaInsuranceApplyWindow,
    additionSubtractionApplication,
    factoryChange,
    OperaApplyChangeDetailWindow,