From 44e74d75f6bf6335b2acc9636742c6edc38dacce Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Tue, 14 Jul 2026 10:55:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(dq,=20xispeak):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=A1=A8=E5=8D=95=E9=83=A8=E9=97=A8=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85=EF=BC=8C=E4=BB=8E=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=96=E5=BD=93=E5=89=8D=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../components/BgXiSpeakFeedbackForm.vue | 26 +++++++++- .../DqInspectTaskBPMFeedbackModal.vue | 50 ++++++++----------- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/views/bg/xispeak/components/BgXiSpeakFeedbackForm.vue b/src/views/bg/xispeak/components/BgXiSpeakFeedbackForm.vue index 6345692..b124bb8 100644 --- a/src/views/bg/xispeak/components/BgXiSpeakFeedbackForm.vue +++ b/src/views/bg/xispeak/components/BgXiSpeakFeedbackForm.vue @@ -8,7 +8,7 @@ - + @@ -177,6 +177,7 @@ import { defHttp } from '/@/utils/http/axios'; import { useMessage } from '/@/hooks/web/useMessage'; import { getValueType } from '/@/utils'; + import { useUserStore } from '/@/store/modules/user'; import { bgXiSpeakFeedbackSaveOrUpdate } from '../BgXiSpeak.api'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; @@ -213,6 +214,7 @@ startTime: '', }); const { createMessage } = useMessage(); + const userStore = useUserStore(); const confirmLoading = ref(false); const validatorRules = reactive({ completionStatus: [{ required: true, message: '请选择完成状态' }], @@ -225,6 +227,27 @@ const labelCol = { xs: { span: 24 }, sm: { span: 7 } }; const wrapperCol = { xs: { span: 24 }, sm: { span: 17 } }; + function fillDeptFromLogin() { + const userInfo = (userStore.getUserInfo || {}) as Record; + let deptId = userInfo.departIds || userInfo.orgCode || ''; + let deptName = userInfo.departIds_dictText || userInfo.orgCodeTxt || ''; + // 如果 orgCodeTxt 仍为空（极少情况），从 loginInfo.departs 按 orgCode 补齐名称 + if (!deptName && deptId) { + const loginInfo = (userStore.getLoginInfo || {}) as Record; + const departs = Array.isArray(loginInfo.departs) ? loginInfo.departs : []; + console.log('【所务会-反馈】兜底查找, orgCode:', deptId, ', departs orgCodes:', departs.map((d: any) => d.orgCode), ', departs names:', departs.map((d: any) => d.departName)); + const matched = departs.find((d: any) => d.orgCode === deptId); + if (matched) { + deptId = matched.id || deptId; + deptName = matched.departName || ''; + console.log('【所务会-反馈】兜底匹配成功, matched:', matched); + } + } + formData.responDeptid = deptId; + formData.responDeptname = deptName; + console.log('【所务会-反馈】填充当前部门, deptId:', deptId, ', deptName:', deptName); + } + /** * 部门选择变化 */ @@ -268,6 +291,7 @@ } }); Object.assign(formData, tmpData); + fillDeptFromLogin(); }); } diff --git a/src/views/dq/inspectTask/components/DqInspectTaskBPMFeedbackModal.vue b/src/views/dq/inspectTask/components/DqInspectTaskBPMFeedbackModal.vue index ddb3858..5372792 100644 --- a/src/views/dq/inspectTask/components/DqInspectTaskBPMFeedbackModal.vue +++ b/src/views/dq/inspectTask/components/DqInspectTaskBPMFeedbackModal.vue @@ -13,7 +13,7 @@ - + @@ -135,9 +135,9 @@ resetForm(mainId, bpmProcessId); isEdit.value = false; if (defaultDeptId) { - void applyCurrentUserFeedbackInfo(defaultDeptId, defaultDeptName); + applyCurrentUserFeedbackInfo(defaultDeptId, defaultDeptName); } else { - void applyCurrentUserFeedbackInfo(); + applyCurrentUserFeedbackInfo(); } visible.value = true; } @@ -153,32 +153,28 @@ visible.value = true; } - function getCurrentLoginDepart() { + function fillCurrentDept() { const userInfo = (userStore.getUserInfo || {}) as Record; - const loginInfo = (userStore.getLoginInfo || {}) as Record; - const departs = Array.isArray(loginInfo.departs) ? loginInfo.departs : []; - if (userInfo.orgCode) { - return departs.find((item) => item.orgCode === userInfo.orgCode); + let deptId = userInfo.departIds || userInfo.orgCode || ''; + let deptName = userInfo.departIds_dictText || userInfo.orgCodeTxt || ''; + // 如果 orgCodeTxt 仍为空（极少情况），从 loginInfo.departs 按 orgCode 补齐名称 + if (!deptName && deptId) { + const loginInfo = (userStore.getLoginInfo || {}) as Record; + const departs = Array.isArray(loginInfo.departs) ? loginInfo.departs : []; + console.log('【巡视整改-反馈】兜底查找, orgCode:', deptId, ', departs orgCodes:', departs.map((d: any) => d.orgCode), ', departs names:', departs.map((d: any) => d.departName)); + const matched = departs.find((d: any) => d.orgCode === deptId); + if (matched) { + deptId = matched.id || deptId; + deptName = matched.departName || ''; + console.log('【巡视整改-反馈】兜底匹配成功, matched:', matched); + } } - return departs.length === 1 ? departs[0] : undefined; + formData.feedbackDeptId = deptId; + formData.feedbackDeptName = deptName; + console.log('【巡视整改-反馈】填充当前部门, deptId:', deptId, ', deptName:', deptName); } - async function getCurrentDepartInfo() { - const userInfo = (userStore.getUserInfo || {}) as Record; - const loginDepart = getCurrentLoginDepart(); - if (loginDepart) { - return { - id: loginDepart.id || '', - departName: loginDepart.departName || '', - }; - } - return { - id: userInfo.departIds || '', - departName: userInfo.departIds_dictText || userInfo.orgCodeTxt || '', - }; - } - - async function applyCurrentUserFeedbackInfo(defaultDeptId = '', defaultDeptName = '') { + function applyCurrentUserFeedbackInfo(defaultDeptId = '', defaultDeptName = '') { const userInfo = (userStore.getUserInfo || {}) as Record; formData.feedbackPersonId = userInfo.id || userInfo.userId || ''; formData.feedbackPersonName = userInfo.realname || ''; @@ -186,9 +182,7 @@ formData.feedbackDeptId = defaultDeptId; formData.feedbackDeptName = defaultDeptName || ''; } else { - const departInfo = await getCurrentDepartInfo(); - formData.feedbackDeptId = departInfo.id; - formData.feedbackDeptName = departInfo.departName; + fillCurrentDept(); } } From b7a937d1dc68a0c2f459f316b9c1bf2d2e2f6399 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Tue, 14 Jul 2026 11:19:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(cc):=20=E8=A1=A5=E5=85=A8=E6=8A=84?= =?UTF-8?q?=E9=80=81=E6=A8=A1=E5=9D=97=E7=BC=BA=E5=A4=B1=E7=9A=84CcTaskLis?= =?UTF-8?q?tContent=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../myCcTask/CcTaskListContent.vue | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue b/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue new file mode 100644 index 0000000..0cefd11 --- /dev/null +++ b/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue @@ -0,0 +1,104 @@ + + + + +