MrShi
2024-02-23 1e72942aa4848ae4835e7f30bb4adc01f9ce5bdc
mrshi
已修改7个文件
83 ■■■■ 文件已修改
company/src/components/business/OperaApplyChangeDetailWindow.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaInsuranceApplyWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/OperaInsuranceApplyWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/additionSubtractionApplication.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/directInvoicingApplication.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/utils/util.js 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -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
@@ -423,7 +423,7 @@
import { mapState } from 'vuex'
export default {
  name: 'OperaInsuranceApplyWindow',
  name: 'OperaInsuranceApplyWindow1',
  extends: BaseOpera,
  components: {
      GlobalWindow,
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)
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/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;
}