From c7995b78d3a3e4efd03c24ca20bc5951f1294662 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 六月 2024 17:50:47 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaSolutionsDescWindow.vue | 2 +-
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 5 ++---
company/src/components/business/OperaSolutionsWindow.vue | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index cd6eca5..e5b692e 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -87,7 +87,7 @@
<span>鏇存崲娲鹃仯鍗曚綅 <i :class="form.canChangeUnit ==1?'el-icon-circle-check':'el-icon-circle-close'" :style="form.canChangeUnit ==1?'color:green;font-weight:bold':'color:red;font-weight:bold'"></i></span>
</div>
</div>
- <div class="info_list_item">
+ <div class="info_list_item" v-if="(form.timeUnit===2 && (form.insureCycleUnit===2||form.insureCycleUnit===0)) || form.timeUnit===2 && (form.insureCycleUnit===2||form.insureCycleUnit===0))">
<div class="info_list_item_label">鎵规敼浠呮敮鎸佹浛鎹細</div>
<div class="info_list_item_val" v-if="form.delOnlyReplace == 1">鏄�</div>
<div class="info_list_item_val" v-else>鍚�</div>
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index 155cae3..260c454 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -88,7 +88,7 @@
<el-checkbox :true-label="1" :false-label="0" v-model="form.canChangeUnit">鏇存崲娲鹃仯鍗曚綅</el-checkbox>
</div>
</el-form-item>
- <el-form-item label="鎵瑰噺鍙敮鎸佹浛鎹紙鍑忎繚鎵规敼浠呮敮鎸佹浛鎹汉鍛�,鍗冲噺淇濅汉鍛樹笉灏戜簬鍔犱繚浜哄憳鏁伴噺锛�" prop="delOnlyReplace" v-if="form.timeUnit===2 && (form.insureCycleUnit===2||form.insureCycleUnit===0)">
+ <el-form-item label="鎵瑰噺鍙敮鎸佹浛鎹紙鍑忎繚鎵规敼浠呮敮鎸佹浛鎹汉鍛�,鍗冲噺淇濅汉鍛樹笉灏戜簬鍔犱繚浜哄憳鏁伴噺锛�" prop="delOnlyReplace" v-if="form.insureCycleUnit===0 || (form.insureCycleUnit===form.timeUnit)">
<div style="width: 100%; display: flex; align-items: center;">
<el-radio-group v-model="form.delOnlyReplace">
<el-radio :label="1">鏄�</el-radio>
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index a3f3571..03f2ada 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -169,9 +169,8 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(!(Constants.equalsInteger(solutions.getTimeUnit(),Constants.TWO)
- &&(Constants.equalsInteger(solutions.getInsureCycleUnit(),Constants.TWO)
- ||Constants.equalsInteger(solutions.getInsureCycleUnit(),Constants.TWO)))){
+ if(!(Constants.equalsInteger(solutions.getInsureCycleUnit(),Constants.ZERO)
+ ||Constants.equalsInteger(solutions.getInsureCycleUnit(),solutions.getInsureCycleUnit()))){
solutions.setDelOnlyReplace(Constants.ZERO);
}
}
--
Gitblit v1.9.3