From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/detailsEntrustedInsurance.vue | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 6b07c9c..d57101c 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -11,23 +11,40 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浜猴細{{ model.companyName }}</span>
- <span>淇濆崟鐘舵�侊細<span :class="'union-apply-status'+model.status" >{{ model.statusInfo }}</span></span>
+ <span>淇濆崟鐘舵�侊細
+ <span v-if="model.status === 5 && model.statusInfo === '寰呭鏍�'" style="color: #216EEE;">{{ model.statusInfo }}</span>
+ <span v-else-if="model.status === 3 && model.statusInfo === '宸茶繃鏈�'" style="color: #999;">{{ model.statusInfo }}</span>
+ <span v-else-if="model.status === 3 && model.statusInfo === '寰呯敓鏁�'" style="color: #f95601;">{{ model.statusInfo }}</span>
+ <span v-else-if="model.status === 4 && model.statusInfo === '宸查��鍥�'" style="color: red;">{{ model.statusInfo }}</span>
+ <span :class="'union-apply-status'+model.status" v-else>{{ model.statusInfo }}</span>
+ </span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 2">
- <el-button type="primary" @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
+ <el-button type="primary" @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[0].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 1" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鎶曚繚鍗�</el-button>
- <el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="[2].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
+ <el-button v-if="model.status == 1" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">{{model.signType === 1 ? '绛剧讲鐢宠鍗�' : '绛剧讲鎶曚繚鍗�'}}</el-button>
+ <el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</el-button>
+<!-- <el-button v-if="[2].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>-->
<el-button v-if="model.status == 3" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+
+ <el-button v-if="[2,3,4,1,5].includes(model.status) && (model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</el-button>
+ <el-button v-if="[0,1,2,5].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+ <el-button v-if="[5].includes(model.status)" type="primary" @click="fusheng">鎶曚繚澶嶅</el-button>
+
<el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
</template>
<template v-if="userInfo.type ===0">
+ <el-button v-if="[2,3,4,1,5].includes(model.status) && (model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</el-button>
+ <el-button v-if="[0].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
+ <el-button v-if="[0, 1].includes(model.status)" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">{{model.signType === 1 ? '绛剧讲鐢宠鍗�' : '绛剧讲鎶曚繚鍗�'}}</el-button>
+ <el-button v-if="[0,1,2,5].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+ <el-button v-if="[2].includes(model.status)" type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
<el-button type="primary" @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
- <el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+<!-- <el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>-->
<el-button v-if="[4].includes(model.status)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+ <el-button v-if="[5].includes(model.status)" type="primary" @click="fusheng">鎶曚繚澶嶅</el-button>
</template>
</div>
</div>
@@ -98,9 +115,9 @@
</div>
<div class="desc_item_cate">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鍦ㄤ繚浜哄憳" name="0" ></el-tab-pane>
+ <el-tab-pane label="淇濆崟浜哄憳" name="0" ></el-tab-pane>
<el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
- <el-tab-pane label="鏇存崲娲鹃仯鍗曚綅璁板綍" name="2"></el-tab-pane>
+ <el-tab-pane label="鏇存崲宸ョ璁板綍" name="2"></el-tab-pane>
</el-tabs>
</div>
<div class="desc_item_search">
@@ -111,6 +128,7 @@
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="淇濋殰涓�" value="1"></el-option>
<el-option label="涓嶅湪淇�" value="2"></el-option>
+ <el-option label="寰呯敓鏁�" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍛樺伐濮撳悕" prop="memberName">
@@ -178,6 +196,16 @@
</template>
</el-table-column>
<el-table-column
+ align="center"
+ :key="Math.random()"
+ label="鍦ㄤ繚鐘舵��">
+ <template slot-scope="{row}">
+ <span v-if="row.applyStatus === 0" style="color: #00BA92;">淇濋殰涓�</span>
+ <span v-if="row.applyStatus === 1" style="color: #999;">涓嶅湪淇�</span>
+ <span v-if="row.applyStatus === 2" style="color: #00BA92;">寰呯敓鏁�</span>
+ </template>
+ </el-table-column>
+ <el-table-column
:key="Math.random()"
prop="idcardNo"
align="center"
@@ -190,6 +218,7 @@
label="琚繚闄╀汉">
</el-table-column>
<el-table-column
+ v-if="model.hasDispatchUnit !== 1"
:key="Math.random()"
prop="duName"
align="center"
@@ -322,7 +351,7 @@
:key="Math.random()"
prop="changeNum"
align="center"
- label="鏇存崲娲鹃仯鍗曚綅浜烘暟">
+ label="鏇存崲宸ョ浜烘暟">
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -450,7 +479,7 @@
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import OperaUnionApplyCheckWindow from '@/components/business/OperaUnionApplyCheckWindow'
-import { getById, getSignLink } from '@/api/business/unionApply'
+import { getById, getSignLink, reexamineCheck } from '@/api/business/unionApply'
import {
applyDetailPage,
@@ -560,6 +589,20 @@
this.getList()
this.getDW()
this.getGZ()
+ },
+ fusheng() {
+ this.$confirm('鏄惁纭畾澶嶅閫氳繃?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ reexamineCheck({ id: this.dataId })
+ .then(res => {
+ this.getDetail()
+ })
+ }).catch(() => {
+
+ });
},
getSignLink (flag) {
if (flag === 0) {
@@ -814,10 +857,11 @@
}, 500)
},
viewToubaodan () {
- this.fileData = this.taobaodanFileData;
- this.visibleFile=true
- this.fileTitle='鏌ョ湅鎶曚繚鍗�'
- this.fileFlag = 0
+ if (this.model.toubaodanSignedFile) {
+ this.$refs.OperaPdfViewerWindow.open(this.model.toubaodanSignedFile.name, this.model.toubaodanSignedFile.fileurlFull)
+ } else if (this.model.toubaodanFile) {
+ this.$refs.OperaPdfViewerWindow.open(this.model.toubaodanFile.name, this.model.toubaodanFile.fileurlFull)
+ }
},
viewBaoxiandan () {
this.fileFlag = 1
--
Gitblit v1.9.3