From b6d2a806e6572ffc4c226c91f0a60b31a7b1fbc0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:02:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index fb97b81..e1ac5c8 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -11,7 +11,7 @@
<div class="desc_item_label" v-if="userInfo.type === 1 &&(model.statusCollect === 2 || model.statusCollect === 3)">
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
- <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId })">涓�閿画淇�</el-button>
+ <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
<el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
<el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.factoryChange.open('鎹㈠巶鐢宠', { id: dataId })">鎹㈠巶鐢宠</el-button>
</div>
@@ -35,11 +35,9 @@
<template v-else>
<el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
-<!--
- <el-button v-if="model.status == 2" type="primary" @click="goSign">绛剧讲鎶曚繚鍗�</el-button>
--->
+<!-- <el-button v-if="model.status == 2" type="primary" @click="goSign">绛剧讲鎶曚繚鍗�</el-button>-->
<el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
- <el-button v-if="model.status == 10" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 10 ||model.status == 2" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 3" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 6 || model.status == 7|| model.status == 8" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
<el-button v-if="model.status == 0" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
@@ -87,7 +85,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="浜х敓璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
@@ -98,8 +96,8 @@
</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="1"></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-tabs>
</div>
@@ -200,7 +198,8 @@
ref="table"
v-if="activeName === '0'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
@@ -208,9 +207,11 @@
<el-table-column
:key="Math.random()"
prop="memberName"
+ align="center"
label="鍛樺伐濮撳悕">
</el-table-column>
<el-table-column
+ align="center"
:key="Math.random()"
label="鎬у埆">
<template slot-scope="{row}">
@@ -221,32 +222,38 @@
<el-table-column
:key="Math.random()"
prop="idcardNo"
+ align="center"
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="duName"
+ align="center"
label="娲鹃仯鍗曚綅">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="workTypeName"
+ align="center"
label="鎵�灞炲伐绉�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="startTime"
+ align="center"
label="淇濋櫓鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="endTime"
+ align="center"
label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
prop="fee"
- label="浜х敓璐圭敤锛堝厓锛�">
+ label="宸蹭骇鐢熻垂鐢紙鍏冿級">
</el-table-column>
</el-table>
<el-table
@@ -255,12 +262,14 @@
ref="table"
v-if="activeName === '1'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濆崟鐘舵��" :key="Math.random()">
+ <el-table-column label="淇濆崟鐘舵��" :key="Math.random()"
+ align="center">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
@@ -273,29 +282,35 @@
<el-table-column
:key="Math.random()"
prop="applyCode"
+ align="center"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="addNum"
+ align="center"
label="澧炲姞浜烘暟锛堜汉锛�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="delNum"
+ align="center"
label="鍑忓皯浜烘暟锛堜汉锛�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="createDate"
+ align="center"
label="鎻愪氦鏃堕棿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="applyStartTime"
+ align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ align="center"
:key="Math.random()"
label="鎿嶄綔">
<template slot-scope="{row}">
@@ -309,12 +324,14 @@
ref="table"
v-if="activeName === '2'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濆崟鐘舵��" :key="Math.random()">
+ <el-table-column
+ align="center" label="淇濆崟鐘舵��" :key="Math.random()">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
@@ -326,26 +343,31 @@
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
prop="applyCode"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="changeNum"
+ align="center"
label="鎹㈠巶浜烘暟">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="createDate"
+ align="center"
label="鎻愪氦鏃堕棿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="applyStartTime"
+ align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
label="鎿嶄綔">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
@@ -371,7 +393,7 @@
<div style="display: flex; flex-direction: column;">
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
- <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9].includes(activity.objType)">
+ <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9, 11, 22].includes(activity.objType)">
{{activity.content}}
</span>
</span>
@@ -748,8 +770,10 @@
}
}
</script>
-<style>
-
+<style scoped>
+ ::v-deep .el-tabs__item{
+ font-weight: 600;
+ }
</style>
<style lang="scss" scoped>
.form {
--
Gitblit v1.9.3