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 | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 22 deletions(-)
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index bb5a3d4..ef5ac6d 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -21,12 +21,19 @@
<template v-if="2">
<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>
- <el-button v-if=" [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
- <el-button v-if="[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if=" [1].includes(model.status)" type="primary" @click="$refs.OperaUnionChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
+ <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">
@@ -35,7 +42,7 @@
border
style="width: 100%">
<el-table-column
- prop="validCode"
+ prop="code"
align="center"
label="鎵瑰崟鍙�">
</el-table-column>
@@ -173,7 +180,7 @@
</div>
</div>
<UnionChangeDetails ref="ApplyChangeDetails" @success="successEvent" />
- <OperaApplyChangeCheckWindow ref="OperaApplyChangeCheckWindow" @success="successEvent" />
+ <OperaUnionChangeCheckWindow ref="OperaUnionChangeCheckWindow" @success="successEvent" />
<!-- 浼佷笟鐢宠閫�鍥� -->
<!-- <applyReturn ref="applyReturn" @success="successEvent" />-->
<add_subtract_return ref="add_subtract_return" @success="successEvent" />
@@ -207,8 +214,26 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="goSignDo()">纭� 瀹�</el-button>
+ <el-button type="primary" :loading="signing" @click="goSignDo()">纭� 瀹�</el-button>
<el-button @click="visiblePhone=false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="鏌ョ湅淇濋櫓鍗�"
+ :visible.sync="visibleFile"
+ width="500px"
+ :modal="true"
+ :show-close="true"
+ :close-on-click-modal="false"
+ append-to-body
+ center>
+ <div class="desc_item_from" v-for="(item, index) in pidanFileData" :key="index" style="margin-bottom: 15px">
+ <span v-if="index ==0">{{item.name}}锛�</span>
+ <span v-if="index >0">琚繚闄╀汉锛坽{item.name}}锛変繚闄╁崟锛�</span>
+ <a style="cursor: pointer;color: #2E68EC" v-if="item.file && item.file.fileurl" @click="openFile(item.file.fileurlFull)">鍦ㄧ嚎棰勮</a><span v-if="!item.file || !item.file.fileurl">鏈笂浼�</span>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="visibleFile=false">鍏� 闂�</el-button>
</span>
</el-dialog>
<template v-slot:footer>
@@ -222,7 +247,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import UnionChangeDetails from '@/components/business/UnionChangeDetails'
-import OperaApplyChangeCheckWindow from '@/components/business/OperaApplyChangeCheckWindow'
+import OperaUnionChangeCheckWindow from '@/components/business/OperaUnionChangeCheckWindow'
import reinsurance from '@/components/enterprise/reinsurance'
import factoryChange from '@/components/enterprise/factoryChange'
import add_subtract_return from '@/components/enterprise/add_subtract_return'
@@ -231,9 +256,9 @@
} from '@/api/business/insuranceApply'
import {
getById,
+ getSignLink
} from '@/api/business/unionChange'
-import { applyChangeOpt ,
- getChangeMemberListOnlineSignLink} from '@/api/business/applyChange'
+import {applyChangeOpt, listAll as applyList} from '@/api/business/applyChange'
import {sendSms} from "@/api/business/smsEmail";
import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
@@ -245,7 +270,7 @@
components: {
GlobalWindow,
UnionChangeDetails,
- OperaApplyChangeCheckWindow,
+ OperaUnionChangeCheckWindow,
add_subtract_return,
OperaInsuranceApply,
reinsurance,
@@ -258,12 +283,15 @@
modelId:null,
num: 0,
timer: null,
+ signing:false,
signTitle: '鎵嬫満鍙烽獙璇�',
+ pidanFileData:[],
model: {},
visiblePhone: false,
+ 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
@@ -305,6 +333,10 @@
this.model={}
this.form.businessId = target.id
this.num=0
+ this.signing=false
+ this.visiblePhone=false
+ this.visibleFile=false
+ this. pidanFileData=[]
this.timer=null
this.getDetail()
this.getList()
@@ -317,6 +349,11 @@
this.setTime()
})
},
+ openFile (url) {
+ setTimeout(() => {
+ window.open(url)
+ }, 500)
+ },
setTime () {
this.timer = setInterval(() => {
if (this.num === 0) {
@@ -328,13 +365,7 @@
}, 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(() => {
@@ -346,14 +377,16 @@
if (!valid) {
return
}
- this.isWorking = true
+ this.signing = true
if(this.form.type===0){
- getChangeMemberListOnlineSignLink(this.form).then(res => {
+ getSignLink(this.form).then(res => {
setTimeout(() => {
this.visiblePhone=false
+ this.signing=false
window.open(res)
}, 500)
}).catch(err => {
+ this.signing=false
this.$tip.apiFailed(err)
})
}
@@ -407,9 +440,7 @@
}
},
viewPidan(){
- if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
- window.open(this.model.pidanFile.fileurlFull)
- }
+ this.visibleFile=true
},
handleSizeChange(val){
console.log(val)
@@ -423,10 +454,28 @@
},
getDetail(){
+ this.pidanFileData=[]
getById(this.modelId).then(res => {
this.model = res
this.tableData = new Array()
this.tableData.push(res)
+ this.pidanFileData.push({ name: '鍟嗘埛淇濋櫓鍗�', file: this.model.pidanFile })
+ this.getApplyList()
+ }).catch(err => {
+ })
+ },
+ getApplyList () {
+ applyList({ unionChangeId: this.model.id, getFiles: 1 }).then(res => {
+ this.model.applyList = res
+ if (res && res.length > 0) {
+ res.forEach(item => {
+ if (item.pidanFile) {
+ this.pidanFileData.push({ name: item.companyName, file: item.pidanFile })
+ } else {
+ this.pidanFileData.push({ name: item.companyName, file: null })
+ }
+ })
+ }
}).catch(err => {
})
},
--
Gitblit v1.9.3