From 0f409b25f91717e00e10c37738740b22583cb4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 五月 2024 09:00:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index d34d60e..5467066 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -26,7 +26,8 @@
<template v-if="userInfo.type === 1">
<el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 2" type="primary" @click="$refs.operaverifyPhoneNumberWindew.open('楠岃瘉鎵嬫満鍙�')">绛剧讲鎶曚繚鍗�</el-button>
+<!-- $refs.operaverifyPhoneNumberWindew.open('楠岃瘉鎵嬫満鍙�')-->
+ <el-button v-if="model.status == 2" type="primary" :disabled="loading" :loading="loading" @click="goSign()">绛剧讲鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
<el-button v-if="[0, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('鐢宠閫�鍥�', {id: dataId})">鐢宠閫�鍥�</el-button>
@@ -263,6 +264,12 @@
<span>{{row.fee!=null?row.fee: '-'}}</span>
</template>
</el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ </el-table-column>
</el-table>
<el-table
:data="list1"
@@ -318,8 +325,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()"
@@ -377,6 +396,12 @@
prop="applyStartTime"
align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="remark"
+ align="center"
+ label="澶囨敞">
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -516,7 +541,8 @@
gzList: [],
activeName: '0',
total: 0,
- currentPage: 1
+ currentPage: 1,
+ loading: false
}
},
created () {
@@ -736,11 +762,14 @@
this.resetting()
},
goSign(){
+ this.loading = true
getSignLink(this.dataId).then(res => {
- setTimeout(() => {
+ this.loading = false
+ // setTimeout(() => {
window.open(res)
- }, 500);
+ // }, 500);
}).catch(err => {
+ this.loading = false
this.$tip.apiFailed(err)
})
},
--
Gitblit v1.9.3