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-06 11:07:36 +08:00
parent 3c4fabcdc4
commit 0c8eaa4bb2
2 changed files with 947 additions and 930 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
+15
View File
@@ -148,6 +148,21 @@ public class ToDoCenterServiceImpl implements IToDoCenterService {
// 判断当前用户在这个认证流程中 有几个任务。 责任人 接受、责任人 提交交付物、认证工程审批
if (CollectionUtils.isNotEmpty(pidEos)) {
List<ProcessInfoDetailEO> rzgcsjsPidEos = pidEos.stream().filter(pidEo -> {
boolean flag = (
StringUtils.equals(pidEo.getTaskDefinitionKey(), CertificationFlowNodeEnum.RZGCSJSRW.getKey())
|| StringUtils.equals(pidEo.getTaskDefinitionKey(), CertificationFlowNodeEnum.ZRRJJRW.getKey())
);
return flag;
}).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(rzgcsjsPidEos)) {
ProcessInfoVO processInfoVOTemp = new ProcessInfoVO();
BeanUtils.copyProperties(data, processInfoVOTemp);
processInfoVOTemp.setTaskDefinitionKey(CertificationFlowNodeEnum.CHECKLIST_VERIFICATION.getKey());
datasTemp.add(processInfoVOTemp);
}
List<ProcessInfoDetailEO> zrrjsrwPidEos = pidEos.stream().filter(pidEo -> {
return StringUtils.equals(pidEo.getTaskDefinitionKey(), CertificationFlowNodeEnum.ZRRJSRW.getKey());
}).collect(Collectors.toList());
jero-web/src/views/phoneView/toDoCenter.vue
+196 -194
View File
@@ -7,7 +7,7 @@
<van-search v-model="phoneQueryValue"
@search="onSearch"
@clear="onClear"
:placeholder="$t('phoneSearch')"/>
:placeholder="$t('phoneSearch')" />
</form>
</div>
<div class="content">
@@ -18,7 +18,7 @@
</van-tabs>
</div>
<div class="search-right">
<van-icon @click="searchIconClick" class="search-right-icon" name="filter-o"/>
<van-icon @click="searchIconClick" class="search-right-icon" name="filter-o" />
</div>
</div>
@@ -35,29 +35,31 @@
v-for="(item,index) in toDoProcessList"
:key="index">
<div class="content-box-title-to">
{{item.serialNumber}}
{{ item.serialNumber }}
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('category')}}</span>
<span class="content-box-text">{{item.flowTypeShow}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('category') }}</span>
<span class="content-box-text">{{ item.flowTypeShow }}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('project')}}</span>
<span class="content-box-text">{{item.projectName}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('project') }}</span>
<span class="content-box-text">{{ item.projectName }}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('node')}}</span>
<span class="content-box-text">{{item.taskDefinitionKeyName || '--'}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('node') }}</span>
<span class="content-box-text">{{ item.taskDefinitionKeyName || '--' }}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>
<span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '--'}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('cutoffTime') }}</span>
<span class="content-box-text-color" :class="isNew(item.endTime)">{{ item.endTime || '--' }}</span>
</div>
<div v-if="item.flowType == '2' || item.flowType == '4' || item.flowType == '21'"></div>
<div v-if="item.flowType == '2' || item.flowType == '4' || (item.flowType == '21' && item.taskDefinitionKey == 'Task Review') ||
(item.flowType == '21' && item.taskDefinitionKey == 'Task handling') || (item.flowType == '21' && item.taskDefinitionKey == 'Task responsibility confirmation')"></div>
<div class="content-box-right" v-else>
<img src="~@/assets/icon_single_screen.svg" alt="">
</div>
@@ -78,28 +80,28 @@
v-for="(item,index) in processDoneList"
:key="index">
<div class="content-box-title">
{{item.serialNumber}}
{{ item.serialNumber }}
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('category')}}</span>
<span class="content-box-text">{{item.flowTypeShow}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('category') }}</span>
<span class="content-box-text">{{ item.flowTypeShow }}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('project')}}</span>
<span class="content-box-text">{{item.projectName}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('project') }}</span>
<span class="content-box-text">{{ item.projectName }}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('node')}}</span>
<span class="content-box-text">{{item.taskDefinitionKeyName || '--'}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('node') }}</span>
<span class="content-box-text">{{ item.taskDefinitionKeyName || '--' }}</span>
</div>
<!-- <div class="content-box-type">-->
<!-- <span class="content-box-left"-->
<!-- :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>-->
<!-- <span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '&#45;&#45;'}}</span>-->
<!-- </div>-->
<!-- <div class="content-box-type">-->
<!-- <span class="content-box-left"-->
<!-- :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>-->
<!-- <span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '&#45;&#45;'}}</span>-->
<!-- </div>-->
<div v-if="item.flowType == '2' || item.flowType == '4' || item.flowType == '21'"></div>
<div class="content-box-right" v-else>
<img src="~@/assets/icon_single_screen.svg" alt="">
@@ -123,28 +125,28 @@
v-for="(item,index) in sentProcessList"
:key="index">
<div class="content-box-title">
{{item.serialNumber}}
{{ item.serialNumber }}
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('category')}}</span>
<span class="content-box-text">{{item.flowTypeShow}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('category') }}</span>
<span class="content-box-text">{{ item.flowTypeShow }}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('project')}}</span>
<span class="content-box-text">{{item.projectName}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('project') }}</span>
<span class="content-box-text">{{ item.projectName }}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('node')}}</span>
<span class="content-box-text">{{item.taskDefinitionKeyName || '--'}}</span>
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('node') }}</span>
<span class="content-box-text">{{ item.taskDefinitionKeyName || '--' }}</span>
</div>
<!-- <div class="content-box-type">-->
<!-- <span class="content-box-left"-->
<!-- :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>-->
<!-- <span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '&#45;&#45;'}}</span>-->
<!-- </div>-->
<!-- <div class="content-box-type">-->
<!-- <span class="content-box-left"-->
<!-- :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>-->
<!-- <span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '&#45;&#45;'}}</span>-->
<!-- </div>-->
<div v-if="item.flowType == '2' || item.flowType == '4' || item.flowType == '21'"></div>
<div class="content-box-right" v-else>
<img src="~@/assets/icon_single_screen.svg" alt="">
@@ -153,10 +155,10 @@
</van-list>
</div>
<van-tabbar v-model="active" @change="onChange">
<van-tabbar-item name="search" icon="search">{{$t('phoneSearch')}}</van-tabbar-item>
<van-tabbar-item name="toDoCenter" icon="bell">{{$t('todocenter')}}</van-tabbar-item>
<van-tabbar-item name="taskData" icon="underway">{{$t('taskStatistics')}}</van-tabbar-item>
<van-tabbar-item name="home" icon="manager">{{$t('mine')}}</van-tabbar-item>
<van-tabbar-item name="search" icon="search">{{ $t('phoneSearch') }}</van-tabbar-item>
<van-tabbar-item name="toDoCenter" icon="bell">{{ $t('todocenter') }}</van-tabbar-item>
<van-tabbar-item name="taskData" icon="underway">{{ $t('taskStatistics') }}</van-tabbar-item>
<van-tabbar-item name="home" icon="manager">{{ $t('mine') }}</van-tabbar-item>
</van-tabbar>
<van-popup
@@ -173,17 +175,17 @@
<div class="checkboxGroup-text"
:class="{'checkboxGroup-text-color':checkboxGroupColor('2')}"
@click="processClick('2')">
{{$t('designComplianceProcess')}}
{{ $t('designComplianceProcess') }}
</div>
<div class="checkboxGroup-text"
:class="{'checkboxGroup-text-color':checkboxGroupColor('4')}"
@click="processClick('4')">
{{$t('validationComplianceProcess')}}
{{ $t('validationComplianceProcess') }}
</div>
<div class="checkboxGroup-text"
:class="{'checkboxGroup-text-color':checkboxGroupColor('21')}"
@click="processClick('21')">
{{$t('preHomoFlow')}}
{{ $t('preHomoFlow') }}
</div>
</div>
</template>
@@ -200,7 +202,7 @@
:key="index"
:class="{'checkboxGroup-text-color':selectModelColor(item.value)}"
@click="selectModelClick(item.value)">
{{item.text}}
{{ item.text }}
</div>
</div>
<!-- <van-dropdown-menu class="cutoffTimeClass">-->
@@ -220,16 +222,16 @@
<template #input>
<div class="Mode-text">
<div class="Mode-text-left">
{{$t('onlyMobilePhoneAreDisplayed')}}
{{ $t('onlyMobilePhoneAreDisplayed') }}
</div>
</div>
<van-switch v-model="form.checked"/>
<van-switch v-model="form.checked" />
</template>
</van-field>
</van-form>
<div class="button">
<van-button class="reset" type="primary" @click="resetClick">{{$t('phoneReset')}}</van-button>
<van-button class="primary" type="primary" @click="queryClick">{{$t('query')}}</van-button>
<van-button class="reset" type="primary" @click="resetClick">{{ $t('phoneReset') }}</van-button>
<van-button class="primary" type="primary" @click="queryClick">{{ $t('query') }}</van-button>
</div>
</div>
</van-popup>
@@ -237,10 +239,10 @@
</template>
<script>
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import { Toast } from 'vant'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import { Toast } from 'vant'
export default {
export default {
name: 'phoneToDoCenter',
data() {
return {
@@ -743,35 +745,35 @@
}
}
}
}
}
</script>
<style scoped>
::v-deep .van-tabbar-item--active {
::v-deep .van-tabbar-item--active {
color: #00B3BE;
}
}
.box {
.box {
padding-top: 3rem;
overflow: hidden;
}
}
.header-search {
.header-search {
padding: 0 0.4rem;
display: flex;
align-items: center;
width: 100%;
}
}
.icon {
.icon {
font-size: 0.66rem;
}
}
::v-deep .van-search {
::v-deep .van-search {
padding: 0;
}
}
::v-deep .van-search__action {
::v-deep .van-search__action {
font-size: 0.38rem;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 500;
@@ -779,111 +781,111 @@
padding: 0 0 0 0.3rem;
height: 1.1rem;
line-height: 1.1rem;
}
}
.header-search .van-search {
.header-search .van-search {
width: 100%;
height: 1.1rem;
}
}
::v-deep .header-search .van-search .van-search__content {
::v-deep .header-search .van-search .van-search__content {
height: 1.1rem;
background: #F5F6F7;
border-radius: 0.2rem 0.2rem 0.2rem 0.2rem;
opacity: 1;
}
}
::v-deep .van-search__content .van-cell {
::v-deep .van-search__content .van-cell {
line-height: 0.9rem;
}
}
::v-deep .van-field__body {
::v-deep .van-field__body {
font-size: 0.4rem;
}
}
::v-deep .van-field__left-icon .van-icon {
::v-deep .van-field__left-icon .van-icon {
font-size: 0.46rem !important;
font-weight: 600 !important;
}
}
.content {
.content {
margin-top: 0.38rem;
position: relative;
background: #fff;
display: flex;
overflow: hidden;
}
}
::v-deep .van-tabs__line {
::v-deep .van-tabs__line {
background-color: #00B3BE;
}
}
::v-deep .van-tab {
::v-deep .van-tab {
font-size: 0.38rem;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #868A9A;
flex: none;
margin-right: 0.2rem;
}
}
::v-deep .van-tab--active {
::v-deep .van-tab--active {
font-size: 0.38rem;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 600;
color: #040B29;
}
}
::v-deep .van-tabs {
::v-deep .van-tabs {
padding: 0 0.4rem;
width: calc(100% - 1rem);
display: inline-block;
}
}
.search-right {
.search-right {
position: absolute;
/*margin-right: 0.4rem;*/
top: 1.55rem;
right: 0.4rem;
}
}
.search-right-icon {
.search-right-icon {
font-size: 0.48rem;
}
}
.content-box {
.content-box {
padding: 0.4rem 0.4rem;
box-sizing: border-box;
background: #F7F7F8;
margin-bottom: 1.4rem;
}
}
.content-box-content {
.content-box-content {
padding: 0.3rem 0.28rem;
background: #fff;
border-radius: 0.2rem;
position: relative;
margin-bottom: 0.4rem;
}
}
.content-box-title {
.content-box-title {
font-family: PingFang SC-Semibold, PingFang SC;
font-weight: 600;
color: #040B29;
font-size: 0.4rem;
word-break: break-all;
}
}
.content-box-title-to {
.content-box-title-to {
font-family: PingFang SC-Semibold, PingFang SC;
font-weight: 600;
color: #040B29;
font-size: 0.4rem;
width: calc(100% - 0.7rem);
word-break: break-all;
}
}
.content-box-type {
.content-box-type {
font-size: 0.34rem;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
@@ -891,30 +893,30 @@
display: flex;
margin-top: 0.08rem;
word-break: break-all;
}
}
.content-box-left {
.content-box-left {
width: 1.46rem;
display: inline-block;
word-break: break-all;
}
}
.content-box-left-one {
.content-box-left-one {
width: 1.66rem;
}
}
.content-box-text {
.content-box-text {
margin-left: 0.3rem;
word-break: break-all;
}
}
.content-box-text-color {
.content-box-text-color {
margin-left: 0.3rem;
color: #00B3BE;
word-break: break-all;
}
}
.content-box-right {
.content-box-right {
display: inline-block;
font-size: 0.32rem;
border-radius: 0.14rem;
@@ -922,13 +924,13 @@
position: absolute;
right: 0.28rem;
top: 0.3rem;
}
}
.content-box-right img {
.content-box-right img {
width: 0.4rem;
}
}
.fixed {
.fixed {
position: fixed;
top: 0;
left: 0;
@@ -936,102 +938,102 @@
z-index: 1000;
background: #fff;
padding-top: 0.4rem;
}
}
.popup-box {
.popup-box {
width: 100%;
height: 100vh;
}
}
::v-deep .van-form .van-cell__title {
::v-deep .van-form .van-cell__title {
font-size: 0.38rem;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 500;
color: #595E72;
width: 100%;
}
}
::v-deep .van-form .van-radio__icon .van-icon {
::v-deep .van-form .van-radio__icon .van-icon {
width: 0.45rem;
height: 0.45rem;
line-height: 0.45rem;
}
}
::v-deep .van-form .van-radio__icon--checked .van-icon {
::v-deep .van-form .van-radio__icon--checked .van-icon {
background-color: #00BEBE;
border-color: #00BEBE;
}
}
::v-deep .van-form .van-radio__icon {
::v-deep .van-form .van-radio__icon {
height: 0.45rem;
}
}
::v-deep .van-form .van-radio__label {
::v-deep .van-form .van-radio__label {
font-size: 0.38rem;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 500;
color: #040B29;
}
}
.textarea {
.textarea {
display: block;
}
}
::v-deep .van-form .textarea .van-field__control {
::v-deep .van-form .textarea .van-field__control {
margin-top: 0.1rem;
}
}
.uploader {
.uploader {
display: block;
}
}
.uploader-button {
.uploader-button {
margin-top: 0.2rem;
}
}
.uploader-button .van-button--primary {
.uploader-button .van-button--primary {
background-color: #fff;
border: 0.03rem solid #00BEBE;
color: #01A0AC;
font-size: 0.38rem;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
}
}
.uploader-button .van-button {
.uploader-button .van-button {
height: 0.9rem;
border-radius: 0.12rem;
}
}
.uploader-button .van-button .van-icon {
.uploader-button .van-button .van-icon {
font-size: 0.42rem;
font-weight: 500;
}
}
.formClass {
.formClass {
padding-top: 1.1rem;
}
}
::v-deep .van-checkbox {
::v-deep .van-checkbox {
margin-bottom: 0.2rem;
}
}
::v-deep .van-form .van-field__body {
::v-deep .van-form .van-field__body {
margin-top: 0.2rem;
}
}
::v-deep .van-checkbox__icon .van-icon {
::v-deep .van-checkbox__icon .van-icon {
height: 0.45rem;
width: 0.45rem;
line-height: 0.45rem;
}
}
::v-deep .van-checkbox__icon--checked .van-icon {
::v-deep .van-checkbox__icon--checked .van-icon {
background-color: #00BEBE;
border-color: #00BEBE;
}
}
.time-text {
.time-text {
display: flex;
align-items: center;
justify-content: center;
@@ -1042,9 +1044,9 @@
color: #040B29;
font-weight: 500;
border-radius: 0.16rem;
}
}
.Mode-text {
.Mode-text {
display: flex;
align-items: center;
font-size: 0.32rem;
@@ -1052,109 +1054,109 @@
color: #040B29;
width: calc(100% - 1.3rem);
margin-right: 0.2rem;
}
}
::v-deep .van-switch {
::v-deep .van-switch {
background-color: #BBBDC7;
height: 0.6rem;
width: 1.17rem;
}
}
::v-deep .van-switch__node {
::v-deep .van-switch__node {
width: 0.6rem;
height: 0.6rem;
}
}
::v-deep .van-switch--on {
::v-deep .van-switch--on {
background-color: #00B3BE;
}
}
::v-deep .van-switch--on .van-switch__node {
::v-deep .van-switch--on .van-switch__node {
transform: translateX(0.56rem)
}
}
.button {
.button {
position: absolute;
bottom: 0.2rem;
left: 0;
text-align: right;
width: 100%;
padding: 0 0.4rem;
}
}
.reset {
.reset {
background-color: rgba(187, 189, 199, 1);
border: none;
height: 0.8rem;
font-size: 0.38rem;
}
}
.primary {
.primary {
background-color: #01A0AC;
border: none;
height: 0.8rem;
font-size: 0.38rem;
margin-left: 0.2rem;
}
}
.cutoffTimeClass {
.cutoffTimeClass {
width: 100%;
}
}
::v-deep .cutoffTimeClass .van-dropdown-menu__item {
::v-deep .cutoffTimeClass .van-dropdown-menu__item {
justify-content: left;
}
}
::v-deep .cutoffTimeClass .van-dropdown-menu__title--active {
::v-deep .cutoffTimeClass .van-dropdown-menu__title--active {
color: #21c9cc;
}
}
::v-deep .cutoffTimeClass .van-dropdown-item__option--active {
::v-deep .cutoffTimeClass .van-dropdown-item__option--active {
color: #21c9cc;
}
}
::v-deep .cutoffTimeClass .van-dropdown-item__option--active .van-dropdown-item__icon {
::v-deep .cutoffTimeClass .van-dropdown-item__option--active .van-dropdown-item__icon {
color: #21c9cc;
}
}
::v-deep .cutoffTimeClass .van-dropdown-menu__bar {
::v-deep .cutoffTimeClass .van-dropdown-menu__bar {
box-shadow: none;
}
}
.checkboxGroup {
.checkboxGroup {
width: 100%;
}
}
.checkboxGroup-text {
.checkboxGroup-text {
padding: 0.2rem 0.32rem;
background: #F7F7F8;
border-radius: 0.16rem;
margin-bottom: 0.16rem;
}
}
.checkboxGroup-text-color {
.checkboxGroup-text-color {
background: #00B3BE;
color: #fff;
}
}
::v-deep .van-tabbar {
::v-deep .van-tabbar {
height: 74px !important;
align-items: baseline;
}
}
::v-deep .van-tabbar-item {
::v-deep .van-tabbar-item {
margin-top: 8px !important;
}
}
.yellow {
.yellow {
color: #fdd835;
}
}
.red {
.red {
color: red;
}
}
.green {
.green {
color: #00B3BE
}
}
</style>