diff --git a/src/components/reportAudit/start.vue b/src/components/reportAudit/start.vue index fd3746b..e3ad794 100644 --- a/src/components/reportAudit/start.vue +++ b/src/components/reportAudit/start.vue @@ -197,6 +197,9 @@ getPoliceList() delete query.value.departId; } + if (! formData.value.message){ + formData.value.message="请查收" + } }else{ diff --git a/src/views/warning/edit.vue b/src/views/warning/edit.vue index 677ec19..c54bbec 100644 --- a/src/views/warning/edit.vue +++ b/src/views/warning/edit.vue @@ -15,6 +15,10 @@ import feedback from "@/utils/feedback"; import reportAuditEnd from '@/components/reportAudit/end.vue'; import finishDistrbute from '@/components/reportAudit/finishDistrbute.vue' import warningDetail from './components/detail.vue' +import dayjs from "dayjs"; + + + const warningCode = ref("warning") const dialog = ref(false) const endDialog =ref(false) @@ -47,7 +51,7 @@ const activeName = ref(false) const route = useRoute() const router =useRouter(); const rules =ref({ - evidenceOffer:[ {required: true, message: '请选择证据提供者', trigger: 'blur'}], + // evidenceOffer:[ {required: true, message: '请选择证据提供者', trigger: 'blur'}], supervisionTime:[ {required: true, message: '请选择预警监督日期 ', trigger: 'blur'}], warningSupervision:[ {required: true, message: '请选择预警监督人员', trigger: 'blur'}], }) @@ -147,6 +151,7 @@ const closePage = ()=>{ } //保存 const addOrUpDataFun = async ()=>{ + try{ await formDataRef.value.validate(); loading.value=true; formData.value.code ="warning"; @@ -155,6 +160,16 @@ const addOrUpDataFun = async ()=>{ feedback.msgSuccess("保存成功") delete formData.value.code; loading.value=false; + } catch (err){ + // ② 校验不通过的提示 + feedback.msgError("请完善必填项后再提交"); + + // 可选:控制台看看是哪个字段没过 + console.warn("表单校验失败:", err); + } finally { + loading.value = false; + } + } //提交 @@ -197,6 +212,7 @@ const getWarningDetailFun = async (warningId)=>{ break; } } + ensureSupervisionTime(); loading.value=false } const rejectFun = ()=>{ @@ -301,6 +317,7 @@ onMounted(()=>{ formData.value.record.warningSupervisionId = userStore.user.userName; formData.value.record.warningSupervision = userStore.user.nickName; query.value.name= formData.value.record.warningSupervision; + ensureSupervisionTime(); getReportDetailFun(route.query.reportId) getWarningInformFun(route.query.reportId) }else{ @@ -342,6 +359,12 @@ const timeAlertFun=(rowName)=>{ }); } +const ensureSupervisionTime = () => { + const r = formData.value.record || (formData.value.record = {}); + if (!r.supervisionTime) { + r.supervisionTime = dayjs().format("YYYY-MM-DD HH:mm"); + } +};