From d1a8077eeab293194fa6bb8d8271e5a616ffe18e Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 16 Jun 2024 19:34:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E6=B5=81=E7=A8=8B=E5=9B=BE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailComponent/CompanyPicker.vue | 16 ++++++++++++---- src/views/expense-management/share/add.vue | 4 ++-- src/views/project-demand/requirement/add.vue | 5 +++-- src/views/project-demand/summary/add.vue | 4 ++-- .../project-management/implementation/phase.vue | 4 ++-- src/views/special-fund/add.vue | 4 ++-- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue index 49b0e28..af633de 100644 --- a/src/components/DetailComponent/CompanyPicker.vue +++ b/src/components/DetailComponent/CompanyPicker.vue @@ -12,6 +12,17 @@ 全选 不全选 + + + + + + + @@ -75,9 +86,8 @@ const props = defineProps({ type: Boolean } }); -const radio = ref(0); +const checkBtn=ref(1) const isChooseAll = ref(true); -const chooseId = ref(0); let selectItem = reactive({ type: -1, value: "0" @@ -90,8 +100,6 @@ const filterText = ref(""); const dataList = ref([]); const defaultChecked = ref([]); const tree = ref([]); -const isSearch = ref(false); -const expandedKeys = ref([]); const defaultProps = { value: "value", label: "label", diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 2b3cc74..030fab9 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -125,8 +125,8 @@ 添加一行
-
- +
+
流程图
-
- +
+
流程图
+
提交 重新提交 diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 0b6a6c5..ef3ca6a 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -237,8 +237,8 @@ @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Summary/edit'"/>
-
- +
+
流程图
-
- +
+
流程图
-
- +
+
流程图
Date: Sun, 16 Jun 2024 19:50:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9=E6=A1=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/CompanyPicker.vue | 22 +++++++++---------- .../DetailComponent/SpecialFundDetail.vue | 11 ++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue index af633de..3aafc60 100644 --- a/src/components/DetailComponent/CompanyPicker.vue +++ b/src/components/DetailComponent/CompanyPicker.vue @@ -12,17 +12,17 @@ 全选 不全选 - - - - - - - + + + + + + + + + + + diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue index 56e523f..f9c0298 100644 --- a/src/components/DetailComponent/SpecialFundDetail.vue +++ b/src/components/DetailComponent/SpecialFundDetail.vue @@ -96,6 +96,7 @@ import {downloadFile} from "@/api/project-demand"; const changeDiagram = ref(false) const emit = defineEmits(['getInfo', "update:formData"]) const form = ref() +const router = useRouter() const props = defineProps({ formData: { @@ -194,6 +195,16 @@ const fileTable = reactive({ } ] }) +const handleView=(row)=>{ + router.push({ + name: 'Implementation/detail', + query: { + id: row.requirementId, + projectId: row.projectId, + // step: '40' + } + }) +} const handleDownload = (row) => { downloadFile(row.fileId).then(res => { const blob = new Blob([res])