From 529d0b8982cf30f57ba7e366c0f822c1d82c0b69 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 五月 2024 13:37:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 594607a..efe4123 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -24,14 +24,14 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
- <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="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
- <el-button v-if="model.status == 4" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
- <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 == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
-<!-- goSign-->
- <el-button v-if="model.status == 2" type="primary" @click="$refs.operaverifyPhoneNumberWindew.open('楠岃瘉鎵嬫満鍙�')">绛剧讲鎶曚繚鍗�</el-button>
+ <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>
+<!-- $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>
+ <el-button v-if="model.status == 4" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-else>
<el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
@@ -260,6 +260,9 @@
align="center"
prop="fee"
label="浜х敓璐圭敤">
+ <template slot-scope="{row}">
+ <span>{{row.fee!=null?row.fee: '-'}}</span>
+ </template>
</el-table-column>
</el-table>
<el-table
@@ -284,11 +287,13 @@
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">鐢宠閫�鍥�</span>
<span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">宸查��鍥�</span>
<span :class="'change-status'+row.status" v-if="row.status === 6">宸插叧闂�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 7">寰呭嚭鍗�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 9">鎶曚繚涓�</span>
</template>
</el-table-column>
<el-table-column
:key="Math.random()"
- prop="applyCode"
+ prop="validCode"
align="center"
label="鎵瑰崟鍙�">
</el-table-column>
@@ -325,8 +330,8 @@
</template>
</el-table-column>
</el-table>
- <el-table
- :data="list2"
+ <el-table
+ :data="list2"
border
ref="table"
v-if="activeName === '2'"
@@ -346,12 +351,14 @@
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">鐢宠閫�鍥�</span>
<span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">宸查��鍥�</span>
<span :class="'change-status'+row.status" v-if="row.status === 6">宸插叧闂�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 7">寰呭嚭鍗�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 9">鎶曚繚涓�</span>
</template>
</el-table-column>
<el-table-column
:key="Math.random()"
align="center"
- prop="applyCode"
+ prop="validCode"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
@@ -510,7 +517,8 @@
gzList: [],
activeName: '0',
total: 0,
- currentPage: 1
+ currentPage: 1,
+ loading: false
}
},
created () {
@@ -730,11 +738,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)
})
},
@@ -768,6 +779,7 @@
},
getDetail(){
getDetail(this.dataId).then(res => {
+ console.log(res)
this.model = res
this.tableData = new Array()
this.tableData.push(res)
--
Gitblit v1.9.3