From 141e965f9551eb65952cfafdb0bc48125ba6d049 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Fri, 21 Jun 2024 12:31:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=A0=94?= =?UTF-8?q?=E5=8F=91=E4=BA=BA=E5=91=98=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/views/expense-management/share/add.vue | 106 +++++++++++++-------- 1 file changed, 66 insertions(+), 40 deletions(-) diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index fc69e58..02215e4 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -39,15 +39,19 @@ @@ -121,12 +125,14 @@ + +
添加一行
- +
流程图
@@ -138,8 +144,8 @@
@@ -167,7 +173,11 @@ import { import {useProcessStore} from '@/stores/processStore.js'; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; import OperationRender from '@/views/workflow/common/OperationRender.vue' +import {ref} from "vue"; +import UserPicker from "@/views/workflow/process/common/UserPicker.vue"; + +const userList = ref([]) const changeDiagram = ref(false) const rules = reactive({ shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}], @@ -208,10 +218,25 @@ const formData = ref({ } ] }) +const userPicker = ref() const form = ref() const nameOptions = ref([]) const researchOptions = ref([]) - +const showPersonnelPicker = () => { + userPicker.value.showUserPicker() +} +const chooseUserInfo = () => { + if (userList.value.length > 0) { + return userList.value.map(item => { + return item.name + }).join('，') + } else { + return null + } +} +const selected = (select) => { + userList.value = select +} const getResearchOptions = async () => { const res = await getResearchUser() researchOptions.value = res.data @@ -263,17 +288,18 @@ const handleDelete = (index) => { formData.value.tableData.splice(index, 1) } const handleSubmit = (instance) => { - if (!instance) return - instance.validate(async (valid) => { - if (!valid) { - return ElNotification({ - title: '提示', - message: '请完善数据,再提交!', - type: 'error' - }) - } + // if (!instance) return + // instance.validate(async (valid) => { + // if (!valid) { + // return ElNotification({ + // title: '提示', + // message: '请完善数据,再提交!', + // type: 'error' + // }) + // } formData.value.tableData.forEach(item => { item.projectName = getProjectName(item.projectId) + // item.researchPersonnel }) let params = { shareName: formData.value.shareName, @@ -281,20 +307,20 @@ const handleSubmit = (instance) => { usrAllocations: formData.value.tableData, deploymentId: processInstanceData.value.deploymentId, } - // console.log('params',params) - const {code, msg} = await addAllocation(params) - ElNotification({ - title: '提示', - message: msg, - type: code === 1000 ? 'success' : 'error' - }) - if (code === 1000) { - tagsViewStore.delVisitedViews(router.currentRoute.value.path) - router.push({ - name: 'Expense/share' - }) - } - }) + console.log('params',params,formData.value.tableData) + // const {code, msg} = await addAllocation(params) + // ElNotification({ + // title: '提示', + // message: msg, + // type: code === 1000 ? 'success' : 'error' + // }) + // if (code === 1000) { + // tagsViewStore.delVisitedViews(router.currentRoute.value.path) + // router.push({ + // name: 'Expense/share' + // }) + // } + // }) } const handleResubmit = (instance) => { if (!instance) return @@ -333,7 +359,7 @@ const handleResubmit = (instance) => { }) } -const getDetailInfo = () => { +const getDetailInfo = () => { loading.value = true getAllocationDetail(route.query.id).then(res => { ElNotification({ @@ -400,10 +426,10 @@ const init = async () => { const handleBack = () => { history.back() } -onMounted( () => { - init() +onMounted(() => { + init() if (route.query.id) { - getDetailInfo() + getDetailInfo() } }) From 3f26324747d72f78aac5d3e7bb636fc00a799f80 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Fri, 21 Jun 2024 12:32:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=A0=94?= =?UTF-8?q?=E5=8F=91=E4=BA=BA=E5=91=98=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/views/workflow/process/common/UserPicker.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue index f235ef0..6ed4364 100644 --- a/src/views/workflow/process/common/UserPicker.vue +++ b/src/views/workflow/process/common/UserPicker.vue @@ -51,6 +51,9 @@
+ + + {{ selectItem.name }}-{{ selectItem.companyName }} @@ -125,7 +128,6 @@ const _value = computed({ }); watch(() => filterText.value, (newVal) => { - console.log('filterText.value', newVal) filterText.value = newVal }); From 5977f13b91f0df0b0ab866e8b02be0286ac3d40d Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Fri, 21 Jun 2024 12:33:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=BA=BA?= =?UTF-8?q?=E5=91=98=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/views/workflow/process/common/UserPicker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue index 6ed4364..0639477 100644 --- a/src/views/workflow/process/common/UserPicker.vue +++ b/src/views/workflow/process/common/UserPicker.vue @@ -51,7 +51,7 @@
- + {{ selectItem.name }}-{{ selectItem.companyName }}