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/OperaApplyChangeDetailWindow.vue | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index a4c4046..ee7b975 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -10,7 +10,7 @@
<div class="desc_item">
<div class="desc_item_label">
<div class="desc_item_label_left">
- <span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
+ <span>鎶曚繚1浼佷笟锛歿{ apply.companyName }}</span>
<span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
<span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
<span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
@@ -23,15 +23,15 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
- <el-button type="primary" v-if="[5,8,6].includes(model.status)" @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
+ <el-button type="primary" v-if="[5,8].includes(model.status)" @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
- <el-button type="primary" v-if="model.status == 0" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
+ <el-button type="primary" v-if="model.status == 0" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
<el-button v-if="[0, 1, 3, 7].includes(model.status) && model.solutionType == 0" type="danger" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
<el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="model.status == 2" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if="[5,8].includes(model.status)" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
- <template v-if="2">
+ <template v-if="userInfo.type ===2">
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
@@ -40,16 +40,16 @@
<el-button v-if=" model.solutionType == 1 && [7].includes(model.status)" type="danger" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
<el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="model.solutionType == 0 &&[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
<el-button v-if="model.solutionType == 0 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
- <template v-if="0">
+ <template v-if="userInfo.type ===0">
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="model.solutionType == 0 &&[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
<el-button v-if="model.solutionType == 0 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
</div>
@@ -185,7 +185,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: (activity.creatorType==2? activity.companyName: "骞冲彴绔�") }}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: (activity.creatorType==2? activity.companyName: "骞冲彴绔�") }}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
@@ -307,7 +307,8 @@
list: [],
activeName: '0',
total: 0,
- currentPage: 1
+ currentPage: 1,
+ loading: false
}
},
created () {
@@ -352,18 +353,20 @@
}, 1000)
},
getSignLink (flag) {
- if (flag === 0) {
- this.signTitle = '绛剧讲鏂规纭涔�'
- } else if (flag === 1) {
this.signTitle = '绛剧讲鐢宠鍗�'
- } else if (flag === 2) {
- this.signTitle = '绛剧讲鎶曚繚鍗�'
- }
this.form.type = flag
- this.visiblePhone = true
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- });
+ this.loading = true
+ getChangeMemberListOnlineSignLink(this.form).then(res => {
+ this.loading = false
+ window.open(res)
+ }).catch(err => {
+ this.loading = false
+ this.$tip.apiFailed(err)
+ })
+ // this.visiblePhone = true
+ // this.$nextTick(() => {
+ // this.$refs.form.resetFields()
+ // });
},
goSignDo(){
this.$refs.form.validate((valid) => {
@@ -440,7 +443,7 @@
},
handleCurrentChange(val){
console.log(val)
- this.page = val
+ this.currentPage = val
this.getList()
},
onSubmit(){
--
Gitblit v1.9.3