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

修改UAT

Browse Source
This commit is contained in:
高嵩
2023-06-28 17:33:22 +08:00
parent 9a71922035
commit 5a5eaba229
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -2134,7 +2134,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<ParamsCollectManifestEO> list = list(queryWrapper); List<ParamsCollectManifestEO> list = list(queryWrapper);
int number = (int) list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) int number = (int) list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
|| CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count(); || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
if (number == list.size() && list.size() > 0) { if (number == list.size() && list.size() >= 0) {
return true; return true;
} else { } else {
return false; return false;
jero-web/src/views/phoneView/toDoCenter.vue
+6 -5
View File
@@ -458,8 +458,9 @@
}, },
toDoCenterClick(row, isTrue) { toDoCenterClick(row, isTrue) {
let query = {} let query = {}
if (!this.form.flowType) { let flowType = ''
this.form.flowType = [] if (this.form.flowType && this.form.flowType instanceof Array){
flowType = this.form.flowType.join(',')
} }
row.taskId = row.taskId + '' row.taskId = row.taskId + ''
if (row.taskId.length > 30) { if (row.taskId.length > 30) {
@@ -488,7 +489,7 @@
activeTab: this.activeTab, activeTab: this.activeTab,
checked: this.form.checked, checked: this.form.checked,
selectModel: this.form.selectModel, selectModel: this.form.selectModel,
searchFlowType: this.form.flowType.join(',') searchFlowType: flowType
} }
this.$router.push({ this.$router.push({
path: '/phoneProcessManagement', path: '/phoneProcessManagement',
@@ -512,7 +513,7 @@
goRouter: '/phoneToDoCenter', goRouter: '/phoneToDoCenter',
searchValue: this.phoneQueryValue, searchValue: this.phoneQueryValue,
activeTab: this.activeTab, activeTab: this.activeTab,
searchFlowType: this.form.flowType.join(','), searchFlowType: flowType,
checked: this.form.checked, checked: this.form.checked,
selectModel: this.form.selectModel selectModel: this.form.selectModel
} }
@@ -534,7 +535,7 @@
goRouter: '/phoneToDoCenter', goRouter: '/phoneToDoCenter',
searchValue: this.phoneQueryValue, searchValue: this.phoneQueryValue,
activeTab: this.activeTab, activeTab: this.activeTab,
searchFlowType: this.form.flowType.join(','), searchFlowType: flowType,
checked: this.form.checked, checked: this.form.checked,
selectModel: this.form.selectModel selectModel: this.form.selectModel
} }