From 75f1f8dfa1c53f38f66c384ef151012aca5905c1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 六月 2024 10:33:37 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/importEmployees.vue | 1
company/src/components/business/OperaWtbApplyShopWindow.vue | 4
company/src/components/business/OperaApplyChangeDetailWindow.vue | 4
server/service/src/main/java/com/doumee/core/utils/Constants.java | 41 +++++++++++++
company/src/components/base/BaseOpera.vue | 30 ++++++++++
company/src/components/business/InsuranceDetails.vue | 4
company/src/components/business/ApplyChangeDetails.vue | 4
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 2
company/src/components/business/ApplyChangeUnitDetails.vue | 23 ++++---
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 10 +-
10 files changed, 98 insertions(+), 25 deletions(-)
diff --git a/company/src/components/base/BaseOpera.vue b/company/src/components/base/BaseOpera.vue
index 5d64137..8c8ffaf 100644
--- a/company/src/components/base/BaseOpera.vue
+++ b/company/src/components/base/BaseOpera.vue
@@ -59,6 +59,36 @@
}
})
},
+ getApplyTimeTitle (type, solutionType, model) {
+ if (type == 0) {
+ // 濡傛灉鏄捣鏈�
+ if (solutionType === 1) {
+ // 濡傛灉鏄鎵樻姇淇濈敵璇�
+ return [3].includes(model.unionApplyTbdStatus) ? '淇濋櫓鐢熸晥璧锋湡' : '鏈熸湜鐢熸晥璧锋湡'
+ } else {
+ // 濡傛灉鏄洿淇濈敵璇�
+ return model.status === 5 ? '淇濋櫓鐢熸晥璧锋湡' : '鏈熸湜鐢熸晥璧锋湡'
+ }
+ } else {
+ // 濡傛灉鏄鏈�
+ if (solutionType === 1) {
+ // 濡傛灉鏄鎵樻姇淇濈敵璇�
+ return [3].includes(model.unionApplyTbdStatus) ? '淇濋櫓鐢熸晥姝㈡湡' : '棰勮鐢熸晥姝㈡湡'
+ } else {
+ // 濡傛灉鏄洿淇濈敵璇�
+ return model.status === 5 ? '淇濋櫓鐢熸晥姝㈡湡' : '棰勮鐢熸晥姝㈡湡'
+ }
+ }
+ },
+ getChangApplyTimeTitle (changeType, model) {
+ if (changeType === 2) {
+ return model.status === 2 ? '鎵瑰崟鐢熸晥鏈�' : '鏈熸湜鎵瑰崟鐢熸晥鏈�'
+ }else if (changeType === 1) {
+ return model.status === 2 ? '鎵瑰鐢熸晥璧锋湡' : '鏈熸湜鎵瑰鐢熸晥璧锋湡'
+ } else {
+ return model.status === 2 ? '鎵瑰噺鐢熸晥璧锋湡' : '鏈熸湜鎵瑰噺鐢熸晥璧锋湡'
+ }
+ },
close () {
this.visible = false
},
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index dd201dc..cde4def 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -19,8 +19,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">{{getChangApplyTimeTitle(1,model)}}</div>
+ <div class="box_table_head_item">{{getChangApplyTimeTitle(0,model)}}</div>
</div>
<div class="box_table_content " >
<div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
diff --git a/company/src/components/business/ApplyChangeUnitDetails.vue b/company/src/components/business/ApplyChangeUnitDetails.vue
index a3d0127..c68082e 100644
--- a/company/src/components/business/ApplyChangeUnitDetails.vue
+++ b/company/src/components/business/ApplyChangeUnitDetails.vue
@@ -12,22 +12,22 @@
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item">鎶曚繚浼佷笟</div>
- <div class="box_table_head_item">淇濋櫓鏂规</div>
+ <div class="box_table_head_item" style="flex: 3">鎶曚繚浼佷笟</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鏂规</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">淇濋櫓鐢熸晥璧锋湡</div>
+ <div class="box_table_head_item" style="flex: 2">淇濋櫓鐢熸晥姝㈡湡</div>
<div class="box_table_head_item">鏇存崲娲鹃仯鍗曚綅浜烘暟</div>
- <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+ <div class="box_table_head_item" style="flex: 2">{{getChangApplyTimeTitle(2,model)}}</div>
</div>
<div class="box_table_content " >
- <div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
- <div class="box_table_content_item box_table_content_header">{{ apply.solutionsName }}</div>
- <div class="box_table_content_item box_table_content_header">{{ apply.code }}</div>
- <div class="box_table_content_item box_table_content_header">{{ apply.startTime }}</div>
- <div class="box_table_content_item box_table_content_header">{{ apply.endTime }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 3">{{ apply.companyName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ apply.solutionsName }}</div>
+ <div class="box_table_content_item box_table_content_header" >{{ apply.code }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ apply.startTime }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ apply.endTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.changeNum}}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.applyStartTime}}</div>
</div>
</div>
<div class="box_table">
@@ -276,6 +276,7 @@
.box_table_head_item {
flex: 1;
height: 50px;
+ padding: 10px;
background: #f2f2f2;
display: flex;
align-items: center;
diff --git a/company/src/components/business/InsuranceDetails.vue b/company/src/components/business/InsuranceDetails.vue
index 7ad0e78..768b19a 100644
--- a/company/src/components/business/InsuranceDetails.vue
+++ b/company/src/components/business/InsuranceDetails.vue
@@ -14,8 +14,8 @@
<div class="box_table_head">
<div class="box_table_head_item">{{model.solutionType == 1?'琚繚闄╀汉':'鎶曚繚浼佷笟'}}</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">{{ getApplyTimeTitle(0,model.solutionType,model)}}</div>
+ <div class="box_table_head_item">{{ getApplyTimeTitle(1,model.solutionType,model)}}</div>
<div class="box_table_head_item">鍦ㄤ繚/鎶曚繚浜烘暟</div>
<div class="box_table_head_item">鎬昏垂鐢�(鍏�)</div>
</div>
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 0310a00..40c7d91 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -90,12 +90,12 @@
<el-table-column
prop="applyStartTime"
align="center"
- label="鎵瑰鐢熸晥鏃ユ湡">
+ :label="getChangApplyTimeTitle(1,model)">
</el-table-column>
<el-table-column
prop="delValidTime"
align="center"
- label="鎵瑰噺鐢熸晥鏃ユ湡">
+ :label="getChangApplyTimeTitle(0,model)">
</el-table-column>
<el-table-column
prop="addNum"
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 66070b9..beed810 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -91,7 +91,7 @@
<el-table-column
prop="applyStartTime"
align="center"
- label="鎵瑰崟鐢熸晥璧锋湡">
+ :label="getChangApplyTimeTitle(2,model)">
</el-table-column>
<el-table-column
prop="changeNum"
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 120d3b1..18725a9 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -73,12 +73,12 @@
<el-table-column
prop="startTime"
align="center"
- label="淇濋櫓鐢熸晥璧锋湡">
+ :label="getApplyTimeTitle(0,model.solutionType,model)">
</el-table-column>
<el-table-column
prop="endTime"
align="center"
- label="淇濋櫓鐢熸晥姝㈡湡">
+ :label="getApplyTimeTitle(1,model.solutionType,model)">
</el-table-column>
<el-table-column
prop="insureNum"
diff --git a/company/src/components/enterprise/importEmployees.vue b/company/src/components/enterprise/importEmployees.vue
index 45550ff..a61616f 100644
--- a/company/src/components/enterprise/importEmployees.vue
+++ b/company/src/components/enterprise/importEmployees.vue
@@ -123,6 +123,7 @@
.then(res => {
res.forEach(item => {
item.memberName = item.name
+ item.reducePrice = item.fee
})
this.delList = res
this.fileName = e.target.files[0].name
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 99f5f1e..bafd848 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
@@ -517,8 +517,8 @@
header1.setHeight((short) 500);
header1.createCell(0).setCellValue(Constants.equalsInteger(data.getSolutionType(), Constants.ZERO)?"鎶曚繚浼佷笟":"琚繚闄╀汉");
header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("淇濋櫓鐢熸晥璧锋湡");
- header1.createCell(3).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+ header1.createCell(2).setCellValue(Constants.getApplyTimeTitle(0,data));
+ header1.createCell(3).setCellValue(Constants.getApplyTimeTitle(1,data));
header1.createCell(4).setCellValue("鍦ㄤ繚/鎶曚繚浜烘暟");
header1.createCell(5).setCellValue("鎬昏垂鐢紙鍏冿級");
for (int i = 0; i < 6; i++) {
@@ -650,8 +650,8 @@
header1.createCell(5).setCellValue("");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(7).setCellValue("");
- header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
- header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
+ header1.createCell(9).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
for (int i = 0; i < 12; i++) {
@@ -967,7 +967,7 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(6).setCellValue("鎹㈠巶浜烘暟");
- header1.createCell(7).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(2,data));
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
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 dfb1689..0f6451b 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,7 +4,9 @@
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.vo.ChangeDealTypeVO;
import com.doumee.dao.business.vo.CountCyclePriceVO;
@@ -98,6 +100,45 @@
public static final int FOUR = 4;
public static final String COMPANY_PHONE_AUTH ="COMPANY_PHONE_AUTH" ;
+
+ /**
+ * 鑾峰彇鐢宠鍗曟椂闂村垪鏍囬
+ * @param type 0寮�濮嬫椂闂� 1鎴鏃堕棿
+ * @param model
+ * @return
+ */
+ public static String getApplyTimeTitle(int type, InsuranceApply model){
+ if(type ==1){
+ if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){
+ return Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡";
+ }
+ }else{
+ if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){
+ return Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥姝㈡湡":"鏈熸湜淇濋櫓鐢熸晥姝㈡湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"鏈熸湜淇濋櫓鐢熸晥姝㈡湡";
+ }
+ }
+
+ }
+
+ /**
+ * 鑾峰彇鎵规敼鍗曟椂闂存爣棰樺垪
+ * @param type 0鏇存崲娲鹃仯鍗曚綅 1鍔犱繚 0鍑忎繚
+ * @param model
+ * @return
+ */
+ public static String getChangeApplyTimeTitle(int type, ApplyChange model){
+ if(type ==2){
+ return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰崟鐢熸晥鏈�":"鏈熸湜鎵瑰崟鐢熸晥鏈�";
+ }else if(type ==1){
+ return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰鐢熸晥璧锋湡":"鏈熸湜鎵瑰鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰噺鐢熸晥璧锋湡":"鏈熸湜鎵瑰噺鐢熸晥璧锋湡";
+ }
+ }
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
*/
--
Gitblit v1.9.3