From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index ec7d1b2..3ea73c1 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -20,16 +20,19 @@
<div class="desc_item_label_left">
<span>鎶曚繚浜猴細{{ model.shopName }}</span>
<span>琚繚闄╀汉锛歿{ model.companyName }}</span>
- <span>淇濆崟鐘舵�侊細<span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span></span>
+ <span>淇濆崟鐘舵�侊細
+ <span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span>
+ </span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
+ <el-button type="primary" @click="viewConfirmationLetter">鏌ョ湅鏂规纭涔�</el-button>
<el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
<template v-if="userInfo.type === 1">
<el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApplyAddWindow.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="[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) && 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="[1,2,3].includes(model.unionApplyTbdStatus) && (model.toubaodanFile || model.toubaodanSignedFile) && model.signType !== 1" 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" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
@@ -38,7 +41,7 @@
<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="[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) && 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>
@@ -47,7 +50,7 @@
<el-button v-if="model.status == 23" type="danger" @click="$refs.OperaWtbApplyCheckWindow.open('鍏抽棴鐢宠',model,2)">鍏抽棴鐢宠</el-button>
</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="[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) && 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>
@@ -80,15 +83,7 @@
align="center"
:label="getApplyTimeTitle(1,model.solutionType,model)">
</el-table-column>
- <el-table-column
- prop="insureNum"
- align="center"
- label="鎶曚繚浜烘暟">
- <template scope="{row}">
- <span>{{row.insureNum||0}} 浜�</span>
- </template>
- </el-table-column>
- <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" >
+ <el-table-column prop="guaranteeNum" align="center" label="褰撳墠鍦ㄤ繚浜烘暟" >
<template scope="{row}">
<span>{{row.guaranteeNum||0}} 浜�</span>
</template>
@@ -104,10 +99,10 @@
<el-table-column
prop="currentFee"
align="center"
- label="宸蹭骇鐢熻垂鐢�">
- <template scope="{row}">
- <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
- </template>
+ label="鎵规敼璐圭敤鍚堣">
+ <template slot-scope="{row}">
+ <span>{{row.changeMoney}}鍏�</span>
+ </template>
</el-table-column>
<el-table-column
prop="fee"
@@ -121,9 +116,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="model.hasDispatchUnit !== 1 ? '鏇存崲娲鹃仯鍗曚綅' : '鏇存崲宸ョ璁板綍'" name="2"></el-tab-pane>
</el-tabs>
</div>
<div class="desc_item_search">
@@ -134,9 +129,10 @@
<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="duId">
+ <el-form-item label="娲鹃仯鍗曚綅" prop="duId" v-if="model.hasDispatchUnit !== 1">
<el-select v-model="formInline.duId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in dwList"
@@ -216,6 +212,7 @@
<el-button @click="resetting" style="width: 80px;">閲嶇疆</el-button>
<el-button type="primary" style="width: 80px;" @click="exportExcel" v-if="activeName === '0'">瀵煎嚭鍚嶅崟</el-button>
<el-button type="primary" style="width: 100px;" @click="$refs.OperaApplyChangeMonthWindow.open('鍔犲噺淇濊垂鐢ㄦ湀搴︾粺璁�',model)" v-if="activeName === '1'">璐圭敤缁熻鏌ヨ</el-button>
+ <el-button type="primary" style="width: 120px;" @click="exportRecords" v-if="activeName === '1' && [5,27].includes(model.status)">瀵煎嚭鍔犲噺淇濊褰�</el-button>
</el-form-item>
</el-form>
</div>
@@ -248,12 +245,23 @@
</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: #f95601;">寰呯敓鏁�</span>
+ </template>
+ </el-table-column>
+ <el-table-column
:key="Math.random()"
prop="idcardNo"
align="center"
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ v-if="model.hasDispatchUnit !== 1"
:key="Math.random()"
prop="duName"
align="center"
@@ -410,7 +418,7 @@
:key="Math.random()"
prop="changeNum"
align="center"
- label="鏇存崲娲鹃仯鍗曚綅浜烘暟">
+ :label="model.hasDispatchUnit !== 1 ? '鏇存崲娲鹃仯鍗曚綅浜烘暟' : '鏇存崲宸ョ浜烘暟'">
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -544,7 +552,7 @@
getMemberListOnlineSignLink, getSignTBQRSLink, getSignWTBTBDLink
} from '@/api/business/insuranceApply'
import { findListByDTO } from '@/api/business/dispatchUnit'
-import { fetchList } from '@/api/business/applyChange'
+import { fetchList, exportApplyJiajianBaoExcel } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
import { mapState } from 'vuex'
import {sendSms} from '@/api/business/smsEmail';
@@ -657,6 +665,15 @@
this.getDW()
this.getGZ()
},
+ exportRecords() {
+ exportApplyJiajianBaoExcel({ id: this.dataId })
+ .then(response => {
+ this.download(response)
+ })
+ },
+ viewConfirmationLetter() {
+ this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鏂规纭涔�', this.model.fanganFile.fileurlFull)
+ },
getSignLink (flag) {
if (flag === 0) {
this.signTitle = '绛剧讲鏂规纭涔�'
@@ -688,6 +705,8 @@
// }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.loading = false
})
} else if (this.form.type === 1) {
getMemberListOnlineSignLink(this.form).then(res => {
@@ -698,6 +717,8 @@
// }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.loading = false
})
} else if (this.form.type === 2) {
getSignWTBTBDLink(this.form).then(res => {
@@ -708,6 +729,8 @@
// }, 500)
}).catch(err => {
this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.loading = false
})
}
// })
--
Gitblit v1.9.3