diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index da3e9b3..b664b8f 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -551,12 +551,13 @@ html, body, #app, .el-container, .el-aside, .el-main { } .approval-record { + padding-top: 10px; padding-bottom: 30px; position: relative; .approval-title { display: flex; align-items: center; - justify-content: space-between; + //justify-content: space-between; .diagram { display: flex; @@ -564,6 +565,7 @@ html, body, #app, .el-container, .el-aside, .el-main { float: right; .base-title { + margin-left: 10px; margin-right: 10px; } diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 7827482..8b8b53f 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -1,8 +1,8 @@
-
+
流程图
@@ -160,7 +160,7 @@ const form = ref(null) const expendClass = ref() const fileList = ref([]) const loading = ref(false) -const showTable = ref(true) +const showTable = ref(false) const processStore = useProcessStore() const processInstanceData = ref() const formPermMap = ref(new Map()); @@ -451,6 +451,7 @@ const handleDelete = (row) => { }) if (res.code === 1000) { formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1); + showTable.value = formData.value.fileList.length !== 0; } }); } diff --git a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue index 74c0730..163e199 100644 --- a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue +++ b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue @@ -68,7 +68,7 @@
流程图
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 33f2ddf..f401b4f 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + - + - - + + - - + + - + @@ -140,7 +140,7 @@ - + {{ formData.specialFund }} @@ -156,8 +156,8 @@ - - + + - + - + @@ -199,7 +199,7 @@ - + @@ -219,13 +219,13 @@ - + - + @@ -233,15 +233,15 @@ -
-
+
+
流程图
@@ -281,8 +281,10 @@ const companyOption = ref([]) const summaryForm = ref() const deploymentId = ref() const specialFundOption = ref([]) -const showTable = ref(true) +const showTable = ref(false) +const showSingleTable = ref(false) const otherFileList = ref([]) +const singleList = ref([]) const formData = ref({ isSpecialFund: false, industryUniversityResearch: '0', @@ -363,7 +365,12 @@ const compositeParam = (item, type) => { const getAttachment = (val) => { // console.log('上传文件getAttachment', val) + showSingleTable.value=false formData.value.singleFile = compositeParam(val) + singleList.value.push( compositeParam(val)) + nextTick(() => { + showSingleTable.value = true + }) } const getOtherFile = (val) => { // console.log('上传文件getOtherFile', val) @@ -374,6 +381,12 @@ const getOtherFile = (val) => { showTable.value = true }) } +watch(() => otherFileList.value, (newVal) => { + showTable.value = newVal.length !== 0; +}, {deep: true}) +watch(() => singleList.value, (newVal) => { + showSingleTable.value = newVal.length !== 0; +}, {deep: true}) const getFileParam = (item) => { if (item === undefined) return; return { @@ -455,7 +468,7 @@ const handleResubmit = debounce(() => { ...formData.value, deploymentId: deploymentId.value, fileList: otherFiles, - requirementId: route.query.id ? route.query.id : '-1' + requirementId: route.query.requirementId ? route.query.requirementId : '-1' } // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId) resubmitReported(params).then(res => { diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index e6f7792..3c70964 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -304,7 +304,7 @@ const handleEdit = (row) => { router.push({ name: 'Summary/edit', query: { - id: row.requirementId, + requirementId: row.requirementId, projectId: row.projectId } }) diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index c048100..166b7a3 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -13,11 +13,11 @@ @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Phase/edit'"/>
-
+
流程图
diff --git a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue index 3aca84c..61a64ab 100644 --- a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue +++ b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue @@ -2,10 +2,10 @@
- 流程图
diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue index ea949be..89f1b88 100644 --- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue +++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue @@ -68,7 +68,7 @@
流程图
diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue index a1e661d..b49ce38 100644 --- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue +++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue @@ -17,7 +17,7 @@
@@ -29,7 +29,7 @@
流程图
diff --git a/src/views/project-management/mobledetail/ShareDetailMobile.vue b/src/views/project-management/mobledetail/ShareDetailMobile.vue index d58d183..e6f79bb 100644 --- a/src/views/project-management/mobledetail/ShareDetailMobile.vue +++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue @@ -40,7 +40,7 @@
流程图
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue index 4257601..3de5857 100644 --- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue +++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue @@ -73,7 +73,7 @@
流程图
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue index cbf239c..45cc9f8 100644 --- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue +++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue @@ -162,7 +162,7 @@
流程图
diff --git a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue index 3aca84c..61a64ab 100644 --- a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue +++ b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue @@ -2,10 +2,10 @@
- 流程图
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue index 9b990ea..bac3267 100644 --- a/src/views/special-fund/add.vue +++ b/src/views/special-fund/add.vue @@ -27,11 +27,11 @@
-
+
流程图