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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 company/src/views/enterprise/myPolicy.vue

@@ -23,7 +23,7 @@
            </el-form-item>
            <el-form-item label="状态" prop="timeOut">
                <el-select v-model="searchForm.timeOut" placeholder="请选择" @change="search">
                    <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-select>
@@ -97,7 +97,9 @@
                </el-table-column>
                <el-table-column prop="statusInfo" align="center" fixed label="状态">
                  <template slot-scope="{row}">
                    <span :class="'apply-status'+row.status">{{row.statusInfo}}</span>
                    <span style="color:#f95601;" v-if="row.status === 5 && row.statusInfo === '待生效'">{{row.statusInfo}}</span>
                    <span style="color:#999;" v-else-if="row.status === 5 && row.statusInfo === '已过期'">{{row.statusInfo}}</span>
                    <span :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
                  </template>
                </el-table-column>
                <el-table-column prop="solutionsName" align="center" fixed label="保险方案" min-width="150"></el-table-column>
@@ -156,7 +158,7 @@
                        <el-button type="text" @click="godetail(row)" v-permissions="['business:insuranceapply:update']">查看详情</el-button>
                      <!--                        <el-button type="text" @click="$refs.OperaApplyChangeMonthWindow.open('加减保月度费用统计',row)" v-permissions="['business:applychange:query']">加减保费用</el-button>
                                          <template v-if="row.statusCollect === 2">-->
                        <el-button type="text" @click="$refs.additionSubtractionApplication.open('加减保申请', { id: row.id })">加减保申请</el-button>
                        <el-button type="text" @click="$refs.additionSubtractionApplication.open('加减保申请', { id: row.id })" v-if="isShow(row.status, row.endTime)">加减保申请</el-button>
<!--                        </template>-->
                    </template>
                </el-table-column>
@@ -216,7 +218,7 @@
        startTimeE: '',
        startTimeS: '',
        baseSolutionId: '',
        status: '5',
        status: '5,27',
        solutionType: '',
        timeOut: ''
      },
@@ -241,6 +243,12 @@
    this.getNum()
  },
  methods: {
    // 判断是否显示加减保
    isShow(status, endTime) {
      const currentDate = new Date();
      const specifiedDate = new Date(endTime);
      return [5,27].includes(status) && (currentDate < specifiedDate);
    },
    godetail (row) {
      if (row.solutionType == 1) {
        this.$refs.OperaWtbApplyShopWindow.open('委托投保详情', { id: row.id })