From fe3fd82f31b4fb43f6b207715a443e96d0442b26 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 02 四月 2024 16:38:52 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 8 ++++----
company/src/components/business/detailsEntrustedInsurance.vue | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 57a3387..cf7baf5 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -16,7 +16,7 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 2">
- <el-button type="primary" v-if="[0].includes(model.status) " @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
+ <el-button type="primary" @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[0].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 1" type="primary" @click="getSignLink(0)">绛剧讲鎶曚繚鍗�</el-button>
<el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
@@ -25,6 +25,7 @@
<el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炵敵璇�</el-button>
</template>
<template v-if="userInfo.type ===0">
+ <el-button type="primary" @click="$refs.InsuranceDetails.open('瀵煎嚭璇﹀崟',model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
<el-button v-if="[4].includes(model.status)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
</template>
@@ -128,7 +129,6 @@
<el-form-item>
<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-form-item>
</el-form>
</div>
@@ -165,6 +165,12 @@
prop="idcardNo"
align="center"
label="韬唤璇佸彿">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="companyName"
+ align="center"
+ label="琚繚闄╀汉">
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -696,15 +702,10 @@
capacity: 10,
page: this.currentPage,
model: {
- applyId: this.dataId,
+ unionApplyId: this.dataId,
applyStatus: this.formInline.applyStatus,
- duId: this.formInline.duId,
- workTypeId: this.formInline.workTypeId,
- memberName: this.formInline.memberName,
- endTimeE: this.formInline.endTimeE,
- endTimeS: this.formInline.endTimeS,
- startTimeE: this.formInline.startTimeE,
- startTimeS: this.formInline.startTimeS
+ companyName: this.formInline.applyCompanyName,
+ memberName: this.formInline.memberName
}
}).then(res => {
this.list = res.records
@@ -721,7 +722,7 @@
capacity: 10,
page: this.currentPage,
model: {
- applyId: this.dataId,
+ unionApplyId: this.dataId,
status: this.formInline.applyStatus,
endTimeE: this.formInline.endTimeS,
endTimeS: this.formInline.startTimeS,
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 98459a0..e215b17 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
@@ -992,7 +992,7 @@
- public enum 鍟嗘埛 {
+ public enum UnionChangeStatus {
MERGE(0, "寰呯缃�",""),
UPLOAD_INSURANCE_POLICY(1, "寰呭嚭鍗�",""),
FINISH(2, "淇濋殰涓�",""),
@@ -1005,7 +1005,7 @@
// 鏋勯�犳柟娉�
- 鍟嗘埛(int key, String name,String info) {
+ UnionChangeStatus(int key, String name,String info) {
this.name = name;
this.key = key;
this.info = info;
@@ -1013,7 +1013,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (鍟嗘埛 c : 鍟嗘埛.values()) {
+ for (UnionChangeStatus c : UnionChangeStatus.values()) {
if (c.getKey() == index) {
return c.name;
}
@@ -1021,7 +1021,7 @@
return null;
}
public static String getInfo(int index) {
- for (鍟嗘埛 c : 鍟嗘埛.values()) {
+ for (UnionChangeStatus c : UnionChangeStatus.values()) {
if (c.getKey() == index) {
return c.info;
}
--
Gitblit v1.9.3