From 61a999758ef11df3ed7fb5c98cea561a720fd9e6 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sat, 15 Jun 2024 18:02:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9F=A9=E9=98=B5=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/process/config/ApprovalNodeConfig.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue index 2583619..5eab9ad 100644 --- a/src/views/workflow/process/config/ApprovalNodeConfig.vue +++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue @@ -273,6 +273,7 @@ const props = defineProps({ const nodeProps = computed(() => { + processStore.getSelectedNode().props.matrixApproval=true return processStore.getSelectedNode().props; }) From 79171758f5b0808e5b771779f9166eccb81c7a86 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 16 Jun 2024 15:41:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B8=93=E9=A1=B9=E8=B5=84=E9=87=91=E5=8F=82=E6=95=B0=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project-demand/summary/add.vue | 26 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index d461f33..0b6a6c5 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -336,7 +336,15 @@ const getIsFund = async () => { } }) } - +const getFundName = (id) => { + let label='' + specialFundOption.value.forEach(item => { + if(item.value==id){ + label=item.label + } + }) + return label +} const compositeParam = (item, type) => { let tag = '' if (name.value === 'Summary/add' || name.value === 'Summary/edit') { @@ -354,11 +362,11 @@ const compositeParam = (item, type) => { } const getAttachment = (val) => { - console.log('上传文件getAttachment', val) + // console.log('上传文件getAttachment', val) formData.value.singleFile = compositeParam(val) } const getOtherFile = (val) => { - console.log('上传文件getOtherFile', val) + // console.log('上传文件getOtherFile', val) showTable.value = false let fileObj = compositeParam(val) otherFileList.value.push(fileObj) @@ -367,7 +375,6 @@ const getOtherFile = (val) => { }) } const getFileParam = (item) => { - console.log('item', item) if (item === undefined) return; return { fileId: item.fileId, @@ -397,7 +404,7 @@ const handleSubmit = debounce(async (instance) => { fileList: otherFiles, requirementId: route.query.id ? route.query.id : '-1' } - console.log('params', params) + // console.log('params', params) if (!attachment.value.isSingleFile) { attachment.value.validate() ElNotification({ @@ -441,13 +448,16 @@ const handleResubmit = debounce(() => { } else { attachment.value.clearValidate() } + if (formData.value.isSpecialFund&&formData.value.specialFund === null) { + formData.value.specialFund=getFundName(formData.value.specialFundId) + } let params = { ...formData.value, deploymentId: deploymentId.value, fileList: otherFiles, requirementId: route.query.id ? route.query.id : '-1' } - console.log('重新提交params', params) + // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId) resubmitReported(params).then(res => { ElNotification({ title: '提示', @@ -487,12 +497,12 @@ const init = async () => { specialFundOption.value = resFund.data const res = await getSubCompOpt() companyOption.value = res.data - await processInfo() + await processInfo() loading.value = false } const processInfo = () => { processStore.setDesign(null) - processDiagramViewer.value=false + processDiagramViewer.value = false getProcessInfo(formData.value.isSpecialFund).then(res => { if (res.code === 1000) { let data = res.data From 7ffb6899275b15371aba4c069e484b3968aaad5c Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 16 Jun 2024 18:06:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailComponent/CompanyPicker.vue | 11 ++++++----- src/views/expense-management/share/index.vue | 2 ++ src/views/system/user/index.vue | 9 +++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue index 222f8c6..49b0e28 100644 --- a/src/components/DetailComponent/CompanyPicker.vue +++ b/src/components/DetailComponent/CompanyPicker.vue @@ -18,7 +18,7 @@