From 3a49966dac0401398f8eb32fd1b39f0f40f251b8 Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Tue, 21 Apr 2026 11:12:49 +0800 Subject: [PATCH] =?UTF-8?q?yxk-20260421-=E5=85=9A=E5=A7=94=E4=BC=9A?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E7=9D=A3=E5=8A=9E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bg/bgpartymatter/BgPartymatter.api.ts | 3 +- .../bg/bgpartymatter/BgPartymatterList.vue | 50 ++++++++++++------- .../components/BgPartymatterForm.vue | 4 ++ src/views/taskProcess/TaskTaskList.vue | 20 ++++---- 4 files changed, 49 insertions(+), 28 deletions(-) diff --git a/src/views/bg/bgpartymatter/BgPartymatter.api.ts b/src/views/bg/bgpartymatter/BgPartymatter.api.ts index edc7ae5..36997e5 100644 --- a/src/views/bg/bgpartymatter/BgPartymatter.api.ts +++ b/src/views/bg/bgpartymatter/BgPartymatter.api.ts @@ -1,5 +1,6 @@ import {defHttp} from '/@/utils/http/axios'; import { useMessage } from "/@/hooks/web/useMessage"; +import { startProcessSchedules } from '/@/api/common/api'; const { createConfirm } = useMessage(); @@ -71,7 +72,7 @@ export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params },{ isTransformResponse: false }); } - + /** * 列表接口 * @param params diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue index 4ab5ea3..7664299 100644 --- a/src/views/bg/bgpartymatter/BgPartymatterList.vue +++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue @@ -59,6 +59,7 @@ import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage' import {useModal} from '/@/components/Modal'; + import { dateUtil } from '/@/utils/dateUtil'; import BgPartymatterModal from './components/BgPartymatterModal.vue' import { columns, superQuerySchema } from './BgPartymatter.data'; import { list, deleteOne, batchDelete, getImportUrl,getExportUrl } from './BgPartymatter.api'; @@ -67,11 +68,11 @@ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue'; import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue'; - import { startProcess } from '/@/api/common/api'; const [registerBpmModal, { openModal: bpmPicModal }] = useModal(); import BgPartymatterFeedbackList from './BgPartymatterFeedbackList.vue' import { useUserStore } from '/@/store/modules/user'; + import {startProcessSchedules} from "@/api/common/api"; const formRef = ref(); const queryParam = reactive({}); const checkedKeys = ref>([]); @@ -137,7 +138,7 @@ registerModal.value.disableSubmit = false; registerModal.value.add(); } - + /** * 编辑事件 */ @@ -145,7 +146,7 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } - + /** * 详情事件 */ @@ -153,28 +154,28 @@ registerModal.value.disableSubmit = true; registerModal.value.edit(record); } - + /** * 删除事件 */ async function handleDelete(record) { await deleteOne({id: record.id}, handleSuccess); } - + /** * 批量删除事件 */ async function batchHandleDelete() { await batchDelete({ids: selectedRowKeys.value},handleSuccess); } - + /** * 成功回调 */ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -187,7 +188,7 @@ }, ]; } - + /** * 下拉操作栏 */ @@ -228,13 +229,28 @@ * 提交流程 */ async function handleProcess(record) { - let params = { - flowCode: 'dev_bg_partymatter_001', - id: record.id, - formUrl: 'bgpartymatter/components/BgPartymatterForm', - formUrlMobile: '' + const formatDate = (value, format) => { + return value ? dateUtil(value).format(format) : undefined; + }; + const params = { + intervalType: record.intervalType ? Number(record.intervalType) : undefined, + startCount: record.startCount ? Number(record.startCount) : undefined, + taskTask: { + flowCode: 'dev_task_task_001', + triggerType: record.isNeedInterval, //1立即督办，2重复督办 + businessId: record.id, + businessTablename: 'bg_partymatter', + title: record.title, + content: record.content, + urgencyLevel: record.urgencyLevel, + deptId: record.responDeptid, + requireFinishDate: formatDate(record.deadline, 'YYYY-MM-DD'), + startTime: formatDate(record.intervalStartTime, 'YYYY-MM-DD HH:mm:ss'), + deadline: formatDate(record.deadline, 'YYYY-MM-DD HH:mm:ss'), + formUrl: 'bgpartymatter/components/BgPartymatterForm', + }, } - await startProcess(params); + await startProcessSchedules(params); handleSuccess(); } /** @@ -258,7 +274,7 @@ xs: 24, sm: 20, }); - + /** * 重置 */ @@ -268,7 +284,7 @@ //刷新数据 reload(); } - + /** * form点击事件(以逗号分割) @@ -312,4 +328,4 @@ height: 100%; } } - \ No newline at end of file + diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue index 2167ced..07cf6c6 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue @@ -151,6 +151,10 @@ isNeedSuoleader: '', suoleaderid: '', delFlag: '', + isNeedInterval:'', + startCount:'', + intervalType:'', + intervalStartTime:'' }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); diff --git a/src/views/taskProcess/TaskTaskList.vue b/src/views/taskProcess/TaskTaskList.vue index 1663193..84d78b1 100644 --- a/src/views/taskProcess/TaskTaskList.vue +++ b/src/views/taskProcess/TaskTaskList.vue @@ -171,7 +171,7 @@ registerModal.value.disableSubmit = false; registerModal.value.add(); } - + /** * 编辑事件 */ @@ -179,7 +179,7 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } - + /** * 详情 */ @@ -187,28 +187,28 @@ registerModal.value.disableSubmit = true; registerModal.value.edit(record); } - + /** * 删除事件 */ async function handleDelete(record) { await deleteOne({ id: record.id }, handleSuccess); } - + /** * 批量删除事件 */ async function batchHandleDelete() { await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); } - + /** * 成功回调 */ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -221,7 +221,7 @@ }, ]; } - + /** * 下拉操作栏 */ @@ -264,7 +264,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -274,7 +274,7 @@ //刷新数据 reload(); } - + /** * form点击事件(以逗号分割) @@ -294,7 +294,7 @@ let params = { flowCode: 'dev_task_task_001', id: record.id, - formUrl: 'tasktask/components/TaskTaskForm', + formUrl: 'taskProcess/components/TaskTaskForm', formUrlMobile: '' } await startProcess(params);