diff --git a/src/enums/fileTableDictEnum.ts b/src/enums/fileTableDictEnum.ts index 7a658e7..51218a2 100644 --- a/src/enums/fileTableDictEnum.ts +++ b/src/enums/fileTableDictEnum.ts @@ -112,6 +112,12 @@ export const fileEndDict = ref( { type: ['服务类', '货物类'], fileData: [ + { + request: false, + type: "普通附件", + fileName: "报审表", + fileNode: 'initial' + }, { request: false, type: "普通附件", @@ -133,7 +139,20 @@ export const fileEndDict = ref( { request: false, type: '普通附件', - fileName: "", + fileName: "合同或协议", + fileNode: 'initial' + }, + { + request: false, + type: '普通附件', + fileName: "验收书", + fileNode: 'initial' + } + , + { + request: false, + type: '普通附件', + fileName: "结(预)算书及电子版文件", fileNode: 'initial' } ] @@ -141,6 +160,12 @@ export const fileEndDict = ref( { type: ['工程类'], fileData: [ + { + request: false, + type: "普通附件", + fileName: "报审表", + fileNode: 'initial' + }, { request: false, type: "普通附件", @@ -208,6 +233,12 @@ export const fileEndDict = ref( { type: ['信息化类'], fileData: [ + { + request: false, + type: "普通附件", + fileName: "报审表", + fileNode: 'initial' + }, { request: false, type: "普通附件", @@ -240,8 +271,21 @@ export const fileEndDict = ref( }, { request: false, - type: "普通附件", - fileName: "", + type: '普通附件', + fileName: "合同或协议", + fileNode: 'initial' + }, + { + request: false, + type: '普通附件', + fileName: "验收书", + fileNode: 'initial' + } + , + { + request: false, + type: '普通附件', + fileName: "结(预)算书及电子版文件", fileNode: 'initial' } ] diff --git a/src/views/report/edit/controlPrice.vue b/src/views/report/edit/controlPrice.vue index abf9603..7e9ef14 100644 --- a/src/views/report/edit/controlPrice.vue +++ b/src/views/report/edit/controlPrice.vue @@ -803,18 +803,8 @@ onUnmounted(() => { //监测是否是结算项目报审 watch(() => route.query.isEnd, (val) => { - if (pageCache.value.isEnd !== null && !route.query.id) { - isEndData.value = pageCache.value.isEnd; - if (!formData.value.project.reportType) { - formData.value.project.reportType = isEndData.value ? '结算项目' : '项目控制价'; - } - return; - } - // 第一次加载且有参数 - if (val !== undefined && !pageCache.value.isInitialized) { - pageCache.value.isEnd = val === 'true'; - pageCache.value.isInitialized = true; - isEndData.value = pageCache.value.isEnd; + if(val){ + isEndData.value = val === 'true'; if (isEndData.value) { formData.value.project.reportType = '结算项目' } else { @@ -822,7 +812,7 @@ watch(() => route.query.isEnd, (val) => { } }else{ //关闭窗口 - // useTabsStore().removeTab('/report/edit/controlPrice', router); + useTabsStore().removeTab('/report/edit/controlPrice', router); } }, {deep: true, immediate: true})