diff --git a/src/api/system/police.ts b/src/api/system/police.ts index bdbd0e4..1d19872 100644 --- a/src/api/system/police.ts +++ b/src/api/system/police.ts @@ -21,9 +21,10 @@ export function updatePolice(body) { }); } -export function delPolice(id) { +export function delPolice(id, body) { return request.del({ - url: `/police/${id}` + url: `/police/${id}`, + body }); } diff --git a/src/components/negative/confirmation-completion.vue b/src/components/negative/confirmation-completion.vue index 0c61e7a..9fe76de 100644 --- a/src/components/negative/confirmation-completion.vue +++ b/src/components/negative/confirmation-completion.vue @@ -203,7 +203,7 @@ @@ -317,6 +317,10 @@ async function handleExecute(action, data) { verifyEditFlag.value = true; return } + if (action.actionKey !== 'update_verify' && verifyEditFlag.value) { + feedback.confirm('请先“保存核查内容”再操作') + return + } if (action.validateForm) { if (action.actionKey !== FlowActionEnum.SAVE) { try { diff --git a/src/style/public.scss b/src/style/public.scss index f3b70f6..6d61e19 100644 --- a/src/style/public.scss +++ b/src/style/public.scss @@ -374,7 +374,7 @@ svg + span { label { width: var(--label-width); text-align: right; - color: #666; + color: #999; } > span { diff --git a/src/views/sensitivePerception/Model.vue b/src/views/sensitivePerception/Model.vue index 7f84d07..4193fbd 100644 --- a/src/views/sensitivePerception/Model.vue +++ b/src/views/sensitivePerception/Model.vue @@ -353,7 +353,11 @@ DistributionCycle.WEEKLY " > - + 预警记录
- - - - - - + + +
@@ -724,12 +778,6 @@ - - \ No newline at end of file diff --git a/src/views/work/Todo.vue b/src/views/work/Todo.vue index c90ebcd..3a26d49 100644 --- a/src/views/work/Todo.vue +++ b/src/views/work/Todo.vue @@ -1,96 +1,116 @@ - + @@ -223,7 +349,12 @@ > - + + + +