From d1c205d29b5eacf1de22a7af29329ca370d1c2d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 十一月 2024 14:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/base/BaseOpera.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/company/src/components/base/BaseOpera.vue b/company/src/components/base/BaseOpera.vue
index 8c8ffaf..f5c7aba 100644
--- a/company/src/components/base/BaseOpera.vue
+++ b/company/src/components/base/BaseOpera.vue
@@ -83,7 +83,23 @@
getChangApplyTimeTitle (changeType, model) {
if (changeType === 2) {
return model.status === 2 ? '鎵瑰崟鐢熸晥鏈�' : '鏈熸湜鎵瑰崟鐢熸晥鏈�'
- }else if (changeType === 1) {
+ } else if (changeType === 1) {
+ return model.status === 2 ? '鎵瑰鐢熸晥璧锋湡' : '鏈熸湜鎵瑰鐢熸晥璧锋湡'
+ } else {
+ return model.status === 2 ? '鎵瑰噺鐢熸晥璧锋湡' : '鏈熸湜鎵瑰噺鐢熸晥璧锋湡'
+ }
+ },
+ getUnionApplyTimeTitle (type, model) {
+ if (type === 1) {
+ return model.status === 3 ? '淇濋櫓鐢熸晥璧锋湡' : '鏈熸湜鐢熸晥璧锋湡'
+ } else {
+ return model.status === 3 ? '淇濋櫓鐢熸晥姝㈡湡' : '鏈熸湜鐢熸晥姝㈡湡'
+ }
+ },
+ getUnionChangTimeTitle (changeType, model) {
+ if (changeType === 2) {
+ return model.status === 2 ? '鎵瑰崟鐢熸晥鏈�' : '鏈熸湜鎵瑰崟鐢熸晥鏈�'
+ } else if (changeType === 1) {
return model.status === 2 ? '鎵瑰鐢熸晥璧锋湡' : '鏈熸湜鎵瑰鐢熸晥璧锋湡'
} else {
return model.status === 2 ? '鎵瑰噺鐢熸晥璧锋湡' : '鏈熸湜鎵瑰噺鐢熸晥璧锋湡'
--
Gitblit v1.9.3