diff --git a/dist.zip b/dist.zip index 95962ff..d913c03 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package-lock.json b/package-lock.json index d196423..2dcf0a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "pinia": "^2.0.22", "pinia-plugin-persist": "^1.0.0", "qrcode.vue": "^3.3.3", - "vue": "^3.4.38", + "vue": "^3.4.1", "vue-router": "4", "vue3-seamless-scroll": "^2.0.1", "xlsx": "^0.16.0", diff --git a/package.json b/package.json index 765c8f2..a41ba8d 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "pinia": "^2.0.22", "pinia-plugin-persist": "^1.0.0", "qrcode.vue": "^3.3.3", - "vue": "^3.4.38", + "vue": "^3.4.1", "vue-router": "4", "vue3-seamless-scroll": "^2.0.1", "xlsx": "^0.16.0", diff --git a/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue b/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue index 1fa7e89..2a12ef9 100644 --- a/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue +++ b/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue @@ -69,6 +69,7 @@ const uploadUrl = store.dictStore.uploadUrl, baseProjOtherFile: data.baseProjOtherFile ? reviewFileParam(JSON.parse(data.baseProjOtherFile)) : [], mainAccusationDoc: data.mainAccusationDoc ? reviewFileParam(JSON.parse(data.mainAccusationDoc)) : [] } + console.log(formData.value) } defineExpose({ validForm, formData, setFormData }) diff --git a/src/pages/declareManage/projectDeclare/declarePage/index.vue b/src/pages/declareManage/projectDeclare/declarePage/index.vue index 48e452d..68070b1 100644 --- a/src/pages/declareManage/projectDeclare/declarePage/index.vue +++ b/src/pages/declareManage/projectDeclare/declarePage/index.vue @@ -435,21 +435,21 @@ const { proxy } = getCurrentInstance(), // allApplicationsDone = ref(1), // 所有应用信息校验字段 setData = () => { basicInfoRef.value.setFormData(detailData.value) - if (detailData.value?.baseProjIsConfidentiality !== '02') { - fundsInfoRef.value.setFormData(detailData.value) - fundsAllocationRef?.value.setFormData(detailData.value) - annualPaymentPlanRef?.value.setFormData(detailData.value) - formConfig.value.isCoreBusiness && coreBusinessRef.value.setFormData(detailData.value) - formConfig.value.isSafetyInput && safetyInputRef.value.setFormData(detailData.value) - formConfig.value.isProjectImageProgress && projectImageProgressRef.value.setFormData(detailData.value) - accessoryRef.value.setFormData(detailData.value) - formConfig.value.isRemark && projectRemarkRef.value.setFormData(detailData.value) - // detailData.value.safetyInputModular?.length && newModuleformRef.value.setFormData(detailData.value) - applicationsRef.value?.setFormData(detailData.value) - setTimeout(() => { - provincialExamineRef.value?.setFormData(detailData.value) - }) - } + // if (detailData.value?.baseProjIsConfidentiality !== '02') { + fundsInfoRef.value.setFormData(detailData.value) + fundsAllocationRef?.value.setFormData(detailData.value) + annualPaymentPlanRef?.value.setFormData(detailData.value) + formConfig.value.isCoreBusiness && coreBusinessRef.value.setFormData(detailData.value) + formConfig.value.isSafetyInput && safetyInputRef.value.setFormData(detailData.value) + formConfig.value.isProjectImageProgress && projectImageProgressRef.value.setFormData(detailData.value) + accessoryRef.value.setFormData(detailData.value) + formConfig.value.isRemark && projectRemarkRef.value.setFormData(detailData.value) + // detailData.value.safetyInputModular?.length && newModuleformRef.value.setFormData(detailData.value) + applicationsRef.value?.setFormData(detailData.value) + setTimeout(() => { + provincialExamineRef.value?.setFormData(detailData.value) + }) + // } }, // 被退回处理 // 获取审核详情 @@ -651,6 +651,11 @@ async function reuseItem (data) { nextTick(() => { setData() }) + setTimeout(() => { + nextTick(() => { + setData() + }) + }, 200) } function changeProjectTypeResetForm () { // nextTick(() => {