交叉互查功后端接口修改,前端路由修改
This commit is contained in:
parent
a8d3461575
commit
eb004d9dff
|
|
@ -410,7 +410,8 @@ const baseRoutes = [
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'jbhcxx', name: '_jbhcxx',
|
path: 'jbhcxx',
|
||||||
|
name: '_jbhcxx',
|
||||||
component: () => import('@views/xzzfgl/jbhcxx.vue'),
|
component: () => import('@views/xzzfgl/jbhcxx.vue'),
|
||||||
meta: {
|
meta: {
|
||||||
title: '举报核查',
|
title: '举报核查',
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,8 @@
|
||||||
<el-table-column header-align="center" align="center" prop="checks" label="检查总数" min-width="200"/>
|
<el-table-column header-align="center" align="center" prop="checks" label="检查总数" min-width="200"/>
|
||||||
<el-table-column header-align="center" align="center" prop="steers" label="督导检查数" min-width="150"/>
|
<el-table-column header-align="center" align="center" prop="steers" label="督导检查数" min-width="150"/>
|
||||||
<el-table-column header-align="center" align="center" prop="crosss" label="交叉检查数" min-width="250"/>
|
<el-table-column header-align="center" align="center" prop="crosss" label="交叉检查数" min-width="250"/>
|
||||||
|
<el-table-column header-align="center" align="center" prop="reports" label="举报核查数" min-width="150"/>
|
||||||
|
</browser>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
import {reactive, toRefs, getCurrentInstance, watch, computed, ref} from 'vue'
|
import {reactive, toRefs, getCurrentInstance, watch, computed, ref} from 'vue'
|
||||||
|
|
|
||||||
|
|
@ -439,6 +439,7 @@ const options = [
|
||||||
{value: '3', label: '举报核查'},
|
{value: '3', label: '举报核查'},
|
||||||
{value: '4', label: '随机抽查'},
|
{value: '4', label: '随机抽查'},
|
||||||
]
|
]
|
||||||
|
|
||||||
function handleQuery(queryParams) {
|
function handleQuery(queryParams) {
|
||||||
queryParams.currentNodeCode = 'plan_approval,plan_approval_failed'
|
queryParams.currentNodeCode = 'plan_approval,plan_approval_failed'
|
||||||
queryParams.agencyCode = queryParams.agency?.agencyCode
|
queryParams.agencyCode = queryParams.agency?.agencyCode
|
||||||
|
|
|
||||||
|
|
@ -287,7 +287,6 @@ public class ReportCheckService {
|
||||||
o.setUpdateBy(user.getXm());
|
o.setUpdateBy(user.getXm());
|
||||||
o.setUpdateAccountBy(user.getYhwybs());
|
o.setUpdateAccountBy(user.getYhwybs());
|
||||||
}
|
}
|
||||||
|
|
||||||
o.setUpdateTime(now);
|
o.setUpdateTime(now);
|
||||||
o.setFeedbackNot("1");
|
o.setFeedbackNot("1");
|
||||||
saveOPer(o, user, "反馈", now);
|
saveOPer(o, user, "反馈", now);
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,6 @@ public class SupervisionCheckService {
|
||||||
supervisionCheck.setDeliverAgencyLevel(currentAgency.getAgencyLevel());
|
supervisionCheck.setDeliverAgencyLevel(currentAgency.getAgencyLevel());
|
||||||
supervisionCheck.setDeliverPerson(user.getXm());
|
supervisionCheck.setDeliverPerson(user.getXm());
|
||||||
supervisionCheck.setCheckType(supervisionCheckDto.getCheckType());
|
supervisionCheck.setCheckType(supervisionCheckDto.getCheckType());
|
||||||
|
|
||||||
if("交叉互查".equals(supervisionCheckDto.getCheckType())){
|
if("交叉互查".equals(supervisionCheckDto.getCheckType())){
|
||||||
supervisionCheck.setCheckStatus(SupervisionCheck.CheckStatus.reviewing_done);
|
supervisionCheck.setCheckStatus(SupervisionCheck.CheckStatus.reviewing_done);
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -208,7 +207,8 @@ public class SupervisionCheckService {
|
||||||
enforceCheck.setWriterId(user.getYhwybs());
|
enforceCheck.setWriterId(user.getYhwybs());
|
||||||
enforceCheck.setCreatedBy(user.getXm());
|
enforceCheck.setCreatedBy(user.getXm());
|
||||||
enforceCheck.setCreatedAccountBy(user.getYhwybs());
|
enforceCheck.setCreatedAccountBy(user.getYhwybs());
|
||||||
enforceCheckRepository.save(enforceCheck)
|
enforceCheckRepository.save(enforceCheck);
|
||||||
|
|
||||||
supervisionCheckRepository.findById(supervisionCheck.getCheckId()).map(s->{
|
supervisionCheckRepository.findById(supervisionCheck.getCheckId()).map(s->{
|
||||||
s.setEnforcementId(enforcementInfo.getEnforcementId());
|
s.setEnforcementId(enforcementInfo.getEnforcementId());
|
||||||
s.setCheckStatus(SupervisionCheck.CheckStatus.completed);
|
s.setCheckStatus(SupervisionCheck.CheckStatus.completed);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue