WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改中英文

Browse Source
This commit is contained in:
高嵩
2023-07-17 11:44:49 +08:00
parent f82b4d94f0
commit 878226b0a5
6 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java
+1 -1
View File
@@ -434,7 +434,7 @@ public class ToDoCenterServiceImpl implements IToDoCenterService {
if (StringUtils.equals(data.getFlowType(), FlowTypeEnum.QDQR.getValue())) {
String taskDefinitionKeyName = "任务发起";
if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
taskDefinitionKeyName = "Task initiation";
taskDefinitionKeyName = "Task Initiation";
}
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
+4 -4
View File
@@ -8,10 +8,10 @@ import org.apache.commons.lang3.StringUtils;
*/
public enum VerifyComplianceFlowNodeKeyEnum {
FQLC("发起流程","Task Initiation","fqlc"),
ZRRQR("任务责任确认","Responsibility Confirm","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Responsibility Confirm","dezrrqr"),// 第二责任人确认
ZRRTJJFW("符合性确认","Compliance Confirm","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance Confirm","dezrrtjjfw"),// 第二责任人提交交付物
ZRRQR("任务责任确认","Responsibilty Confirmation","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Responsibilty Confirmation","dezrrqr"),// 第二责任人确认
ZRRTJJFW("符合性确认","Compliance Confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance Confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("符合性审查","Compliance Review","fggcssh"), // 法规工程师审核
TGSC("通过审查","","tgsc"), // 通过审查，发消息用
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+5
View File
@@ -161,11 +161,15 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
String approvalFiles = datas.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.joining(","));
List<OSSFile> approvalFileList = this.ossFileService.getFileInfos(approvalFiles);
int index = 0;
for (ProcessHistoryEO data : datas) {
if(StringUtils.isNotEmpty(data.getOperatorResult())){
data.setReviewResult(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut));
}
if(StringUtils.isNotEmpty(data.getOperatorResult())){
if(StringUtils.equals(data.getOperatorResult(),ReviewResultEnum.RETURNED.getValue())){
data.setOperatorResult(datas.get(index-1).getOperatorResult());
}
data.setOperatorResultName(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut));
}
if(StringUtils.isNotEmpty(data.getOperatorPersonId()) && CollectionUtils.isNotEmpty(sysUserList)){
@@ -206,6 +210,7 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
data.setApprovalFileName(approvalFileNames);
}
}
index ++;
}
}
}
jero-web/src/views/phoneView/home.vue
+2 -2
View File
@@ -46,9 +46,9 @@
<!-- {{$t('languageSwitching')}}-->
语言/Language
</span>
<span class="lang" :class="{'langWeight':!checked}">Cn</span>
<span class="lang" :class="{'langWeight':!checked}">CN</span>
<van-switch @change="checkedChange" :loading="isLoading" v-model="checked"/>
<span class="lang" :class="{'langWeight':checked}">En</span>
<span class="lang" :class="{'langWeight':checked}">EN</span>
</div>
<van-tabbar v-model="active" @change="onChange">
<van-tabbar-item name="search" icon="search">{{$t('phoneSearch')}}</van-tabbar-item>
jero-web/src/views/projectManagement/components/listEditModel.vue
+4 -4
View File
@@ -764,9 +764,9 @@
// return false
// }
if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
return true
} else {
return false
} else {
return true
}
},
isEditVerifi(val) {
@@ -777,9 +777,9 @@
// return false
// }
if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') {
return true
} else {
return false
} else {
return true
}
},
...mapGetters(['userInfo']),
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+9 -1
View File
@@ -2039,6 +2039,8 @@
contentList[i].verifyFlowStatus == 'Duty Person Rejected' ||
contentList[i].designFlowStatus == 'Duty Person Rejected') {
idList.push(contentList[i].id)
}else if(contentList[i].designFlowStatus == 'NA' ||　contentList[i].verifyFlowStatus == 'NA'){
} else {
detailedWarningList.push(
< div > { contentList[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
@@ -2912,7 +2914,9 @@
dataSource[i].designFlowStatus == 'Duty Person Rejected') {
idList.push(dataSource[i].id)
this.rowKeysSuccessList.push(dataSource[i])
} else {
} else if(dataSource[i].designFlowStatus == 'NA' ||　dataSource[i].verifyFlowStatus == 'NA'){
}else {
this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
}
@@ -2994,6 +2998,8 @@
}
// _this.startProcess(dataList[i], 2, this.requestsNum)
}
}else if(dataList[i].designFlowStatus == 'NA'){
} else {
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
@@ -3012,6 +3018,8 @@
}
// _this.startProcess(dataList[i], 4, this.requestsNum)
}
}else if(dataList[i].verifyFlowStatus == 'NA'){
} else {
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)