From e3ac616c2a3ef63073a454b9c91e6bff1e4243d0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 六月 2024 18:45:26 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OpearaUnionChange.vue | 2
company/src/components/business/OperaSolutionsDescWindow.vue | 4
company/src/components/business/InsuranceDetailsWtb.vue | 4
company/src/components/business/OperaInsuranceApplyWindow.vue | 23 ++++
company/src/components/business/OpearaUnionChangeUnit.vue | 2
company/src/views/enterprise/myPolicy.vue | 10 +-
company/src/components/business/UnionChangeDetails.vue | 40 ++++---
company/src/views/business/applyChangeShop.vue | 4
company/src/views/business/unionChangeUnit.vue | 2
company/src/components/business/UnionChangeUnitDetails.vue | 2
company/src/views/business/unionChange.vue | 4
server/service/src/main/java/com/doumee/core/utils/Constants.java | 31 +++++
company/src/components/business/OperaUnionChangeUnitDetailWindow.vue | 2
company/src/views/enterprise/switchCourt.vue | 2
company/src/views/business/switchCourt.vue | 2
company/src/components/business/OperaWtbApplyShopWindow.vue | 29 ++++-
company/src/components/business/detailsEntrustedInsurance.vue | 32 ++++-
company/src/components/base/BaseOpera.vue | 18 +++
company/src/components/business/OperaUnionChangeDetailWindow.vue | 4
company/src/views/business/insuranceApplyShop.vue | 4
company/src/components/business/OpearaUnionApply.vue | 2
company/src/views/business/insuranceApply.vue | 4
company/src/views/business/member.vue | 32 +++---
company/src/components/business/ApplyChangeDetails1.vue | 4
company/src/views/enterprise/add_subtract.vue | 6
company/src/views/enterprise/insuranceApply.vue | 4
company/src/components/business/add_subtract_entrust.vue | 2
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 6
28 files changed, 186 insertions(+), 95 deletions(-)
diff --git a/company/src/components/base/BaseOpera.vue b/company/src/components/base/BaseOpera.vue
index 8c8ffaf..f5c7aba 100644
--- a/company/src/components/base/BaseOpera.vue
+++ b/company/src/components/base/BaseOpera.vue
@@ -83,7 +83,23 @@
getChangApplyTimeTitle (changeType, model) {
if (changeType === 2) {
return model.status === 2 ? '鎵瑰崟鐢熸晥鏈�' : '鏈熸湜鎵瑰崟鐢熸晥鏈�'
- }else if (changeType === 1) {
+ } else if (changeType === 1) {
+ return model.status === 2 ? '鎵瑰鐢熸晥璧锋湡' : '鏈熸湜鎵瑰鐢熸晥璧锋湡'
+ } else {
+ return model.status === 2 ? '鎵瑰噺鐢熸晥璧锋湡' : '鏈熸湜鎵瑰噺鐢熸晥璧锋湡'
+ }
+ },
+ getUnionApplyTimeTitle (type, model) {
+ if (type === 1) {
+ return model.status === 3 ? '淇濋櫓鐢熸晥璧锋湡' : '鏈熸湜鐢熸晥璧锋湡'
+ } else {
+ return model.status === 3 ? '淇濋櫓鐢熸晥姝㈡湡' : '鏈熸湜鐢熸晥姝㈡湡'
+ }
+ },
+ getUnionChangTimeTitle (changeType, model) {
+ if (changeType === 2) {
+ return model.status === 2 ? '鎵瑰崟鐢熸晥鏈�' : '鏈熸湜鎵瑰崟鐢熸晥鏈�'
+ } else if (changeType === 1) {
return model.status === 2 ? '鎵瑰鐢熸晥璧锋湡' : '鏈熸湜鎵瑰鐢熸晥璧锋湡'
} else {
return model.status === 2 ? '鎵瑰噺鐢熸晥璧锋湡' : '鏈熸湜鎵瑰噺鐢熸晥璧锋湡'
diff --git a/company/src/components/business/ApplyChangeDetails1.vue b/company/src/components/business/ApplyChangeDetails1.vue
index a99b919..e1506bb 100644
--- a/company/src/components/business/ApplyChangeDetails1.vue
+++ b/company/src/components/business/ApplyChangeDetails1.vue
@@ -27,8 +27,8 @@
<div class="box_table_content_item box_table_content_header">{{form.code}}</div>
<div class="box_table_content_item box_table_content_header">{{form.startTime}}</div>
<div class="box_table_content_item box_table_content_header">{{form.endTime}}</div>
- <div class="box_table_content_item box_table_content_header">{{arr1.length}}浜�</div>
- <div class="box_table_content_item box_table_content_header">{{arr2.length}}浜�</div>
+ <div class="box_table_content_item box_table_content_header">{{arr1.length}} 浜�</div>
+ <div class="box_table_content_item box_table_content_header">{{arr2.length}} 浜�</div>
<!-- <div class="box_table_content_item box_table_content_header">{{form.applyStartTime}}</div>-->
</div>
</div>
diff --git a/company/src/components/business/InsuranceDetailsWtb.vue b/company/src/components/business/InsuranceDetailsWtb.vue
index 7ddda10..edae5de 100644
--- a/company/src/components/business/InsuranceDetailsWtb.vue
+++ b/company/src/components/business/InsuranceDetailsWtb.vue
@@ -15,8 +15,8 @@
<div class="box_table_head_item">鎶曚繚浜�</div>
<div class="box_table_head_item">琚繚闄╀汉</div>
<div class="box_table_head_item">淇濋櫓鏂规</div>
- <div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
- <div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
+ <div class="box_table_head_item">{{ getUnionApplyTimeTitle(1,model)}}</div>
+ <div class="box_table_head_item">{{ getUnionApplyTimeTitle(0,model)}}</div>
<div class="box_table_head_item">鍦ㄤ繚/鎶曚繚浜烘暟</div>
<div class="box_table_head_item">鎬昏垂鐢�(鍏�)</div>
</div>
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index db5f01a..418f783 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -37,7 +37,7 @@
</div>
</el-form-item>
<el-form-item label="璐圭敤" v-if="item">
- <span>{{item.price}}鍏�</span>
+ <span>{{item.price}} 鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
<span v-if="item.timeUnit === 2">/鏈�</span>
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index 9720ea7..87688e9 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -28,7 +28,7 @@
</div>
</el-form-item>-->
<el-form-item label="璐圭敤" v-if="model">
- <span>{{model.price}}鍏�</span>
+ <span>{{model.price}} 鍏�</span>
<span v-if="model.timeUnit === 0">/澶�</span>
<span v-if="model.timeUnit === 1">/鍗婃湀</span>
<span v-if="model.timeUnit === 2">/鏈�</span>
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index a623ece..d926a59 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -29,7 +29,7 @@
</div>
</el-form-item>
<el-form-item label="璐圭敤" v-if="model">
- <span>{{model.price}}鍏�</span>
+ <span>{{model.price}} 鍏�</span>
<span v-if="model.timeUnit === 0">/澶�</span>
<span v-if="model.timeUnit === 1">/鍗婃湀</span>
<span v-if="model.timeUnit === 2">/鏈�</span>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 2b46d54..2407d51 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -195,6 +195,8 @@
<el-button type="primary" style="width: 80px;" @click="search">鏌ヨ</el-button>
<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-form-item>
</el-form>
</div>
@@ -308,13 +310,19 @@
:key="Math.random()"
prop="addNum"
align="center"
- label="澧炲姞浜烘暟锛堜汉锛�">
+ label="澧炲姞浜烘暟">
+ <template scope="{row}">
+ {{row.addNum||0}} 浜�
+ </template>
</el-table-column>
<el-table-column
:key="Math.random()"
prop="delNum"
align="center"
- label="鍑忓皯浜烘暟锛堜汉锛�">
+ label="鍑忓皯浜烘暟 ">
+ <template scope="{row}">
+ {{row.delNum||0}} 浜�
+ </template>
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -338,7 +346,10 @@
:key="Math.random()"
prop="fee"
align="center"
- label="璐圭敤鍙樻洿(鍏�)">
+ label="璐圭敤鍙樻洿">
+ <template scope="{row}">
+ {{row.fee||0}}鍏�
+ </template>
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -391,6 +402,9 @@
prop="changeNum"
align="center"
label="鏇存崲娲鹃仯鍗曚綅浜烘暟">
+ <template scope="{row}">
+ {{row.changeNum||0}} 浜�
+ </template>
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -468,6 +482,7 @@
<!-- 楠岃瘉鎵嬫満鍙� -->
<operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
<OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
+ <OperaApplyChangeMonthWindow ref="OperaApplyChangeMonthWindow" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -483,6 +498,7 @@
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
+import OperaApplyChangeMonthWindow from '@/components/business/OperaApplyChangeMonthWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import applyReturn from '@/components/enterprise/applyReturn'
@@ -504,6 +520,7 @@
applyReturn,
additionSubtractionApplication,
factoryChange,
+ OperaApplyChangeMonthWindow,
OperaApplyChangeDetailWindow,
OperaApplyChangeUnitDetailWindow,
OperaInsuranceApplyAddWindow,
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index ae42aab..ff8ba1c 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -73,11 +73,11 @@
</div>
<div class="info_list_item">
<div class="info_list_item_label">鎵瑰鐢熸晥锛�</div>
- <div class="info_list_item_val">{{form.addValidDays||0}}澶�</div>
+ <div class="info_list_item_val">{{form.addValidDays||0}} 澶�</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">鎵瑰噺鐢熸晥锛�</div>
- <div class="info_list_item_val">{{form.delValidDays||0}}澶�</div>
+ <div class="info_list_item_val">{{form.delValidDays||0}} 澶�</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">鎵规敼鏀寔锛�</div>
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index 8c4d29a..0f909fe 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -76,12 +76,12 @@
<el-table-column
prop="applyStartTime"
align="center"
- label="鎵瑰鐢熸晥鏃ユ湡">
+ :label="getUnionChangTimeTitle(1,model)">
</el-table-column>
<el-table-column
prop="delValidTime"
align="center"
- label="鎵瑰噺鐢熸晥鏃ユ湡">
+ :label="getUnionChangTimeTitle(0,model)">
</el-table-column>
<el-table-column
prop="addNum"
diff --git a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
index a4848fa..57385f7 100644
--- a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
@@ -79,7 +79,7 @@
<el-table-column
prop="applyStartTime"
align="center"
- label="鎵瑰崟鐢熸晥璧锋湡">
+ :label="getUnionChangTimeTitle(2,model)">
</el-table-column>
</el-table>
</div>
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 9bf5ceb..e6dde8a 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -84,24 +84,37 @@
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>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" >
+ <template scope="{row}">
+ <span>{{row.guaranteeNum||0}} 浜�</span>
+ </template>
+ </el-table-column>
<el-table-column
prop="serviceDays"
align="center"
- label="淇濆崟鏃堕暱锛堝ぉ锛�">
+ label="淇濆崟鏃堕暱">
+ <template scope="{row}">
+ <span>{{row.serviceDays||0}} 澶�</span>
+ </template>
</el-table-column>
<el-table-column
prop="currentFee"
align="center"
- label="宸蹭骇鐢熻垂鐢�(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�">
+ <template scope="{row}">
+ <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
+ </template>
</el-table-column>
<el-table-column
prop="fee"
align="center"
- label="鎬昏垂鐢�(鍏�)">
+ label="鎬昏垂鐢�">
<template slot-scope="{row}">
- <span>{{row.fee!=null?row.fee: '-'}}</span>
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
</el-table>
@@ -202,6 +215,7 @@
<el-button type="primary" style="width: 80px;" @click="search">鏌ヨ</el-button>
<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-form-item>
</el-form>
</div>
@@ -269,7 +283,7 @@
prop="fee"
label="浜х敓璐圭敤">
<template slot-scope="{row}">
- <span>{{row.fee!=null?row.fee: '-'}}</span>
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column
@@ -472,6 +486,7 @@
<OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/>
<!-- 楠岃瘉鎵嬫満鍙� -->
<OperaPdfViewerWindow ref="OperaPdfViewerWindow" />
+ <OperaApplyChangeMonthWindow ref="OperaApplyChangeMonthWindow" />
<operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
@@ -517,6 +532,7 @@
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
+import OperaApplyChangeMonthWindow from '@/components/business/OperaApplyChangeMonthWindow'
import applyReturn from '@/components/enterprise/applyReturn'
import {
getDetail,
@@ -542,6 +558,7 @@
OperaPdfViewerWindow,
OperaWtbApplyCheckWindow,
applyReturn,
+ OperaApplyChangeMonthWindow,
OperaInsuranceApplyAddWindowNew,
additionSubtractionApplication,
factoryChange,
diff --git a/company/src/components/business/UnionChangeDetails.vue b/company/src/components/business/UnionChangeDetails.vue
index 44cc266..f7ea623 100644
--- a/company/src/components/business/UnionChangeDetails.vue
+++ b/company/src/components/business/UnionChangeDetails.vue
@@ -12,32 +12,32 @@
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item" style="flex: 1.5">鎶曚繚浜�</div>
- <div class="box_table_head_item" style="flex: 1.5">淇濋櫓鏂规</div>
- <div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
- <div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
+ <div class="box_table_head_item" style="flex: 2">鎶曚繚浜�</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鏂规</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鐢熸晥璧锋湡</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鐢熸晥姝㈡湡</div>
<div class="box_table_head_item">淇濆崟鍙�</div>
- <div class="box_table_head_item" style="flex: 0.5">鍔犱繚浜烘暟</div>
- <div class="box_table_head_item" style="flex: 0.5">鍑忎繚浜烘暟</div>
- <div class="box_table_head_item">鎵瑰鐢熸晥鏃ユ湡</div>
- <div class="box_table_head_item">鎵瑰噺鐢熸晥鏃ユ湡</div>
+ <div class="box_table_head_item" >鍔犱繚浜烘暟</div>
+ <div class="box_table_head_item" >鍑忎繚浜烘暟</div>
+ <div class="box_table_head_item" style="flex: 2">{{ getUnionChangTimeTitle(1,model) }}</div>
+ <div class="box_table_head_item" style="flex: 2">{{ getUnionChangTimeTitle(0,model) }}</div>
</div>
<div class="box_table_content " >
- <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ model.shopName }}</div>
- <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ model.solutionsName }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.startTime }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.endTime }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.shopName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.solutionsName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.startTime }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.endTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.applyCode }}</div>
- <div class="box_table_content_item box_table_content_header" style="flex: 0.5">{{ model.addNum}}</div>
- <div class="box_table_content_item box_table_content_header" style="flex: 0.5">{{ model.delNum}}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.delValidTime}}</div>
+ <div class="box_table_content_item box_table_content_header" >{{ model.addNum}}</div>
+ <div class="box_table_content_item box_table_content_header" >{{ model.delNum}}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.applyStartTime}}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.delValidTime}}</div>
</div>
</div>
<div class="box_table">
<div class="box_table_head box_table_content">
- <div class="box_table_head_item" style=" flex: 1.5;border-bottom: 0px">琚繚闄╀汉</div>
- <div class="box_table_content_item box_table_content_header" style=" flex: 7.5;">
+ <div class="box_table_head_item" style=" flex: 2; border-bottom: 0px">琚繚闄╀汉</div>
+ <div class="box_table_content_item box_table_content_header" style=" flex: 14.7;">
<p v-for="(item, index) in companyList" :key="index" >
{{index>0?'锛�':''}} {{ item[1]}}
</p>
@@ -66,7 +66,7 @@
<div class="box_table_content_item">{{ item.companyName }}</div>
<div class="box_table_content_item">{{ item.duName }}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
- <div class="box_table_content_item" style="align-items: baseline;cursor: pointer; " :title="item.remark"{{item.remark}}</div>
+ <div class="box_table_content_item" style="align-items: baseline;cursor: pointer; " :title="item.remark">{{item.remark}}</div>
</div>
</div>
<div class="box_table" v-if="delList && delList.length>0">
@@ -301,6 +301,7 @@
height: 50px;
background: #f2f2f2;
display: flex;
+ padding: 10px;
align-items: center;
justify-content: center;
font-size: 14px;
@@ -314,6 +315,7 @@
height: 50px;
background: #f2f2f2;
display: flex;
+ padding: 10px;
align-items: center;
justify-content: center;
font-size: 14px;
diff --git a/company/src/components/business/UnionChangeUnitDetails.vue b/company/src/components/business/UnionChangeUnitDetails.vue
index b67ade6..44b62c3 100644
--- a/company/src/components/business/UnionChangeUnitDetails.vue
+++ b/company/src/components/business/UnionChangeUnitDetails.vue
@@ -18,7 +18,7 @@
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
<div class="box_table_head_item">淇濆崟鍙�</div>
<div class="box_table_head_item">鎹㈠巶</div>
- <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+ <div class="box_table_head_item">{{ getUnionChangTimeTitle(2,model) }}</div>
</div>
<div class="box_table_content " >
<div class="box_table_content_item box_table_content_header">{{ model.shopName }}</div>
diff --git a/company/src/components/business/add_subtract_entrust.vue b/company/src/components/business/add_subtract_entrust.vue
index e51322a..f9ee79f 100644
--- a/company/src/components/business/add_subtract_entrust.vue
+++ b/company/src/components/business/add_subtract_entrust.vue
@@ -24,7 +24,7 @@
</div>
</el-form-item>
<el-form-item label="璐圭敤" v-if="item && item.solutionType==0">
- <span>{{item.price}}鍏�</span>
+ <span>{{item.price}} 鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
<span v-if="item.timeUnit === 2">/鏈�</span>
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 020aae4..a77060b 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -50,33 +50,49 @@
<el-table-column
prop="startTime"
align="center"
- label="淇濋櫓鐢熸晥璧锋湡">
+ :label="getUnionApplyTimeTitle(1,model)">
</el-table-column>
<el-table-column
prop="endTime"
align="center"
- label="淇濋櫓鐢熸晥姝㈡湡">
+ :label="getUnionApplyTimeTitle(0,model)">
</el-table-column>
<el-table-column
prop="insureNum"
align="center"
label="鎶曚繚浜烘暟">
+ <template slot-scope="{row}">
+ <span>{{row.insureNum||0}} 浜�</span>
+ </template>
</el-table-column>
- <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" >
+ <template slot-scope="{row}">
+ <span>{{row.guaranteeNum||0}} 浜�</span>
+ </template>
+ </el-table-column>
<el-table-column
prop="serviceDays"
align="center"
- label="淇濆崟鏃堕暱锛堝ぉ锛�">
+ label="淇濆崟鏃堕暱">
+ <template slot-scope="{row}">
+ <span>{{row.serviceDays||0}} 澶�</span>
+ </template>
</el-table-column>
<el-table-column
prop="currentFee"
align="center"
- label="宸蹭骇鐢熻垂鐢�(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�">
+ <template slot-scope="{row}">
+ <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
+ </template>
</el-table-column>
<el-table-column
prop="fee"
align="center"
- label="鎬昏垂鐢�(鍏�)">
+ label="鎬昏垂鐢�">
+ <template slot-scope="{row}">
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -189,13 +205,13 @@
:key="Math.random()"
prop="startTime"
align="center"
- label="淇濋櫓鐢熸晥璧锋湡">
+ :label="getUnionApplyTimeTitle(1,model)">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="endTime"
align="center"
- label="淇濋櫓鐢熸晥姝㈡湡">
+ :label="getUnionApplyTimeTitle(0,model)">
</el-table-column>
<el-table-column
:key="Math.random()"
diff --git a/company/src/views/business/applyChangeShop.vue b/company/src/views/business/applyChangeShop.vue
index 516e5f1..6a5fc12 100644
--- a/company/src/views/business/applyChangeShop.vue
+++ b/company/src/views/business/applyChangeShop.vue
@@ -80,12 +80,12 @@
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="150px" align="center"></el-table-column>
<el-table-column prop="addNum" label="鍔犱繚浜烘暟" min-width="80px" align="center">
<template slot-scope="{row}">
- {{row.addNum||0}}浜�
+ {{row.addNum||0}} 浜�
</template>
</el-table-column>
<el-table-column prop="delNum" label="鍑忎繚浜烘暟" min-width="80px" align="center">
<template slot-scope="{row}">
- {{row.delNum||0}}浜�
+ {{row.delNum||0}} 浜�
</template>
</el-table-column>
<el-table-column prop="fee" label="璐圭敤鍙樻洿" min-width="80px" align="center">
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 5b8e641..e84bb78 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -96,12 +96,12 @@
</el-table-column>
<el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.currentFee!=null?row.currentFee+'鍏�': '-'}}</span>
+ <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.fee!=null?row.fee+'鍏�': '-'}}</span>
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" align="center" min-width="150"></el-table-column>
diff --git a/company/src/views/business/insuranceApplyShop.vue b/company/src/views/business/insuranceApplyShop.vue
index 309df61..c51f08a 100644
--- a/company/src/views/business/insuranceApplyShop.vue
+++ b/company/src/views/business/insuranceApplyShop.vue
@@ -112,12 +112,12 @@
</el-table-column>
<el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.currentFee!=null?row.currentFee+'鍏�': '-'}}</span>
+ <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.fee!=null?row.fee+'鍏�': '-'}}</span>
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" align="center" min-width="150"></el-table-column>
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index 7c20eb7..cedf737 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -62,37 +62,37 @@
:data="tableData.list"
stripe
>
- <el-table-column label="搴忓彿" width="80px">
+ <el-table-column align="center" label="搴忓彿" width="50px" fixed>
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濋櫓鐘舵��" min-width="100px">
+ <el-table-column align="center" label="淇濋櫓鐘舵��" min-width="80px" fixed>
<template slot-scope="{row}">
<span style="color: green;" v-if="row.solutionsStatus === 1">淇濋殰涓�</span>
<span v-else-if="row.solutionsStatus === 2">涓嶅湪淇�</span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炰紒涓�" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
- <el-table-column prop="name" label="鍛樺伐濮撳悕" min-width="100px"></el-table-column>
- <el-table-column label="鎬у埆" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.sex === 0">鐢�</span>
+ <el-table-column align="center" prop="companyName" fixed label="鎵�灞炰紒涓�" min-width="150px" v-if="userInfo.type === 0"></el-table-column>
+ <el-table-column align="center" prop="name" label="鍛樺伐濮撳悕" fixed min-width="100px"></el-table-column>
+ <el-table-column align="center" prop="solutionName" label="淇濋櫓鏂规" fixed min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="idcardNo" label="韬唤璇佸彿鐮�" fixed min-width="150px"></el-table-column>
+ <el-table-column align="center" label="鎬у埆" min-width="50px" fixed>
+ <template slot-scope="{row}">
+ <span v-if="row.sex === 0">鐢�</span>
<span v-if="row.sex === 1">濂�</span>
</template>
- </el-table-column>
- <el-table-column prop="idcardNo" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column label="骞撮緞" min-width="100px">
+ </el-table-column>
+ <el-table-column align="center" label="骞撮緞" min-width="50px" fixed>
<template slot-scope="{row}">
{{ calculateAge(row.idcardNo) }}
</template>
</el-table-column>
- <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
- <el-table-column prop="duName" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
- <el-table-column prop="workTypeName" label="鎵�灞炲伐绉�" min-width="100px"></el-table-column>
- <el-table-column prop="startTime" label="瀹為檯淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
- <el-table-column prop="endTime" label="瀹為檯淇濋櫓鐢熸晥姝㈡湡" min-width="100px"></el-table-column>
- <el-table-column label="鎿嶄綔"
+ <el-table-column align="center" prop="duName" label="娲鹃仯鍗曚綅" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="workTypeName" label="鎵�灞炲伐绉�" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="startTime" label="瀹為檯淇濋櫓鐢熸晥璧锋湡" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="endTime" label="瀹為檯淇濋櫓鐢熸晥姝㈡湡" min-width="150px"></el-table-column>
+ <el-table-column align="center" label="鎿嶄綔"
fixed="right"
min-width="120px">
<template slot-scope="{row}">
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index a72ac8e..6a05cd8 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -77,7 +77,7 @@
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="150px" align="center"></el-table-column>
<el-table-column prop="changeNum" label="鏇存崲娲鹃仯鍗曚綅浜烘暟" min-width="150px" align="center">
<template slot-scope="{row}">
- {{row.changeNum||0}}浜�
+ {{row.changeNum||0}} 浜�
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px" align="center"></el-table-column>
diff --git a/company/src/views/business/unionChange.vue b/company/src/views/business/unionChange.vue
index 5978454..b06f1e6 100644
--- a/company/src/views/business/unionChange.vue
+++ b/company/src/views/business/unionChange.vue
@@ -56,12 +56,12 @@
<el-table-column align="center" prop="solutionsName" label="淇濋櫓鏂规" min-width="150px"></el-table-column>
<el-table-column align="center" prop="addNum" label="鍔犱繚浜烘暟" min-width="100px">
<template slot-scope="{row}">
- {{row.addNum||0}}浜�
+ {{row.addNum||0}} 浜�
</template>
</el-table-column>
<el-table-column align="center" prop="delNum" label="鍑忎繚浜烘暟" min-width="100px">
<template slot-scope="{row}">
- {{row.delNum||0}}浜�
+ {{row.delNum||0}} 浜�
</template>
</el-table-column>
<el-table-column align="center" prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px"></el-table-column>
diff --git a/company/src/views/business/unionChangeUnit.vue b/company/src/views/business/unionChangeUnit.vue
index 51cd430..cc0beb3 100644
--- a/company/src/views/business/unionChangeUnit.vue
+++ b/company/src/views/business/unionChangeUnit.vue
@@ -56,7 +56,7 @@
<el-table-column align="center" prop="solutionsName" label="淇濋櫓鏂规" min-width="150px"></el-table-column>
<el-table-column align="center" prop="changeNum" label="鏇存崲娲鹃仯鍗曚綅浜烘暟" min-width="150px">
<template slot-scope="{row}">
- {{row.changeNum||0}}浜�
+ {{row.changeNum||0}} 浜�
</template>
</el-table-column>
<el-table-column align="center" prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px"></el-table-column>
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 5eb1163..1fbd4a1 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -76,17 +76,17 @@
</el-table-column>
<el-table-column align="center" prop="addNum" label="鍔犱繚浜烘暟" min-width="100px">
<template slot-scope="{row}">
- {{row.addNum||0}}浜�
+ {{row.addNum||0}} 浜�
</template>
</el-table-column>
<el-table-column align="center" prop="delNum" label="鍑忎繚浜烘暟" min-width="100px">
<template slot-scope="{row}">
- {{row.delNum||0}}浜�
+ {{row.delNum||0}} 浜�
</template>
</el-table-column>
<el-table-column align="center" prop="fee" label="璐圭敤鍙樻洿" min-width="100px">
<template slot-scope="{row}">
- {{row.fee||0}}鍏�
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="validTime" label="鐢宠鏃ユ湡" min-width="150px"></el-table-column>
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index c443563..f9e368b 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -90,12 +90,12 @@
</el-table-column>
<el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.currentFee!=null?row.currentFee+'鍏�': '-'}}</span>
+ <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.fee!=null?row.fee+'鍏�': '-'}}</span>
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" align="center" min-width="150"></el-table-column>
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index c40b98d..505f164 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -116,17 +116,17 @@
</el-table-column>
<el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.currentFee!=null?row.currentFee+'鍏�': '-'}}</span>
+ <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
- <span>{{row.fee!=null?row.fee+'鍏�': '-'}}</span>
+ <span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" align="center"min-width="150"></el-table-column>
- <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡" align="center"min-width="150"></el-table-column>
- <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡" align="center"min-width="150"></el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" align="center" min-width="150"></el-table-column>
+ <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡" align="center" min-width="150"></el-table-column>
+ <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡" align="center" min-width="150"></el-table-column>
<el-table-column
v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])"
label="鎿嶄綔"
diff --git a/company/src/views/enterprise/switchCourt.vue b/company/src/views/enterprise/switchCourt.vue
index 16ce9f6..6c833f2 100644
--- a/company/src/views/enterprise/switchCourt.vue
+++ b/company/src/views/enterprise/switchCourt.vue
@@ -71,7 +71,7 @@
<el-table-column align="center" prop="solutionsName" label="淇濋櫓鏂规" min-width="150px"></el-table-column>
<el-table-column align="center" prop="changeNum" label="鏇存崲娲鹃仯鍗曚綅浜烘暟 " min-width="150px">
<template slot-scope="{row}">
- {{row.changeNum||0}}浜�
+ {{row.changeNum||0}} 浜�
</template>
</el-table-column>
<el-table-column align="center" prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px"></el-table-column>
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index 968d2fc..fe18711 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -1844,8 +1844,8 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(7).setCellValue("鎵瑰鐢熸晥鏃ユ湡");
- header1.createCell(8).setCellValue("鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
+ header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
@@ -2014,7 +2014,7 @@
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(7).setCellValue("鎹㈠巶浜烘暟");
- header1.createCell(8).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(2,data));
sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
sheet.addMergedRegion(new CellRangeAddress(1 ,1,2,3));
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index fa573fd..838ddac 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -4,10 +4,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.dto.CountCyclePriceDTO;
-import com.doumee.dao.business.model.ApplyChange;
-import com.doumee.dao.business.model.ApplyDetail;
-import com.doumee.dao.business.model.InsuranceApply;
-import com.doumee.dao.business.model.Solutions;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ChangeDealTypeVO;
import com.doumee.dao.business.vo.CountCyclePriceVO;
import io.swagger.models.auth.In;
@@ -139,6 +136,32 @@
return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰噺鐢熸晥璧锋湡":"鏈熸湜鎵瑰噺鐢熸晥璧锋湡";
}
}
+
+
+ public static String getApplyTimeTitle(int type, UnionApply model){
+ if(type ==1){
+ return Constants.equalsInteger(model.getStatus(), UnionApplyStatus.FINISH.getKey())?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), UnionApplyStatus.FINISH.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡";
+ }
+
+ }
+
+ /**
+ * 鑾峰彇鎵规敼鍗曟椂闂存爣棰樺垪
+ * @param type 0鏇存崲娲鹃仯鍗曚綅 1鍔犱繚 0鍑忎繚
+ * @param model
+ * @return
+ */
+ public static String getChangeApplyTimeTitle(int type, UnionChange model){
+ if(type ==2){
+ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"鎵瑰崟鐢熸晥鏈�":"鏈熸湜鎵瑰崟鐢熸晥鏈�";
+ }else if(type ==1){
+ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"鎵瑰鐢熸晥璧锋湡":"鏈熸湜鎵瑰鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"鎵瑰噺鐢熸晥璧锋湡":"鏈熸湜鎵瑰噺鐢熸晥璧锋湡";
+ }
+ }
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
*/
--
Gitblit v1.9.3