From e77820e145aa169c246124e140c64fc9bbab84ff Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Mon, 14 Apr 2025 21:19:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=92=8C=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/ApprovalDetail.vue | 45 ++++++++++++ .../DetailComponent/SummaryDetail.vue | 72 +++++++++++++++---- src/views/workflow/process/index.vue | 42 +---------- 3 files changed, 105 insertions(+), 54 deletions(-) diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index 528b72c..c2e7ed7 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -28,6 +28,9 @@ style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd" /> + 立即抄送 +
+ + @@ -49,6 +56,8 @@ import {ElLoading, ElNotification} from 'element-plus'; import {downloadFile} from "@/api/project-demand"; import {searchImplementationFileList} from "@/api/project-manage/attachment"; import {getTags} from "@/api/project-manage"; +import {applyCcSend} from "@/api/expense-manage"; +import UserPicker from "@/views/workflow/process/common/UserPicker.vue"; const changeDiagram = ref(false) const props = defineProps({ @@ -104,6 +113,8 @@ const props = defineProps({ } }) const form = ref() +const carbonCopyUserList = ref([]) +const carbonCopyUserRef = ref() const editSingleTableConfig = reactive({ columns: [ @@ -390,6 +401,40 @@ const _value = computed({ emit("update:value", val); } }) +const handleCarbonCopy = () => { + carbonCopyUserRef.value.showUserPicker() +} +const carbonCopyUserPickerOk = (userList) => { + carbonCopyUserList.value = userList.map(item => item.id) + console.log('localFormData.value', props.data) + console.log("🚀 ~ file:'carbonCopyUserList.value ", carbonCopyUserList.value) + + addUser() +} +const addUser = async () => { + const res = await applyCcSend({ + instanceId: props.data.processInstanceId, + // message:props.data.remark, + projectId: route.query.projectId, + state: props.data.state, + userIds: carbonCopyUserList.value + }) + console.log('res', res) + if (res.code === 1000) { + ElNotification({ + title: '提示', + message: '抄送成功', + type: 'error' + }) + tableIns.value.refresh() + } else { + ElNotification({ + title: '提示', + message: res.msg, + type: 'error' + }) + } +} const clickToPreview = (row) => { filePreviewShow.value = false filePreviewParam.value = { diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index bb6b043..661568c 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -57,18 +57,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + + 立即抄送 +
+ +
驳回年度计划 通过年度计划 @@ -153,6 +160,8 @@ import FileComponent from "./FileComponent.vue"; import {ElNotification} from "element-plus"; import {approvePlan} from "@/api/project-demand/summary"; import SelectPreProcess from "@/components/SelectPreProcess.vue"; +import {applyCcSend} from "@/api/expense-manage"; +import UserPicker from "@/views/workflow/process/common/UserPicker.vue"; const emit = defineEmits(['update:value']) const tagsViewStore = useTagsView() @@ -192,6 +201,8 @@ const router = useRouter() const fundOption = ref([]) const companyOption = ref([]) const dictName = ref({}) +const carbonCopyUserList = ref([]) +const carbonCopyUserRef = ref() const rules = reactive({ auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}], }) @@ -203,6 +214,40 @@ const _value = computed({ emit("update:value", val); } }) +const handleCarbonCopy = () => { + carbonCopyUserRef.value.showUserPicker() +} +const carbonCopyUserPickerOk = (userList) => { + carbonCopyUserList.value = userList.map(item => item.id) + console.log('localFormData.value', props.data) + console.log("🚀 ~ file:'carbonCopyUserList.value ", carbonCopyUserList.value) + + addUser() +} +const addUser = async () => { + const res = await applyCcSend({ + instanceId: props.data.processInstanceId, + // message:props.data.remark, + projectId: route.query.projectId, + state: props.data.state, + userIds: carbonCopyUserList.value + }) + console.log('res', res) + if (res.code === 1000) { + ElNotification({ + title: '提示', + message: '抄送成功', + type: 'error' + }) + tableIns.value.refresh() + } else { + ElNotification({ + title: '提示', + message: res.msg, + type: 'error' + }) + } +} const handleRejectPlan = async () => { // const values = form.value.getValues() // console.log('route',route.query.projectId) @@ -321,7 +366,8 @@ getFundOptions() overflow-y: auto; padding-bottom: 0 !important; } -.file-table-style{ + +.file-table-style { :deep(.el-table__header) { .is-leaf:first-child { .cell { diff --git a/src/views/workflow/process/index.vue b/src/views/workflow/process/index.vue index b76adac..3414a32 100644 --- a/src/views/workflow/process/index.vue +++ b/src/views/workflow/process/index.vue @@ -59,9 +59,6 @@ 编辑 - 立即抄送 - @@ -71,9 +68,7 @@
- -
@@ -133,8 +128,6 @@ import {applyCcSend} from "@/api/expense-manage"; const dictStore = useCacheStore() dictStore.setCacheKey(['normal_disable']) const router = useRouter() -const carbonCopyUserList = ref([]) -const carbonCopyUserRef = ref() //查询参数 const queryParams = reactive({ @@ -162,40 +155,7 @@ onActivated(() => { getList() }) -const handleCarbonCopy=(row)=>{ - carbonCopyUserRef.value.showUserPicker() - chooseRow.value=row -} -const carbonCopyUserPickerOk = (userList) => { - carbonCopyUserList.value = userList.map(item => item.id) - console.log("🚀 ~ file:'carbonCopyUserList.value ", carbonCopyUserList.value) - // addUser() -} -const addUser=async () => { - const res = await applyCcSend({ - instanceId: chooseRow.value.deploymentId, - message: chooseRow.value.remark, - projectId:0, - state: chooseRow.value.state, - userIds: carbonCopyUserList.value - }) - console.log('res',res) - if (res.code === 1000) { - ElNotification({ - title: '提示', - message: '抄送成功', - type: 'error' - }) - tableIns.value.refresh() - } else { - ElNotification({ - title: '提示', - message: res.msg, - type: 'error' - }) - } -} //重置搜索 const handleReset = () => { queryForm.value.resetFields()