diff --git a/src/components/file/upload.vue b/src/components/file/upload.vue index 59e65b0..69c5cc8 100644 --- a/src/components/file/upload.vue +++ b/src/components/file/upload.vue @@ -53,7 +53,7 @@ const props = defineProps({ } }); -const emit = defineEmits(["update:files"]); +const emit = defineEmits(["update:files", "success"]); const files = ref(props.files); @@ -106,6 +106,7 @@ function handleSuccess(data, file) { console.log("file", filterFiles[0]); } emit("update:files", files.value); + emit("success", file); } function handleError(e, file) { diff --git a/src/components/negative/verify-description.vue b/src/components/negative/verify-description.vue index 527422e..5aeb191 100644 --- a/src/components/negative/verify-description.vue +++ b/src/components/negative/verify-description.vue @@ -92,6 +92,10 @@ {{ negative.processResult }} +
+ + {{ negative.disciplinaryActionDesc }} +
核查办理单位* diff --git a/src/views/superviseReport/Notice.vue b/src/views/superviseReport/Notice.vue index 89a14b2..c937a50 100644 --- a/src/views/superviseReport/Notice.vue +++ b/src/views/superviseReport/Notice.vue @@ -81,50 +81,16 @@ const delReportData = async (row)=>{ await getList(); } -//督察问题 -const negativeShow = ref(false) -const negativeTable = ref(); -const negativeQuery = ref({ - current: 1, - size: 10, - departBranch:false -}) -const negativeTotal = ref(0); -const negativeLoging = ref(false); - -const handleNegativeTable =async (row)=>{ - if(row.superviseNumber > 0){ - try{ - negativeLoging.value=true; - await getNegativePageFun(row); - negativeShow.value = true; - }catch (e){ - console.log("督察问题获取失败") - negativeLoging.value=false; - } - } -} - -const getNegativePageFun = async (row)=>{ - negativeQuery.value.id =row.id; - const res = await getNegativePageByQuery(row); - negativeTable.value =res.records; - negativeTotal.value = res.total; - negativeLoging.value=false; -} const closeAdd =()=>{ - editRow.value={} - console.log(editRow.value) + editRow.value={ type: 2 } } -watch(()=>editRow.value.files,(val)=>{ - console.log(val) - if(val){ - console.log(val[0]?.fileName.split(".")[0]) - editRow.value.reportName = val[0]?.fileName.split(".")[0] - } -}) +function onUploadSuccess(file) { + if (!editRow.value.reportName) { + editRow.value.reportName = file.name.split(".")[0] + } +} @@ -167,11 +133,7 @@ watch(()=>editRow.value.files,(val)=>{ > - - - +