From 39fb77e70bae8aa3289df71bcb04b78dc9f2ba8f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 10:15:30 +0800
Subject: [PATCH] 提交一把
---
company/src/components/common/MenuSelect.vue | 5 ++++-
server/service/src/main/java/com/doumee/core/utils/Constants.java | 23 +++++++++++++++++++----
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 3 ++-
company/src/views/business/insuranceApplyShop.vue | 13 ++++++-------
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/company/src/components/common/MenuSelect.vue b/company/src/components/common/MenuSelect.vue
index 5cfa78e..5cdb3a9 100644
--- a/company/src/components/common/MenuSelect.vue
+++ b/company/src/components/common/MenuSelect.vue
@@ -43,6 +43,9 @@
}
},
watch: {
+ type: function (newVal, oldVal) {
+ this.type = newVal
+ },
excludeId () {
this.fetchData()
}
@@ -50,7 +53,7 @@
methods: {
// 鑾峰彇鎵�鏈夎彍鍗�
fetchData () {
- if (this.type == '1' || this.type == '2') {
+ if (this.type == '1' || this.type == '2') {
fetchTree1(this.type)
.then(records => {
this.data = []
diff --git a/company/src/views/business/insuranceApplyShop.vue b/company/src/views/business/insuranceApplyShop.vue
index 4b46513..670c06f 100644
--- a/company/src/views/business/insuranceApplyShop.vue
+++ b/company/src/views/business/insuranceApplyShop.vue
@@ -4,14 +4,13 @@
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="淇濆崟鐘舵��" prop="statusCollect">
<el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <el-option label="寰呭鏍�" value="0"></el-option>
- <el-option label="寰呭嚭鍗�" value="1"></el-option>
- <el-option label="寰呯缃�" value="7"></el-option>
+ <el-option label="寰呯缃�" value="8"></el-option>
+ <el-option label="寰呭鏍�" value="1"></el-option>
+ <el-option label="寰呭嚭鍗�" value="7"></el-option>
+ <el-option label="宸查��鍥�" value="2"></el-option>
+ <el-option label="宸插叧闂�" value="3"></el-option>
+ <el-option label="鎶曚繚涓�" value="4"></el-option>
<el-option label="淇濋殰涓�" value="2"></el-option>
- <el-option label="宸茶繃鏈�" value="3"></el-option>
- <el-option label="宸查��鍥�" value="4"></el-option>
- <el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
- <el-option label="宸插叧闂�" value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎶曚繚浼佷笟" prop="companyId">
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 bc4bf5c..546c231 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
@@ -27,7 +27,8 @@
public static final int ZERO = 0 ;
public static final int ONE = 1 ;
public static final int TWO = 2 ;
- public static final int THREE = 3 ;
+ public static final int
+ THREE = 3 ;
public static final int SEVEN = 7 ;
public static final String ACCESS_ID="ACCESS_ID";
public static final String BUCKETNAME = "BUCKETNAME";
@@ -709,6 +710,13 @@
THSQZ(5, "鐢宠閫�鍥�"),
YGB(6, "宸插叧闂�"),
DQYQZ(7, "寰呯缃�"),
+ WTBDQS(28, "寰呯缃�"),
+ WTBDSH(21, "寰呭鏍�"),
+ WTBDCD(22, "寰呭嚭鍗�"),
+ WTBYTH(23, "宸查��鍥�"),
+ WTBYGB(24, "宸插叧闂�"),
+ WTBTBZ(25, "鎶曚繚涓�"),
+ WTBBZZ(26, "淇濋殰涓�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1057,9 +1065,16 @@
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
- COMPANY_BACK_APPLY_PASS(11, "浼佷笟鐢宠閫�鍥�(骞冲彴鎶曚繚瀹℃牳閫氳繃)","鎻愪氦鎰忚锛�${param}",5),
- COMPANY_APPLY_SIGNATURE(12, "濮旀墭淇�-浼佷笟宸茬缃叉姇淇濈‘璁や功","鎻愪氦鎰忚锛�${param}",5),
- COMPANY_MEMBER_LIST_SIGNATURE(13, "濮旀墭淇�-浼佷笟宸茬缃蹭汉鍛樺悕鍗�","鎻愪氦鎰忚锛�${param}",5),
+
+ WTB_UPLOAD(20, "鎻愪氦鎶曚繚","",28),
+ WTB_COMPANY_APPLY_SIGNATURE(21, "濮旀墭淇�-浼佷笟宸茬缃叉姇淇濈‘璁や功","鎻愪氦鎰忚锛�${param}",28),
+ WTB_COMPANY_MEMBER_LIST_SIGNATURE(22, "濮旀墭淇�-浼佷笟宸茬缃蹭汉鍛樺悕鍗�","鎻愪氦鎰忚锛�${param}",22),
+ WTB_PCHECK_PASS(23,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",23),
+ WTB_RETURN(24, "宸查��鍥�","鎻愪氦鎰忚锛�${param}",24),
+ WTB_CLOSED(25, "宸插叧闂�","鎻愪氦鎰忚锛�${param}",25),
+ WTB_TOUBAOING(26, "鎶曚繚涓�","鎻愪氦鎰忚锛�${param}",26),
+ WTB_DONE(27, "淇濋殰涓�","鎻愪氦鎰忚锛�${param}",27),
+
;
// 鎴愬憳鍙橀噺
private String name;
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index fa689c9..9faba2b 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -118,7 +118,8 @@
@ExcelColumn(name="鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
private String signApplyNo;
- @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級 3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴 锛堝凡鍏抽棴锛�", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級 3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴 锛堝凡鍏抽棴锛�;" +
+ " 銆愬鎵樻姇淇濄�� 0鎻愪氦鎶曚繚 12宸茬缃叉柟妗堢‘璁や功 13宸茬缃插悕鍗� 10瀹℃牳閫氳繃 5淇濋殰涓�", example = "1")
@ExcelColumn(name="鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級 3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴 锛堝凡鍏抽棴锛�")
private Integer status;
--
Gitblit v1.9.3