From 71e2d06dfa28d3bd60b0d9fa6d6c7ff32884a1a9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 14:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaUnionChangeDetailWindow.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index 8efe993..ef5ac6d 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -27,7 +27,13 @@
<el-button v-if="[0,1].includes(model.status)" type="danger" @click="$refs.OperaUnionChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
</template>
<template v-if="0">
- </template>
+ <template v-if="0">
+ <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
+ <el-button v-if="[1,2].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button v-if="[0].includes(model.status)" type="primary" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
+ </template>
+ </template>
</div>
</div>
<div class="desc_item_from">
@@ -36,7 +42,7 @@
border
style="width: 100%">
<el-table-column
- prop="validCode"
+ prop="code"
align="center"
label="鎵瑰崟鍙�">
</el-table-column>
@@ -285,7 +291,7 @@
visibleFile:false,
form: {
businessId: null,
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
id: null,
editDate: '',
code:null
@@ -343,6 +349,11 @@
this.setTime()
})
},
+ openFile (url) {
+ setTimeout(() => {
+ window.open(url)
+ }, 500)
+ },
setTime () {
this.timer = setInterval(() => {
if (this.num === 0) {
@@ -354,7 +365,7 @@
}, 1000)
},
getSignLink (flag) {
- this.signTitle = '绛剧讲鏂规纭涔�'
+ this.signTitle = '绛剧讲鐢宠鍗�'
this.form.type = flag
this.visiblePhone = true
this.$nextTick(() => {
--
Gitblit v1.9.3