From 6d6fadc1ead24fde59386f96d384795c803e4a89 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 16:41:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/master'
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index d934f28..b5210c1 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -98,8 +98,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 +200,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 +209,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,30 +224,36 @@
<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="浜х敓璐圭敤锛堝厓锛�">
</el-table-column>
@@ -255,46 +264,55 @@
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>
<span :class="'change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">鐢宠閫�鍥�</span>
<span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">宸查��鍥�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 6">宸插叧闂�</span>
</template>
</el-table-column>
<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="startTime"
+ prop="applyStartTime"
+ align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ align="center"
:key="Math.random()"
label="鎿嶄綔">
<template slot-scope="{row}">
@@ -308,42 +326,50 @@
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>
<span :class="'change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">鐢宠閫�鍥�</span>
<span :class="'change-status'+row.status" v-if="row.status === 5 || row.status === 8">宸查��鍥�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 6">宸插叧闂�</span>
</template>
</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="startTime"
+ 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>
@@ -369,7 +395,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>
@@ -421,7 +447,7 @@
import { mapState } from 'vuex'
export default {
- name: 'OperaInsuranceApplyWindow',
+ name: 'OperaInsuranceApplyWindow1',
extends: BaseOpera,
components: {
GlobalWindow,
@@ -457,7 +483,7 @@
endTimeS: '',
startTimeE: '',
startTimeS: '',
- types: ''
+ type: ''
},
visible1: false,
visible2: false,
@@ -504,7 +530,7 @@
this.formInline.endTimeS = ''
this.formInline.startTimeE = ''
this.formInline.startTimeS = ''
- this.formInline.types = ''
+ this.formInline.type = ''
this.activeName = '0'
this.getDetail()
this.getList()
@@ -622,7 +648,7 @@
endTimeS: this.formInline.endTimeS,
startTimeE: this.formInline.startTimeE,
startTimeS: this.formInline.startTimeS,
- types: this.formInline.types
+ type: this.formInline.type
}
}).then(response => {
this.download(response)
@@ -664,7 +690,7 @@
status: this.formInline.applyStatus,
endTimeE: this.formInline.endTimeS,
endTimeS: this.formInline.startTimeS,
- types: this.formInline.types
+ type: this.formInline.type
}
}).then(res => {
if (this.activeName === '1') {
@@ -685,9 +711,9 @@
handleClick(e) {
this.activeName = e.index
if (e.index === '1') {
- this.formInline.types = 0
+ this.formInline.type = 0
} else if (e.index === '2') {
- this.formInline.types = 1
+ this.formInline.type = 1
}
this.resetting()
},
@@ -746,8 +772,10 @@
}
}
</script>
-<style>
-
+<style scoped>
+ ::v-deep .el-tabs__item{
+ font-weight: 600;
+ }
</style>
<style lang="scss" scoped>
.form {
--
Gitblit v1.9.3