diff --git a/src/api/process-boot/workflow/form.ts b/src/api/process-boot/workflow/form.ts deleted file mode 100644 index d2342690..00000000 --- a/src/api/process-boot/workflow/form.ts +++ /dev/null @@ -1,73 +0,0 @@ -import createAxios from '@/utils/request' - -import { PROCESS_BOOT } from '@/utils/constantRequest' - -const MAPPING_PATH = PROCESS_BOOT + '/workflow/wfForm' - -/** - * 查询流程表单数据 - */ -export const listWFForm = (data: any) => { - return createAxios({ - url: MAPPING_PATH + '/list', - method: 'POST', - data: data - }) -} - -/** - * 查询所有流程表单 - */ -export const listAllWFForm = () => { - return createAxios({ - url: MAPPING_PATH + '/listAll', - method: 'GET' - }) -} - -/** - * 根据id查询表单详细信息 - */ -export const getFormById = (id: string) => { - return createAxios({ - url: MAPPING_PATH + '/getFormById?id=' + id, - method: 'GET' - }) -} - - -/** - * 新增流程表单 - */ -export const addWFForm = (data: any) => { - return createAxios({ - url: MAPPING_PATH + '/add', - method: 'POST', - data: data - }) -} - - -/** - * 更新流程表单 - */ -export const updateWFForm = (data: any) => { - return createAxios({ - url: MAPPING_PATH + '/update', - method: 'POST', - data: data - }) -} - - -/** - * 删除流程表单 - */ -export const deleteWFForm = (data: any) => { - let ids = [data] - return createAxios({ - url: MAPPING_PATH + '/delete', - method: 'POST', - data: ids - }) -} diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue index 76e0c809..59a40055 100644 --- a/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue +++ b/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue @@ -337,10 +337,10 @@ const listenerFieldFormRef = ref() const bpmnInstances = () => (window as any)?.bpmnInstances const resetListenersList = () => { - console.log( - bpmnInstances().bpmnElement, - 'window.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElement' - ) + // console.log( + // bpmnInstances().bpmnElement, + // 'window.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElement' + // ) bpmnElement.value = bpmnInstances().bpmnElement otherExtensionList.value = [] bpmnElementListeners.value = diff --git a/src/views/system/bpm/form/index.vue b/src/views/system/bpm/form/index.vue index 7e7ee4e4..a120dc35 100644 --- a/src/views/system/bpm/form/index.vue +++ b/src/views/system/bpm/form/index.vue @@ -30,7 +30,7 @@ import TableStore from '@/utils/tableStore' import { ElMessage } from 'element-plus' import { onMounted, provide, ref, reactive,nextTick } from 'vue' import { useRouter } from 'vue-router' -import { deleteWFForm, getFormById } from '@/api/process-boot/workflow/form' +import { deleteForm, getById } from '@/api/bpm-boot/form' const { push } = useRouter() @@ -71,24 +71,24 @@ const tableStore = new TableStore({ minWidth: '230', fixed: 'right', buttons: [ - { - name: 'view', - title: '预览', - type: 'primary', - icon: 'el-icon-EditPen', - render: 'basicButton', - click: row => { - //首先根据id查询出详细数据,然后渲染json - getFormById(row.id).then(res => { - render.visible = true; - render.title = '查看表单详情'; - nextTick(async () => { - vfRenderRef.value.setFormJson(res.data.content || {formConfig: {}, widgetList: []}); - }); - - }) - } - }, + // { + // name: 'view', + // title: '预览', + // type: 'primary', + // icon: 'el-icon-EditPen', + // render: 'basicButton', + // click: row => { + // //首先根据id查询出详细数据,然后渲染json + // getById(row.id).then(res => { + // render.visible = true; + // render.title = '查看表单详情'; + // nextTick(async () => { + // vfRenderRef.value.setFormJson(res.data.content || {formConfig: {}, widgetList: []}); + // }); + // + // }) + // } + // }, { name: 'update', title: '设计表单', @@ -113,7 +113,7 @@ const tableStore = new TableStore({ title: '确定删除吗?' }, click: row => { - deleteWFForm(row.id).then(res => { + deleteForm(row.id).then(res => { ElMessage.success('删除成功') tableStore.index() }) diff --git a/src/views/system/bpm/processInstance/detail/index.vue b/src/views/system/bpm/processInstance/detail/index.vue index bbe2c405..1440003c 100644 --- a/src/views/system/bpm/processInstance/detail/index.vue +++ b/src/views/system/bpm/processInstance/detail/index.vue @@ -30,11 +30,11 @@ {{ processInstance?.startUser.deptName }} - + - + { reason: '', copyUserIds: [] }) - + console.log(runningTasks.value) // 2.4 处理 approve 表单 if (task.formId && task.formConf) { const approveForm = {}