From b3d38ff2cc56f51212521ab11b2151dcd82dd8b9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 24 十月 2024 11:59:50 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 4 ++--
company/src/components/business/OperaApplyChangeCheckWindow.vue | 2 +-
company/src/components/business/OperaApplyChangeDetailWindow.vue | 2 +-
company/src/components/business/OperaInsuranceApplyWindow.vue | 2 +-
server/service/src/main/java/com/doumee/core/utils/Constants.java | 4 ++--
company/src/components/business/OperaInsuranceApplyCheckWindow.vue | 2 +-
server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 2 +-
server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java | 2 +-
company/src/components/business/OperaSwitchCourtWindow.vue | 6 +++---
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 2 +-
company/src/components/business/OperaApplyChangeUnitCheckWindow.vue | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeCheckWindow.vue b/company/src/components/business/OperaApplyChangeCheckWindow.vue
index 7450712..6640b84 100644
--- a/company/src/components/business/OperaApplyChangeCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeCheckWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <!-- 閫�鍥炴姇淇� -->
+ <!-- 閫�鍥炵敵璇� -->
<div v-if="visible1==true" class="form">
<div class="form_item">
<div class="form_item_label"><span>*</span>濉啓閫�鍥炶鏄庯細</div>
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 73f704d..ea1a5e6 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -35,7 +35,7 @@
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if="[1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
<el-button v-if="[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
</div>
diff --git a/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue b/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
index 08a4444..4599bee 100644
--- a/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <!-- 閫�鍥炴姇淇� -->
+ <!-- 閫�鍥炵敵璇� -->
<div v-if="visible1==true" class="form">
<div class="form_item">
<div class="form_item_label"><span>*</span>濉啓閫�鍥炶鏄庯細</div>
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index b431a27..fdd83f1 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -37,7 +37,7 @@
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if="[1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
<el-button v-if="[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
</div>
diff --git a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
index 340da3e..71d0815 100644
--- a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
@@ -6,7 +6,7 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <!-- 閫�鍥炴姇淇� -->
+ <!-- 閫�鍥炵敵璇� -->
<el-form v-if="visible1==true" :model="form" ref="form1" :rules="rules1" style="width: 100%;">
<el-form-item label="濉啓閫�鍥炶鏄庯細" prop="backCheckInfo">
<el-input type="textarea" v-model="form.backCheckInfo" placeholder="璇疯緭鍏�" v-trim/>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 7dddb82..0e79cfd 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -41,7 +41,7 @@
<el-button v-if="model.status == 3" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 6 || model.status == 7|| model.status == 8 || model.status == 11" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
<el-button v-if="model.status == 0" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
- <el-button v-if="model.status != 5 && model.status != 4 && model.status != 1" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.status != 5 && model.status != 4 && model.status != 1" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
<el-button v-if="model.status == 5" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
</template>
</div>
diff --git a/company/src/components/business/OperaSwitchCourtWindow.vue b/company/src/components/business/OperaSwitchCourtWindow.vue
index 4b3f054..43ddfe5 100644
--- a/company/src/components/business/OperaSwitchCourtWindow.vue
+++ b/company/src/components/business/OperaSwitchCourtWindow.vue
@@ -18,7 +18,7 @@
<el-button type="primary" @click="$refs.switchCourtDetaols.open('鏇存崲娲鹃仯鍗曚綅鐢宠鍗曡鎯�')">瀵煎嚭璇﹀崟</el-button>
<el-button type="primary">鏌ョ湅鐢宠鍗�</el-button>
<el-button type="primary" @click="visible3 = true">涓婁紶鎵瑰崟</el-button>
- <el-button type="danger" @click="visible1 = true">閫�鍥炴姇淇�</el-button>
+ <el-button type="danger" @click="visible1 = true">閫�鍥炵敵璇�</el-button>
<el-button type="danger" @click="visible4 = true">淇敼鎵瑰崟</el-button>
</div>
</div>
@@ -125,9 +125,9 @@
</div>
</div>
</div>
- <!-- 閫�鍥炴姇淇� -->
+ <!-- 閫�鍥炵敵璇� -->
<el-dialog
- title="閫�鍥炴姇淇�"
+ title="閫�鍥炵敵璇�"
:visible.sync="visible1"
:show-close="false"
:close-on-click-modal="false"
diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
index d8a1d53..2ca642f 100644
--- a/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -39,7 +39,7 @@
return ApiResponse.success(applyChangeService.create(applyChange));
}
@PreventRepeat
- @ApiOperation("骞冲彴閫�鍥炴姇淇�")
+ @ApiOperation("骞冲彴閫�鍥炵敵璇�")
@PostMapping("/back")
@RequiresPermissions("business:applychange:back")
public ApiResponse back(@RequestBody ApplyChange applyChange) {
diff --git a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 7e726d2..e54dbee 100644
--- a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -45,7 +45,7 @@
public ApiResponse check(@RequestBody InsuranceApply insuranceApply) {
return ApiResponse.success(insuranceApplyService.check(insuranceApply));
}
- @ApiOperation("骞冲彴閫�鍥炴姇淇�")
+ @ApiOperation("骞冲彴閫�鍥炵敵璇�")
@PostMapping("/back")
@RequiresPermissions("business:insuranceapply:back")
public ApiResponse back(@RequestBody InsuranceApply insuranceApply) {
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 8b22c7f..8407c50 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
@@ -740,7 +740,7 @@
public enum ApplyLogType {
UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}",0),
- PLATFORM_RETURN(1, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",0),
+ PLATFORM_RETURN(1, "閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",0),
WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}",0),
SIGNATURE(3, "浼佷笟绛剧珷","",0),
FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}",0),
@@ -755,7 +755,7 @@
PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",0),
- CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",1),
+ CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",1),
CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷","",1),
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 2c1cacf..e4e1697 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -107,7 +107,7 @@
@Autowired
private NoticesMapper noticesMapper;
/**
- * 骞冲彴閫�鍥炴姇淇�
+ * 骞冲彴閫�鍥炵敵璇�
* @param param
* @return
*/
@@ -669,7 +669,7 @@
}
/**
- * 骞冲彴閫�鍥炴姇淇�
+ * 骞冲彴閫�鍥炵敵璇�
* @param param
* @return
*/
--
Gitblit v1.9.3