From 820349877c6b68f6ea029962c748dd29c1ab1358 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Tue, 18 Jun 2024 23:11:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E7=BC=96=E8=BE=91=E6=97=B6=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E5=9B=9E=E6=98=BE,=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=98=B6=E6=AE=B5=E6=94=B9=E6=88=90=E7=A0=94=E5=8F=91?= =?UTF-8?q?=E9=98=B6=E6=AE=B5,=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E4=B8=BB=E5=AD=90=E8=B4=A6=E5=8F=B7=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/CompanyPicker.vue | 3 --- src/views/expense-management/ledger/index.vue | 6 ++--- src/views/expense-management/share/detail.vue | 2 +- src/views/project-demand/requirement/add.vue | 27 +++++++++++++------ .../implementation/account.vue | 6 ++--- .../implementation/index.vue | 2 +- .../implementation/uploadFee.vue | 6 ++--- .../workflow/process/common/UserPicker.vue | 4 +-- 8 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue index 2824f79..13c6544 100644 --- a/src/components/DetailComponent/CompanyPicker.vue +++ b/src/components/DetailComponent/CompanyPicker.vue @@ -161,8 +161,6 @@ const show = () => { getList() }; const handleChange = (data, checked) => { - // 左侧有选择框 - // if (props.showCheckbox) { // 左侧有选择框 + 多选 if (props.multiple) { //不添加重复的数据到右边 @@ -197,7 +195,6 @@ const handleChange = (data, checked) => { tree.value.setCheckedKeys([]); } } - // } }; const handle = (node, check) => { if (check.isLeaf !== false) { diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue index 06e5445..bda800a 100644 --- a/src/views/expense-management/ledger/index.vue +++ b/src/views/expense-management/ledger/index.vue @@ -47,11 +47,11 @@ const searchConfig = reactive([ } }, { - label: '项目阶段', + label: '研发阶段', prop: 'researchStage', component: shallowRef(fvSelect), props: { - placeholder: '请选择项目阶段查询', + placeholder: '请选择研发阶段查询', clearable: true, filterable: true, checkStrictly: true, @@ -115,7 +115,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { diff --git a/src/views/expense-management/share/detail.vue b/src/views/expense-management/share/detail.vue index a502767..01ebc9d 100644 --- a/src/views/expense-management/share/detail.vue +++ b/src/views/expense-management/share/detail.vue @@ -102,7 +102,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', currentRender: ({row, index}) => { if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) { diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index 5df1dd5..08a8a52 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -34,8 +34,9 @@ -
{{ getName(companyList) }}
- {{ companyList.length === 0 ? '请选择所属公司' : '更改' }} +
{{selectedCompanyList}}
+
{{ getName(selectedCompanyList) }}
+ {{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }} @@ -96,7 +97,7 @@ 重新提交 返回 - + @@ -119,11 +120,13 @@ import {getSubCompOpt} from '@/api/user/user.js' import {useTagsView} from '@/stores/tagsview.js' import {getFundOption} from "@/api/special-fund"; import CompanyPicker from "@/components/DetailComponent/CompanyPicker.vue"; +import {matterTree} from "@/utils/matterTree"; import {useCacheStore} from '@/stores/cache.js' const cacheStore = useCacheStore() const companyRef = ref() -const companyList = ref([]) +const selectedCompanyList = ref([]) +// const companyList = ref([]) const changeDiagram = ref(false) const tagsViewStore = useTagsView() const authStore = useAuthStore() @@ -152,6 +155,7 @@ const showTable = ref(true) const processStore = useProcessStore() const processInstanceData = ref() const formPermMap = ref(new Map()); +const companyNameArray = ref([]) const rules = reactive({ requirementName: [{required: true, message: '请输入征集名称', trigger: 'blur'}], companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}], @@ -203,6 +207,15 @@ const tableConfig = reactive({ } ] }) + +const getCompanyOptionItem = (val) => { + if (val !== undefined) { + val.forEach(item => { + matterTree(companyNameArray.value, companyOption.value, item) + }) + } + return companyNameArray.value.join('，'); +} const getName = (list) => { return list.map(item => item.label).join('，') } @@ -210,12 +223,10 @@ const showCompany = () => { companyRef.value.show() } const selected = (select) => { - let companyInfoList = [] for (let val of select) { - companyInfoList.push(val) formData.value.companyIds.push(val.value) } - companyList.value = companyInfoList + selectedCompanyList.value = select } const checkFormPrem = (formKey) => { if (formPermMap.value.hasOwnProperty(formKey)) { @@ -306,7 +317,6 @@ const init = async () => { }) } const submitParam = (item) => { - console.log('item..', item.companyIds) if (item.companyIds.length === 0) { ElNotification({ title: '提示', @@ -373,6 +383,7 @@ const handleResubmit = () => { const getDetailInfo = async () => { getFormInfo(route.query.id).then(res => { if (res.code === 1000) { + selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds) formData.value = res.data showTinymce.value = false showTable.value = false diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index a035274..42d202f 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -60,11 +60,11 @@ const searchConfig = reactive([ } }, { - label: '项目阶段', + label: '研发阶段', prop: 'researchStage', component: shallowRef(fvSelect), props: { - placeholder: '请选择项目阶段查询', + placeholder: '请选择研发阶段查询', clearable: true, filterable: true, checkStrictly: true, @@ -123,7 +123,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 57f9f3c..ca6c397 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -183,7 +183,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue index cf01a8d..80af415 100644 --- a/src/views/project-management/implementation/uploadFee.vue +++ b/src/views/project-management/implementation/uploadFee.vue @@ -31,10 +31,10 @@ - +