|
@@ -22,11 +22,11 @@
|
|
|
v-if="route.query.operationRecord === '2'
|
|
v-if="route.query.operationRecord === '2'
|
|
|
|| route.query.operationRecord === '3'
|
|
|| route.query.operationRecord === '3'
|
|
|
|| route.query.operationRecord === '5'"
|
|
|| route.query.operationRecord === '5'"
|
|
|
- :formData="formData?.logVoList[formData?.logVoList.length - 1]"
|
|
|
|
|
|
|
+ :formData="formData?.logVoList[0]"
|
|
|
ref="dealOpinionRef"
|
|
ref="dealOpinionRef"
|
|
|
/>
|
|
/>
|
|
|
<!-- 处置结束关闭 -->
|
|
<!-- 处置结束关闭 -->
|
|
|
- <DisposalEndClose v-if="route.query.operationRecord === '3'" ref="disposalEndCloseRef" />
|
|
|
|
|
|
|
+ <DisposalEndClose v-if="route.query.operationRecord === '3' && route.query.type !== 'detail'" ref="disposalEndCloseRef" />
|
|
|
<!-- 违法信息处置完成 -->
|
|
<!-- 违法信息处置完成 -->
|
|
|
<DisposalCompleted v-if="route.query.operationRecord === '5'" :formData="formData" />
|
|
<DisposalCompleted v-if="route.query.operationRecord === '5'" :formData="formData" />
|
|
|
<div class="book flex">
|
|
<div class="book flex">
|
|
@@ -108,20 +108,38 @@ onBeforeUnmount(() => {
|
|
|
|
|
|
|
|
const handleSubmit = async () => {
|
|
const handleSubmit = async () => {
|
|
|
// 调用子组件的校验方法
|
|
// 调用子组件的校验方法
|
|
|
|
|
+ const endValid = ref();
|
|
|
|
|
+ const endForm = ref();
|
|
|
|
|
+ const dealValid = ref();
|
|
|
|
|
+ const dealForm = ref();
|
|
|
|
|
+ if (route.query.operationRecord === '3') {
|
|
|
|
|
+ endValid.value = await disposalEndCloseRef.value.validateForm() || true;
|
|
|
|
|
+ endForm.value = await disposalEndCloseRef.value.getFormData();
|
|
|
|
|
+ }
|
|
|
|
|
+ if (route.query.operationRecord === '2'
|
|
|
|
|
+ || route.query.operationRecord === '3'
|
|
|
|
|
+ || route.query.operationRecord === '5') {
|
|
|
|
|
+ dealValid.value = await dealOpinionRef.value.validateForm() || true;
|
|
|
|
|
+ dealForm.value = await dealOpinionRef.value.getFormData();
|
|
|
|
|
+ }
|
|
|
|
|
+ // submitFormData.value = {
|
|
|
|
|
+ // ...(dealForm.value && dealForm.value),
|
|
|
|
|
+ // ...(endForm.value && endForm.value),
|
|
|
|
|
+ // };
|
|
|
|
|
+ // console.log(submitFormData.value);
|
|
|
|
|
+ // return
|
|
|
const noticeValid = await noticeChildRef.value.validateForm() || true;
|
|
const noticeValid = await noticeChildRef.value.validateForm() || true;
|
|
|
- const dealValid = await dealOpinionRef.value.validateForm() || true;
|
|
|
|
|
- const endValid = await disposalEndCloseRef.value.validateForm() || true;
|
|
|
|
|
|
|
+ // const dealValid = await dealOpinionRef.value.validateForm() || true;
|
|
|
const questionValid = await questionInfoRef.value.validateForm() || true;
|
|
const questionValid = await questionInfoRef.value.validateForm() || true;
|
|
|
// 获取组件信息
|
|
// 获取组件信息
|
|
|
const noticeForm = await noticeChildRef.value.getFormData();
|
|
const noticeForm = await noticeChildRef.value.getFormData();
|
|
|
- const dealForm = await dealOpinionRef.value.getFormData();
|
|
|
|
|
- const endForm = await disposalEndCloseRef.value.getFormData();
|
|
|
|
|
|
|
+ // const dealForm = await dealOpinionRef.value.getFormData();
|
|
|
const questionForm = await questionInfoRef.value.getFormData();
|
|
const questionForm = await questionInfoRef.value.getFormData();
|
|
|
const { type, notifiedMattersId, operationRecord, subOperationRecord } = route.query;
|
|
const { type, notifiedMattersId, operationRecord, subOperationRecord } = route.query;
|
|
|
submitFormData.value = {
|
|
submitFormData.value = {
|
|
|
...(noticeForm && { middleList: noticeForm }),
|
|
...(noticeForm && { middleList: noticeForm }),
|
|
|
- ...(dealForm && dealForm),
|
|
|
|
|
- ...(endForm && endForm),
|
|
|
|
|
|
|
+ ...(dealForm.value && dealForm.value),
|
|
|
|
|
+ ...(endForm.value && endForm.value),
|
|
|
...(questionForm && questionForm)
|
|
...(questionForm && questionForm)
|
|
|
};
|
|
};
|
|
|
onOperateThing({ operationRecord: subOperationRecord, notifiedMattersId, ...submitFormData.value })
|
|
onOperateThing({ operationRecord: subOperationRecord, notifiedMattersId, ...submitFormData.value })
|