diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts index c2736450a..510901f56 100644 --- a/src/api/DesignForm/requestapi.ts +++ b/src/api/DesignForm/requestapi.ts @@ -528,3 +528,19 @@ export function saveDraftAgain(data: any) { data: data }); } +//编辑任务 +export function editCustomerTable(data: any) { + return request({ + url: '/systemapi/task_management/editCustomerTable', + method: 'post', + data: data + }); +} +//重新提交（有流程就发动流程，无流程就正常发表） +export function afreshAppSubmit(data: any) { + return request({ + url: '/systemapi/task_flow/afreshAppSubmit', + method: 'post', + data: data + }); +} diff --git a/src/api/taskapi/management.ts b/src/api/taskapi/management.ts index 7213dc2c9..15fecf442 100644 --- a/src/api/taskapi/management.ts +++ b/src/api/taskapi/management.ts @@ -84,6 +84,7 @@ export function gainTaskFormInfo(data: customerFormLogo):AxiosPromise import '@/assets/scss/element-var.scss' import '@/assets/scss/index.scss' +import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form' import { FormData,FormList,FormDataStyle } from '@/api/DesignForm/types' import { useRoute, useRouter } from 'vue-router' import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types' @@ -19,7 +20,7 @@ import { } from '@/api/DesignForm/utils' import formatResult from '@/utils/DesignForm/formatResult' import formChangeValue from '@/utils/DesignForm/formChangeValue' -import { judgeSubmitCancel,gainRunFlowStart,startRunFlow,saveDraftAgain } from '@/api/DesignForm/requestapi' +import { judgeSubmitCancel,gainRunFlowStart,startRunFlow,saveDraftAgain,afreshAppSubmit } from '@/api/DesignForm/requestapi' import { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const' import { jsonParseStringify } from '@/utils/DesignForm' //通用提交 @@ -96,6 +97,7 @@ const emits = defineEmits<{ (e: 'btnClick', type: string): void (e: 'change', val: any): void // 表单组件值发生变化时 (e: 'update:issave', type: boolean): void + (e: 'closePage', type: string): void }>() const route = useRoute() @@ -157,7 +159,7 @@ const model = ref({}) //监听是否为流程表单 watch(()=>props.isWorkFlow,(val:number)=>{ - console.log("获取流程----->",val) + console.log("监听是否为流程表单----->",val,formProps) if(val == 1){ getFlowInitSwps() } @@ -361,7 +363,7 @@ watch(() => props.options,(val:any) => { */ provide(constFormBtnEvent, (obj: any) => { emits('btnClick', obj.key) - // xz + console.log("按钮组件事件-----2-------->",obj.key) if ([3, 4, 5].includes(props.type)) { return ElMessage.error('当前模式不能提交表单') } @@ -385,6 +387,7 @@ provide(constFormBtnEvent, (obj: any) => { saveDraftAgainSend() break case 'afreshSubmit': //重新提交流程 + appAfreshSubmit() break case 'draftSubmit': //草稿提交审批 @@ -398,6 +401,57 @@ provide(constFormBtnEvent, (obj: any) => { }) /** @ 作者: 秦东 +@ 时间: 2024-06-13 11:11:13 +@ 功能: app重新提交表单 +*/ +const appAfreshSubmit = (params = {}) => { + let addUrl = props.formData.config?.addUrl || props.addUrl + console.log("自定义App提交表单", props.addUrl) + if (props.isSearch || !addUrl || loading.value) { + if (!props.isSearch && !addUrl) { + console.error( + new Error('请在表单设计处配置接口事件url或选择数据源或设置props') + ) + } + return + } + validate((valid: boolean, fields: any) => { + if (valid) { + const formatParams = Object.assign({}, fields, params) + let submitParams + const beforeSubmit = props.formData.events?.beforeSubmit + if (beforeSubmit) { + if (typeof beforeSubmit === 'function') { + submitParams = beforeSubmit(formatParams, route) + } else { + submitParams = formatResult(formatParams, beforeSubmit) + } + } + if (props.beforeSubmit && typeof props.beforeSubmit === 'string') { + submitParams = formatResult(formatParams, props.beforeSubmit) + } else if (typeof props.beforeSubmit === 'function') { + submitParams = props.beforeSubmit(formatParams, route) + } + if (submitParams === false) { + return + } + formatParams.versionId=props.versionId + formatParams.appKey=props.groupid + formatParams.status=1 + formatParams.flowList=json2string(flowMap.value) + + console.log("submitParams--111->",submitParams ) + console.log("formatParams--111->",formatParams) + afreshAppSubmit(submitParams??formatParams) + .then((data:any)=>{ + console.log("app重新提交表单--112221->",data) + emits("closePage") + }) + } + }) +} +/** +@ 作者: 秦东 @ 时间: 2024-06-10 10:37:30 @ 功能: 再次保存草稿箱 */ @@ -435,12 +489,14 @@ const saveDraftAgainSend = (params = {}) => { formatParams.versionId=props.versionId formatParams.appKey=props.groupid formatParams.status=1 + - console.log("submitParams--111->",submitParams ) - console.log("formatParams--111->",formatParams) + console.log("submitParams--111221->",submitParams ) + console.log("formatParams--1112222->",formatParams) saveDraftAgain(submitParams??formatParams) .then((data:any)=>{ - console.log("提交草稿数据--111->",data) + console.log("提交草稿数据--112221->",data) + emits("closePage") }) }else{ afterSubmit('validate', fields) @@ -678,9 +734,12 @@ const appFormSubmit = (params = {}) => { .then((data:any)=>{ console.log("流程提交成功--------1---------->",data) }) + .finally(() =>{ + afterSubmit('success', data) + }) }) } - afterSubmit('success', data) + }) .catch(res => { afterSubmit('fail', res) @@ -758,7 +817,14 @@ const getValue = (filter?: boolean) => { return model.value } } +/** +@ 作者: 秦东 +@ 时间: 2024-06-13 16:06:26 +@ 功能: 关闭抽屉 +*/ +const closePage = () =>{ +} /** @ 作者: 秦东 @ 时间: 2024-06-06 13:18:58 @@ -923,8 +989,9 @@ const changeKeyVal = (key:any,val:any,type:any,attribute:any) => { }) } } + console.log("isUpdateFlowChart",isUpdateFlowChart) //更新工作流图 - if(isUpdateFlowChart){ + if(isUpdateFlowChart && gainFlowChart.id !=0){ flowLoading.value = true //获取工作流不进图 gainFlowChart.conditionList=flowFactor @@ -950,7 +1017,7 @@ defineExpose({ validate, resetFields, appFormSubmit, - + closePage, // getData, //功能待定 // anewSubmit, // saveDraftPage, diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 176d8172e..ce14444b7 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -16,6 +16,8 @@ import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue' import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management' + + //引入组件 import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue' import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue' @@ -63,6 +65,9 @@ const props = withDefaults( versionid:() =>{ return "" }, + signCode:() =>{ + return "" + }, versiontitle:() =>{ return "" }, @@ -412,9 +417,10 @@ const submitApproval = (val:any) => { @ 功能: 撤回申请 */ const withdrawApplication = (val:any) => { - // console.log("撤回申请", val); + console.log("撤回申请", val); let sendInfo = { - id: val.masters_key, + // id: val.masters_key, + id: val.runFlowId } retractRunWorkFlow(sendInfo) .then((data)=>{ @@ -580,6 +586,7 @@ const editFormSendFlow = (val:any) => { diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue index 18e1b0134..50025b3ae 100644 --- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue +++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue @@ -5,6 +5,7 @@ -->