diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index df46dddc..682fa61d 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -1,14 +1,8 @@ - - + @@ -170,13 +160,14 @@ const setInterval = (val: any) => { datePickerRef.value.setInterval(val) } -defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange}) +defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange }) +// } diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue index 7a874722..acf428a6 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue @@ -104,8 +104,8 @@ @@ -118,7 +118,7 @@ import { ElMessage, genFileId, UploadProps, UploadRawFile, UploadUserFile } from import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file' import { useDictData } from '@/stores/dictData' import { addSurveyTest, updateSurveyTest, getTestById } from '@/api/supervision-boot/survey/test' - +const loading = ref(false) const acceptType = ref('') const tableStore = inject('tableStore') as TableStore let uploadName = ref('') @@ -254,7 +254,8 @@ const cancelFn = () => { planAddition.value = false } // 提交 -const submitFn = (flag: boolean) => { +const submitFn = async (flag: boolean) => { + loading.value = true const subForm = JSON.parse(JSON.stringify(form.value)) subForm.otherReport = '' @@ -270,7 +271,7 @@ const submitFn = (flag: boolean) => { subForm.saveOrCheckflag = '1' //新增,则组装业务数据提交后台 - addSurveyTest(subForm).then(res => { + await addSurveyTest(subForm).then(res => { ElMessage.success('保存成功!') tableStore.index() planAddition.value = false @@ -315,6 +316,9 @@ const submitFn = (flag: boolean) => { } }) } + await setTimeout(() => { + loading.value = false + }, 0) } const audit = (filePath: any) => { if (title.value == '计划测试填报') { diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue index e3af9e35..c814e06b 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue @@ -166,8 +166,8 @@ @@ -200,6 +200,7 @@ const props = defineProps({ const rules = { goToNetReport: [{ required: true, message: '请上传报告', trigger: 'blur' }] } +const loading = ref(false) const emits = defineEmits(['onSubmit']) const dictData = useDictData() const dialogFormVisible = ref(false) @@ -353,6 +354,7 @@ const choose = (e: any) => { //提交 const confirmForm = (flag: boolean) => { + loading.value = true if (flag) { let data = { type: props.bussType, @@ -394,6 +396,9 @@ const confirmForm = (flag: boolean) => { } }) } + setTimeout(() => { + loading.value = false + }, 0) } defineExpose({ open }) diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index ce936136..a2c51530 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -1,68 +1,35 @@