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/OperaWtbApplyShopWindow.vue | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 6b4359d..d31b62f 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -12,8 +12,8 @@
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
<el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
- <el-button type="primary" v-if="model.status === 27" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
- <el-button type="primary" v-if="model.status === 27" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
+ <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
+ <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
</div>
</div>
<div class="desc_item_label">
@@ -28,18 +28,18 @@
<template v-if="userInfo.type === 1">
<el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
- <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button v-if="[22,23,24,25,26,27].includes(model.status) && model.shenqingdanFile" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
<el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<!-- goSign-->
- <el-button v-if="model.status == 20" type="primary" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
- <el-button v-if="model.status == 21" type="primary" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="model.unionApplyTbdStatus == 1" type="primary" @click="getSignLink(2)">绛剧讲鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 24" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
+ <el-button v-if="model.status == 20" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
+ <el-button v-if="model.status == 21" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="model.unionApplyTbdStatus == 1" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(2)">绛剧讲鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 24" type="danger" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-if="userInfo.type === 2">
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
- <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button v-if="[22,23,24,25,26,27].includes(model.status) && model.shenqingdanFile" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
<el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 22" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
@@ -48,7 +48,7 @@
</template>
<template v-if="userInfo.type === 0">
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
- <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button v-if="[22,23,24,25,26,27].includes(model.status) && model.shenqingdanFile" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
<el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
</template>
@@ -180,6 +180,8 @@
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
<el-option label="宸查��鍥�" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
+ <el-option label="寰呭嚭鍗�" value="7"></el-option>
+ <el-option label="鎶曚繚涓�" value="9"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="end">
@@ -292,11 +294,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>
@@ -354,12 +358,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
@@ -562,7 +568,9 @@
gzList: [],
activeName: '0',
total: 0,
- currentPage: 1
+ currentPage: 1,
+
+ loading: false
}
},
created () {
@@ -610,46 +618,51 @@
this.signTitle = '绛剧讲鎶曚繚鍗�'
}
this.form.type = flag
- this.visiblePhone = true
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- });
+ this.goSignDo()
+ // this.visiblePhone = true
+ // this.$nextTick(() => {
+ // this.$refs.form.resetFields()
+ // });
},
goSignDo(){
- this.$refs.form.validate((valid) => {
- if (!valid) {
- return
- }
- this.isWorking = true
+ // this.$refs.form.validate((valid) => {
+ // if (!valid) {
+ // return
+ // }
+ // this.isWorking = true
+ this.loading = true
if(this.form.type===0){
getSignTBQRSLink(this.form).then(res => {
- setTimeout(() => {
- this.visiblePhone=false
+ this.loading = false
+ // setTimeout(() => {
+ // this.visiblePhone=false
window.open(res)
- }, 500)
+ // }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
})
} else if (this.form.type === 1) {
getMemberListOnlineSignLink(this.form).then(res => {
- setTimeout(() => {
- this.visiblePhone=false
+ this.loading = false
+ // setTimeout(() => {
+ // this.visiblePhone=false
window.open(res)
- }, 500)
+ // }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
})
} else if (this.form.type === 2) {
getSignWTBTBDLink(this.form).then(res => {
- setTimeout(() => {
- this.visiblePhone=false
+ this.loading = false
+ // setTimeout(() => {
+ // this.visiblePhone=false
window.open(res)
- }, 500)
+ // }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
})
}
- })
+ // })
},
send () {
sendSms({
--
Gitblit v1.9.3