From 6b63f7cb1a90b2b365ed9a6baafa406f6ef98c1d Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 07 四月 2024 18:41:08 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/additionSubtractionApplication.vue | 2 +-
company/src/components/enterprise/factoryChange.vue | 2 +-
company/src/components/business/OperaWtbApplyShopWindow.vue | 9 ++++++++-
company/src/components/business/OperaInsuranceApplyWindow.vue | 11 +++++++----
company/src/components/business/OperaUnionApplyCheckWindow.vue | 8 ++++----
company/src/components/business/OperaUnionChangeDetailWindow.vue | 2 +-
company/src/components/business/OperaApplyChangeDetailWindow.vue | 6 ------
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 4 ++--
company/src/assets/style/style.scss | 4 ++--
company/src/components/business/OperaUnionChangeUnitDetailWindow.vue | 2 +-
company/src/components/business/add_subtract_entrust.vue | 2 +-
company/src/components/business/OperaUnionChangeCheckWindow.vue | 2 +-
company/src/components/enterprise/editFactoryChange.vue | 2 +-
13 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/company/src/assets/style/style.scss b/company/src/assets/style/style.scss
index cfd5aed..9c7344c 100644
--- a/company/src/assets/style/style.scss
+++ b/company/src/assets/style/style.scss
@@ -87,7 +87,7 @@
.apply-status23,.apply-status2 , .apply-status3, .apply-status10,
.change-status0,.change-status1,.change-status9,
.settle-status0,.settle-status2,.settle-status3,
-.tax-status0,
+.tax-status0,.change-status7,
.union-apply-status0,.union-apply-status1,.union-apply-status2,
.du-status0 {
color: #216EEE !important;
@@ -102,7 +102,7 @@
color: #F95601 !important;
}
.union-change-status2,
- .apply-status5,.apply-status27,.change-status7,.settle-status7,.change-status2,
+ .apply-status5,.apply-status27,.settle-status7,.change-status2,
.tax-status1,.du-status1,.settle-status4 ,.union-apply-status3 {
color: #00BA92 !important;
}
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 6c5a3b1..337371a 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -352,13 +352,7 @@
}, 1000)
},
getSignLink (flag) {
- if (flag === 0) {
- this.signTitle = '绛剧讲鏂规纭涔�'
- } else if (flag === 1) {
this.signTitle = '绛剧讲鐢宠鍗�'
- } else if (flag === 2) {
- this.signTitle = '绛剧讲鎶曚繚鍗�'
- }
this.form.type = flag
this.visiblePhone = true
this.$nextTick(() => {
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 594607a..f12083e 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -24,10 +24,10 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
- <el-button v-if="[0, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('鐢宠閫�鍥�', {id: dataId})">鐢宠閫�鍥�</el-button>
- <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
- <el-button v-if="model.status == 4" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
- <el-button type="primary" @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, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('鐢宠閫�鍥�', {id: dataId})">鐢宠閫�鍥�</el-button>
+ <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
+ <el-button v-if="model.status == 4" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
<el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<!-- goSign-->
@@ -260,6 +260,9 @@
align="center"
prop="fee"
label="浜х敓璐圭敤">
+ <template slot-scope="{row}">
+ <span>{{row.fee!=null?row.fee: '-'}}</span>
+ </template>
</el-table-column>
</el-table>
<el-table
diff --git a/company/src/components/business/OperaUnionApplyCheckWindow.vue b/company/src/components/business/OperaUnionApplyCheckWindow.vue
index a9df2ba..457e5b6 100644
--- a/company/src/components/business/OperaUnionApplyCheckWindow.vue
+++ b/company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -73,7 +73,7 @@
</el-form-item>
</div>
<div class="box_table_content_item"> <el-input style="width: 60%" v-model="form.bxdMultifileList[index].serverMoney" placeholder="璇疯緭鍏�" ></el-input>
- <span style="margin-left: 15px">鍏�/浜�</span></div>
+ <span style="margin-left: 15px">鍏�/澶�/浜�</span></div>
</div>
</div>
<!-- <div v-for="(item,index) in this.model.applyList" :key="index">
@@ -283,7 +283,7 @@
this.form.bxdMultifileList[data.index].fileName = data.name
},
backDo () {
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ this.$dialog.messageConfirm('鎮ㄧ‘璁よ繘琛岃鎿嶄綔鍚楋紵')
.then(() => {
this.isWorking = true
cancel({ id: this.model.id, reason: this.form.backCheckInfo })
@@ -296,7 +296,7 @@
})
},
uploadToubaodan () {
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ this.$dialog.messageConfirm('鎻愪氦鍚庝笉鍙慨鏀癸紝璇峰啀娆℃牳瀵瑰悗纭鎻愪氦锛�')
.then(() => {
this.isWorking = true
console.log(this.form.tbdMultifileList )
@@ -311,7 +311,7 @@
},
uploadBaoxiandan () {
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ this.$dialog.messageConfirm('鎻愪氦鍚庝笉鍙慨鏀癸紝璇峰啀娆℃牳瀵瑰悗纭鎻愪氦锛�')
.then(() => {
this.isWorking = true
var param ={
diff --git a/company/src/components/business/OperaUnionChangeCheckWindow.vue b/company/src/components/business/OperaUnionChangeCheckWindow.vue
index 9e76683..367b56b 100644
--- a/company/src/components/business/OperaUnionChangeCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeCheckWindow.vue
@@ -218,7 +218,7 @@
})
},
uploadBaoxiandan () {
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ this.$dialog.messageConfirm('鎻愪氦鍚庝笉鍙慨鏀癸紝璇峰啀娆℃牳瀵瑰悗纭鎻愪氦锛�')
.then(() => {
this.isWorking = true
var param ={
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index abc1dd9..ef5ac6d 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -365,7 +365,7 @@
}, 1000)
},
getSignLink (flag) {
- this.signTitle = '绛剧讲鏂规纭涔�'
+ this.signTitle = '绛剧讲鐢宠鍗�'
this.form.type = flag
this.visiblePhone = true
this.$nextTick(() => {
diff --git a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
index 2b3afe1..0eacf4c 100644
--- a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
@@ -344,7 +344,7 @@
}, 1000)
},
getSignLink (flag) {
- this.signTitle = '绛剧讲鏂规纭涔�'
+ this.signTitle = '绛剧讲鐢宠鍗�'
this.form.type = flag
this.visiblePhone = true
this.$nextTick(() => {
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 1d6743c..6b4359d 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -8,7 +8,7 @@
>
<div class="desc">
<div class="desc_item">
- <div class="desc_item_label" v-if="userInfo.type === 1 &&(model.statusCollect ===27)">
+ <div class="desc_item_label" v-if="userInfo.type === 1 && model.status ===27 ">
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
<el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
@@ -24,6 +24,7 @@
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
+ <el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
<template v-if="userInfo.type === 1">
<el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
@@ -98,6 +99,9 @@
prop="fee"
align="center"
label="鎬昏垂鐢�(鍏�)">
+ <template slot-scope="{row}">
+ <span>{{row.fee!=null?row.fee: '-'}}</span>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -261,6 +265,9 @@
align="center"
prop="fee"
label="浜х敓璐圭敤">
+ <template slot-scope="{row}">
+ <span>{{row.fee!=null?row.fee: '-'}}</span>
+ </template>
</el-table-column>
</el-table>
<el-table
diff --git a/company/src/components/business/add_subtract_entrust.vue b/company/src/components/business/add_subtract_entrust.vue
index be9471f..0134d65 100644
--- a/company/src/components/business/add_subtract_entrust.vue
+++ b/company/src/components/business/add_subtract_entrust.vue
@@ -23,7 +23,7 @@
<span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
</el-form-item>
- <el-form-item label="璐圭敤" v-if="item">
+ <el-form-item label="璐圭敤" v-if="item && item.solutionType==0">
<span>{{item.price}}鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 873b72a..fe4a742 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -29,7 +29,7 @@
<el-form-item label="鎶曚繚骞撮緞" v-if="item">
<span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
</el-form-item>
- <el-form-item label="璐圭敤" v-if="item">
+ <el-form-item label="璐圭敤" v-if="item && item.solutionType==0">
<span>{{item.price}}鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index 1d123ae..a46d79b 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -28,7 +28,7 @@
<el-form-item label="鎶曚繚骞撮緞" v-if="item">
<span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
</el-form-item>
- <el-form-item label="璐圭敤" v-if="item">
+ <el-form-item label="璐圭敤" v-if="item && item.type==0">
<span>{{item.price}}鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 83d76ed..8aabe9c 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -28,7 +28,7 @@
<el-form-item label="鎶曚繚骞撮緞" v-if="item">
<span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
</el-form-item>
- <el-form-item label="璐圭敤" v-if="item">
+ <el-form-item label="璐圭敤" v-if="item&& item.type==0">
<span>{{item.price}}鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index d775638..7c6daa2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1919,11 +1919,11 @@
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.YGQ.getKey()) ){
//濡傛灉鏄凡閬庢湡
- queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
+// queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
}else if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.BZZ.getKey()) ){
//濡傛灉鏄繚闅滀腑
- queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
+// queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
queryWrapper.gt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
--
Gitblit v1.9.3