From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/enterprise/myPolicy.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index b711b90..19f8a23 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/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>
@@ -156,7 +156,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>
@@ -241,6 +241,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 })
--
Gitblit v1.9.3