diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index f5d791e..fa2cc3c 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -114,9 +114,14 @@ watch(() => props.showTable, (newVal) => { watch(() => props.otherFileList, (newVal) => { console.log('newotherFileList',newVal) if (props.preview) { - newVal?.forEach(item => { - allFileList.value.push(item) - }) + if(props.formData.fileList==null){ + allFileList.value=newVal + }else { + newVal?.forEach(item => { + allFileList.value.push(item) + }) + } + }else { allFileList.value=newVal } @@ -124,9 +129,9 @@ watch(() => props.otherFileList, (newVal) => { watch(() => props.formData.fileList, (newVal) => { console.log('newVal-fileList',newVal) if (props.preview) { - newVal?.forEach(item => { - allFileList.value.push(item) - }) + newVal?.forEach(item => { + allFileList.value.push(item) + }) } }, {deep: true}) watch(() => props.formData.singleFile, (newVal) => { diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue index 2956ad2..211f087 100644 --- a/src/views/expense-management/share/index.vue +++ b/src/views/expense-management/share/index.vue @@ -90,18 +90,18 @@ const tableConfig = reactive({ if(row.buttons){ buttons = new Set(Array.from(row.buttons)) } - // if (buttons.has("details")) { + if (buttons.has("details")) { btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'}) - // } - // if (buttons.has("edit")) { + } + if (buttons.has("edit")) { btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'}) - // } - // if (buttons.has("report")) { + } + if (buttons.has("report")) { btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'}) - // } - // if (buttons.has("report")) { + } + if (buttons.has("report")) { btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'}) - // } + } return (
{ @@ -117,11 +117,11 @@ const tableConfig = reactive({ )) } { - // buttons.has("delete") ? + buttons.has("delete") ? handleDelete(row)}/> - // : '' + : '' }
) diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 1c35513..b6929a5 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -393,6 +393,7 @@ const handleSubmit = debounce(async (instance) => { // } let params = { ...formData.value, + isSpecialFund:false, deploymentId: deploymentId.value, fileList: otherFiles, singleFile: singleFile, diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index b42ed60..f81e0e4 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -96,17 +96,41 @@ const tableConfig = reactive({ { prop: 'projectType', label: '项目类型', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'rdSubject', label: '研发主体', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'projectImpact', label: '项目影响', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'startTime', diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index 385ecf6..4630052 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -153,21 +153,45 @@ const tableConfig = reactive({ { prop: 'projectType', label: '项目类型', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'rdSubject', label: '研发主体', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'projectImpact', label: '项目影响', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'economicEstimate', - label: '经济概算', + label: '经济概算(万元)', align: 'center' }, { diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 4f490f4..ea7ceb7 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -158,21 +158,45 @@ const tableConfig = reactive({ { prop: 'projectType', label: '项目类型', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'rdSubject', label: '研发主体', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'projectImpact', label: '项目影响', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'economicEstimate', - label: '经济概算', + label: '经济概算(万元)', align: 'center' }, { diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index 4fc4a97..3e00101 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -152,21 +152,45 @@ const tableConfig = reactive({ { prop: 'projectType', label: '项目类型', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'rdSubject', label: '研发主体', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'projectImpact', label: '项目影响', - align: 'center' + align: 'center', + showOverflowTooltip: false, + currentRender: ({row, index}) => { + if (row.state !== null) { + return () + } else { + return '--' + } + } }, { prop: 'economicEstimate', - label: '经济概算', + label: '经济概算(万元)', align: 'center' }, { @@ -187,7 +211,7 @@ const tableConfig = reactive({ label: '状态', align: 'center', showOverflowTooltip: false, - currentRender: ({row, index}) =>{ + currentRender: ({row, index}) => { if (row.state !== null) { return () } else { @@ -207,7 +231,7 @@ const tableConfig = reactive({ btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'}) } if (buttons.has("edit")) { - btn.push({label: '编辑',prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'}) + btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'}) } // if (buttons.has("delete")) { // btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'}) diff --git a/src/views/special-fund/detail.vue b/src/views/special-fund/detail.vue index 3abef05..a6760a2 100644 --- a/src/views/special-fund/detail.vue +++ b/src/views/special-fund/detail.vue @@ -6,7 +6,7 @@