diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts
index cbbf48561..c2736450a 100644
--- a/src/api/DesignForm/requestapi.ts
+++ b/src/api/DesignForm/requestapi.ts
@@ -488,3 +488,43 @@ export function appJwtPower(data: any) {
 		data: data
 	});
 }
+//获取执行流程
+export function gainRunFlowStart(data: any) {
+	return request({
+		url: '/systemapi/task_management/gainRunFlowStart',
+		method: 'post',
+		data: data
+	});
+}
+//获取App任务
+export function gainAppTaskList(data: any) {
+	return request({
+		url: '/systemapi/task_flow/gainAppTaskList',
+		method: 'post',
+		data: data
+	});
+}
+//获取App任务
+export function gainAppAllTaskList(data: any) {
+	return request({
+		url: '/systemapi/task_flow/gainAppAllTaskList',
+		method: 'post',
+		data: data
+	});
+}
+//获取App任务
+export function editTaskAppInfo(data: any) {
+	return request({
+		url: '/systemapi/task_flow/editTaskAppInfo',
+		method: 'post',
+		data: data
+	});
+}
+//再次保存草稿箱内容
+export function saveDraftAgain(data: any) {
+	return request({
+		url: '/systemapi/task_flow/saveDraftAgain',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/api/DesignForm/utils.ts b/src/api/DesignForm/utils.ts
index d141c7039..7772d815e 100644
--- a/src/api/DesignForm/utils.ts
+++ b/src/api/DesignForm/utils.ts
@@ -100,7 +100,7 @@ export const onChange =
   '}'
 
 // provide 方法定义的key
-const prefix = 'AK'
+const prefix = 'GK'
 export const constControlChange = prefix + 'ControlChange' // 表单组件改变事件
 export const constSetFormOptions = prefix + 'SetFormOptions' // 使用setOptions设置下拉值
 export const constGetControlByName = prefix + 'GetControlByName' // 根据name从formData.list查找数据
diff --git a/src/api/taskapi/management.ts b/src/api/taskapi/management.ts
index 4ee73418a..7213dc2c9 100644
--- a/src/api/taskapi/management.ts
+++ b/src/api/taskapi/management.ts
@@ -182,3 +182,13 @@ export function gainSetUpMsg(data?:any){
 		data: data
 	});
 }
+
+
+//自定义App表单新增记录
+export function createAppTask(data?:any){
+	return request({
+		url: '/systemapi/task_management/createAppTask',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
new file mode 100644
index 000000000..12bb0293d
--- /dev/null
+++ b/src/components/DesignForm/app/formPage.vue
@@ -0,0 +1,1019 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-06-03 13:43:43
+@ 备注: 表格
+-->
+<script lang='ts' setup>
+import '@/assets/scss/element-var.scss'
+import '@/assets/scss/index.scss'
+import { FormData,FormList,FormDataStyle } from '@/api/DesignForm/types'
+import { useRoute, useRouter } from 'vue-router'
+import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types'
+import {
+    constGetControlByName,
+    constSetFormOptions,
+    constFormBtnEvent,
+    constControlChange,
+    constFormProps,
+    appendOrRemoveStyle
+} 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 { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const'
+import { jsonParseStringify } from '@/utils/DesignForm'
+//通用提交
+import { currencyFormApiSubmit,realTimeUpdateFlow,createAppTask } from '@/api/taskapi/management'
+
+import FormGroup from '@/components/DesignForm/public/form/formGroup.vue'
+import FlowStep from '@/views/taskplatform/taskmanagement/flowStep.vue'
+
+const props = withDefaults(
+	defineProps<{
+		formData: FormData
+		type?: number // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+		numrun?: number	//1：获取；非1：不变
+		disabled?: boolean // 禁用表单提交
+		requestUrl?: string // 编辑数据请求url
+		beforeRequest?: Function // 请求编辑数据前参数处理方法，可对请求参数处理
+		afterResponse?: Function | string // 请求数据加载完成后数据处理方法，可对返回数据处理
+		addUrl?: string // 表单数据新增提交保存url
+		editUrl?: string // 表单数据修改保存提交url
+		beforeSubmit?: Function | string // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
+		afterSubmit?: Function // 表单提交后，默认提示提交结果，可return false阻止提示
+		closeAppSubmit?: Function	//关闭拉窗
+		changeKeyVal?: Function //监听表单值该表
+		anewSubmit?: Function	//重新提交表单
+		saveDraftPage?: Function	//保存草稿
+		saveEditFormInfo?: Function //保存草稿  只改表单不操作流程
+		sendDraftSubmit?: Function //草稿提交审批
+		submitEdit?: Function //提交修改数据申请
+		value?: { [key: string]: any } // 表单初始值，同setValue
+		options?: { [key: string]: any } // 表单组件选项，同setOptions
+		dict?: object // 固定匹配的字典
+		isSearch?: boolean // 列表里作为筛选使用
+		isWorkFlow?: number //
+		flowkey?: string //
+		groupid?: string //
+		signCode?: string //
+		versionId?: string //
+		mastesformjson?: string //
+	}>(),
+	{
+		type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+		numrun:2,
+		formData: () => {
+			return {
+				list: [],
+				form: {},
+				config: {
+					style:''
+				},
+				styles:{
+					divStyle:{},
+					labelStyle:{},
+					inputStyle:{}
+				}
+			}
+		},
+		dict: () => {
+			return {}
+		},
+		isSearch: false,
+		issave:{
+			type:Boolean,
+			default:true
+		},
+		isWorkFlow:2,
+		flowkey:"",
+		groupid:"",
+		signCode:"",
+		mastesformjson:"",
+	}
+)
+
+const emits = defineEmits<{
+	(e: 'btnClick', type: string): void
+	(e: 'change', val: any): void // 表单组件值发生变化时
+	(e: 'update:issave', type: boolean): void
+}>()
+
+const route = useRoute()
+const router = useRouter()
+const loading = ref(false)
+//工作流相关
+const flowLoading = ref(false) //loading
+const flowFactor = reactive<conditionInfo[]>([])	//表单组件
+const flowMap = ref<any[]>();			//工作流
+const nextStep = ref<number>(0);
+const currentProgress  = ref<number>(1);
+const nodeKey = ref<string>('');
+const ruleForm = ref();	//表单
+//获取工作流条件
+const gainFlowChart = reactive<nodeFlow>({
+	id:props.flowkey
+})
+const nodelUserList = reactive<nodelPeoples[]>([])
+
+let timer = 0
+let eventName = ''
+let getValueEvent = ''
+
+const dictForm = computed(() => {
+    const storage = window.localStorage.getItem('akFormDict')
+    let storageDict = {}
+    if (storage) {
+      	storageDict = JSON.parse(storage)
+    }
+    // 全局的、当前表单配置的以及接口返回的
+    return Object.assign({}, storageDict, props.dict, resultDict.value)
+})
+// 表单参数
+const formProps = computed(() => {
+    return {
+		model: model.value,
+		type: props.type,
+		hideField: props.formData.config?.hideField as [],
+		showColon: props.formData.form.showColon,
+		dict: dictForm.value
+    }
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:47:53
+@ 功能: 重置表单
+*/
+const resetFields = () => {
+	if(ruleForm.value){
+		ruleForm.value.resetFields()
+	}
+    
+}
+provide(constFormProps, formProps)
+// 设置全局事件结束
+const resultDict = ref({})
+// 处理表单值开始
+const model = ref<any>({})
+
+//监听是否为流程表单
+watch(()=>props.isWorkFlow,(val:number)=>{
+	console.log("获取流程----->",val)
+	if(val == 1){
+		getFlowInitSwps()
+	}
+	
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-10 10:21:15
+@ 功能: 获取流程
+*/
+const getFlowInitSwps = () => {
+	gainRunFlowStart({id:props.flowkey})
+		.then(({data})=>{
+			console.log("获取流程",data)
+			flowMap.value = data.flowList
+			nextStep.value = data.nextStep
+			currentProgress.value = data.Step
+			gainFlowChart.id = props.flowkey
+			flowLoading.value = false;
+		})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 11:19:30
+@ 功能:  提供一个方法，用于根据name从formData.list里查找数据
+*/
+const getNameForEach = (data: any, name: string) => {
+	let temp = {}
+	for (const key in data) {
+		const dataKey = data[key]
+		if (dataKey.name === name) {
+			return dataKey
+		}
+		if (['grid', 'tabs'].includes(dataKey.type)) {
+			dataKey.columns.forEach((co: any) => {
+				temp = getNameForEach(co.list, name)
+			})
+		}
+		if (['card', 'div'].includes(dataKey.type)) {
+			temp = getNameForEach(dataKey.list, name)
+		}
+	}
+	return temp
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 09:31:40
+@ 功能: 注册win事件
+*/
+const setWindowEvent = (bool?: boolean) => {
+	if (props.formData.list.length > 0) {
+		const formName = props.formData.form?.name
+		if (!formName) {
+			return
+		}
+		eventName = `get${formName}ControlByName`
+		getValueEvent = `get${formName}ValueByName`
+		
+		if (formName && (!window[eventName as any] || !bool)) {
+			// 根据name获取当前数据项
+			// @ts-ignore
+			window[eventName] = (name: string) => {
+				return getNameForEach(props.formData.list, name)
+			}
+			// 根据name获取当前项的值
+			// @ts-ignore
+			window[getValueEvent] = (name: string) => {
+				return model.value[name]
+			}
+		}
+		
+	}
+}
+setWindowEvent()
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 13:16:50
+@ 功能: 检测表单是否有变动
+*/
+watch(() => props.formData,() => {
+	emits('update:issave', false)
+},{ deep: true })
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 13:20:01
+@ 功能: 监听表单样式变化
+*/
+watch(() => props.formData.config,()=>{
+	if (timer < 2) {
+		setWindowEvent() // 简单判断下，这里不是每次都更新
+	}
+	timer++
+	appendRemoveStyle(true) // 更新样式
+},{ deep: true });
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 13:32:57
+@ 功能: 追加移除style样式
+*/
+const appendRemoveStyle = (type?: boolean) => {
+	try {
+		const {
+			config:{ style }
+		} = props.formData
+		appendOrRemoveStyle('formStyle', style || '', type)
+	} catch (e) {
+      /* empty */
+    }
+}
+const getControlByName = (name: string) => {
+    return getNameForEach(props.formData.list, name)
+}
+provide(constGetControlByName, getControlByName)
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:14:24
+@ 功能: DOM挂载完毕时执行
+*/
+onMounted(() => {
+	getInitModel()
+	nextTick(() => {
+		gainFlowChart.id = props.flowkey
+		appendRemoveStyle(true)
+		if(props.isWorkFlow==1){
+			getFlowInitSwps()
+		}
+		
+	})
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:17:05
+@ 功能: 获取表单初始model
+*/
+const getInitModel = () => {
+	const obj = {}
+    forEachGetFormModel(props.formData.list, obj)
+	// console.log("obj===>",obj)
+    model.value = obj
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:18:03
+@ 功能: 从表单数据里提取表单所需的model
+*/
+const forEachGetFormModel = (list: FormList[], obj: any) => {
+	list.forEach((item: any) => {
+		if (['table', 'flex'].includes(item.type)) {
+			obj[item.name] = jsonParseStringify(item.tableData)
+		} else if (['grid', 'tabs'].includes(item.type)) {
+			item.columns.forEach((col: any) => {
+				forEachGetFormModel(col.list, obj)
+			})
+		} else if (['card', 'div'].includes(item.type)) {
+			forEachGetFormModel(item.list, obj)
+		} else {
+			const excludeType = ['title', 'divider', 'txt', 'button']
+			if (excludeType.indexOf(item.type) === -1) {
+				obj[item.name] = jsonParseStringify(item.control.modelValue)
+			}
+		}
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:15:55
+@ 功能: 销毁完毕
+*/
+onUnmounted(() => {
+	if (eventName) {
+		window[eventName] = ''
+	}
+	resetFields()
+	appendRemoveStyle()
+	
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:45:25
+@ 功能: 对表单选择项快速设置
+*/
+const setFormOptions = ref({})
+provide(constSetFormOptions, setFormOptions)
+const setOptions = (obj: { [key: string]: string[] }) => {
+    setFormOptions.value = obj
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:46:13
+@ 功能: 表单options设置
+*/
+watch(() => props.options,(val:any) => {
+	val && setOptions(vval)
+})
+
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:50:44
+@ 功能: 按钮组件事件
+*/
+provide(constFormBtnEvent, (obj: any) => {
+	emits('btnClick', obj.key)
+	//                                                                 xz
+	if ([3, 4, 5].includes(props.type)) {
+      	return ElMessage.error('当前模式不能提交表单')
+    }
+	switch (obj.key) {
+		case 'submit':			//新增提交
+			appFormSubmit();
+			break
+		case 'reset':
+			resetFields() // 重置表单
+			break
+		case 'cancel': // 取消返回，
+			let notReturn
+			if (typeof props.closeAppSubmit === 'function') {
+				notReturn = props.closeAppSubmit()
+			}
+			break
+		case 'saveDraft': //保存草稿		只保存表单不操作流程
+			saveDraft()
+			break
+		case 'saveEditDraft':	//修改草稿箱数据后，再次保存草稿箱
+			saveDraftAgainSend()
+			break
+		case 'afreshSubmit':	//重新提交流程
+			break
+		case 'draftSubmit':	//草稿提交审批
+			
+			break
+		case 'submitEdit': //申请修改
+			
+			break
+		default:
+			break
+	}
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-10 10:37:30
+@ 功能: 再次保存草稿箱
+*/
+const saveDraftAgainSend = (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
+
+			console.log("submitParams--111->",submitParams )
+			console.log("formatParams--111->",formatParams)
+			saveDraftAgain(submitParams??formatParams)
+				.then((data:any)=>{
+					console.log("提交草稿数据--111->",data)
+				})
+		}else{
+			afterSubmit('validate', fields)
+		}
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-06 15:51:16
+@ 功能: 保存草稿箱
+*/
+const saveDraft = (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
+			
+
+			createAppTask(submitParams ?? formatParams)
+				.then((data:any) => {
+					console.log("formatParams--111->",data)
+					
+					if(props.isWorkFlow == 1){
+						nextTick(() => {
+							let sendInfo ={
+								id:data.data.uuid,
+								flowList:flowMap.value,
+								state:1
+							}
+							startRunFlow(sendInfo)
+								.then((data:any)=>{
+									console.log("流程提交成功--------1---------->",data)
+								})
+						})
+					}
+					afterSubmit('success', data)
+				})
+				.catch(res => {
+					afterSubmit('fail', res)
+				})
+
+		}else{
+			afterSubmit('validate', fields)
+		}
+
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 14:59:31
+@ 功能: 表单组件值改变事件 tProp为子表格相关
+*/
+provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
+	let fieldVal =  {}
+	for(let i in model.value){
+		if(i == key){
+			fieldVal[i] = typeof value=="number"?value.toString():value;
+		}else{
+			fieldVal[i] = typeof model.value[i]=="number"?model.value[i].toString():model.value[i];
+		}
+		console.log("监听表单--constControlChange----------1--------->",i,model.value[i])
+	}
+	//判断是否进行计算
+	if(type == "digitpage"){
+			let sendInfo = {
+				"fieldKey":key,
+				"mathsFornula":props.formData.config,
+				"keyVal":fieldVal
+			}
+			console.log("sendInfoe-->",sendInfo)
+			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
+				.then((data:any)=>{
+					// console.log("结果-->",data)
+					let formatRes: any = data.data
+					// 比较适用通用表单，保存在服务端
+					const afterResponse = props.formData.events?.afterResponse
+					
+					if (typeof afterResponse === 'string' && afterResponse) {
+						formatRes = formatResult(result, afterResponse)
+					} else if (typeof afterResponse === 'function') {
+						formatRes = afterResponse(result) ?? result
+					}
+					// 比较适用于导出vue文件
+					if (typeof props.afterResponse === 'string' && props.afterResponse) {
+						formatRes = formatResult(result, props.afterResponse)
+					} else if (typeof props.afterResponse === 'function') {
+						formatRes = props.afterResponse(result) ?? result
+					}
+					if (formatRes === false) {
+						return
+					}
+					// console.log("停止数据请求--->",formatRes)
+					setValue(formatRes.result || formatRes)
+					nextTick(() => {
+						// 将dict保存，可用于从接口中设置表单组件options。
+						if (formatRes.dict && Object.keys(formatRes.dict).length) {
+							resultDict.value = formatRes.dict
+						}
+					})
+				})
+	}
+	if (typeof props.changeKeyVal === 'function') {
+		props.changeKeyVal(key, value,type,attribute)
+	}
+	if(props.isWorkFlow == 1){
+		changeKeyVal(key, value,type,attribute) //值改变时，检测一下有没有触发流程分支条件
+	}
+	
+    if (key) {
+		if (!tProp) {
+			// 表格和弹性布局不是这里更新，只触change
+			model.value[key] = value
+		}
+		// 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
+		if (props.formData.events?.change) {
+			model.value = props.formData.events.change(key, model.value)
+		}
+		const onFormChange = props.formData.events?.change
+		if (onFormChange) {
+			if (typeof onFormChange === 'function') {
+				model.value = onFormChange(key, model.value)
+			} else {
+				model.value = formChangeValue(key, model.value, onFormChange)
+			}
+		}
+		// 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
+		emits('change', { key, value, model: model.value, data, tProp })
+    }
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-05 15:03:25
+@ 功能:  对表单设置初始值
+*/
+const setValue = (obj: { [key: string]: any }, filter?: boolean) => {
+    // 分两种，false时将obj所有值合并到model，当obj有某些值不存于表单中，也会合并到model，当提交表单也会提交此值
+    // true则过滤没用的值，即存在当前表单的才合并
+    if (filter) {
+		for (const key in obj) {
+			if (model.value[key] !== undefined) {
+				model.value[key] = obj[key]
+			}
+		}
+    } else {
+      	model.value = Object.assign({}, model.value, jsonParseStringify(obj)) // 防止列表直接使用set方法对弹窗表单编辑，当重置表单时当前行数据被清空
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-06 08:23:50
+@ 功能: 自定义App提交表单
+*/
+const appFormSubmit = (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)
+			console.log("params--->",params)
+			console.log("fields--->",fields)
+			console.log("自定义A2pp提交表单", formatParams)
+			let submitParams
+			const beforeSubmit = props.formData.events?.beforeSubmit
+			console.log("beforeSubmit--->", 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=2
+			console.log("提交表单-----------1------------>", submitParams)
+			console.log("提交表单-----------2------------>", formatParams)
+
+			createAppTask(submitParams ?? formatParams)
+				.then((data:any) => {
+					console.log("formatParams--111->",data)
+					
+					if(props.isWorkFlow == 1){
+						nextTick(() => {
+							let sendInfo ={
+								id:data.data.uuid,
+								flowList:flowMap.value,
+								state:3
+							}
+							startRunFlow(sendInfo)
+								.then((data:any)=>{
+									console.log("流程提交成功--------1---------->",data)
+								})
+						})
+					}
+					afterSubmit('success', data)
+				})
+				.catch(res => {
+					afterSubmit('fail', res)
+				})
+
+		}else{
+			afterSubmit('validate', fields)
+		}
+
+	})
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-06 09:47:51
+@ 功能: 不管成功失败，有事件时都需要执行回调
+*/
+const afterSubmit = (type: string, res: any) => {
+	const afterSubmit = props.formData.events?.afterSubmit
+	let notReturn
+	if (typeof afterSubmit === 'function') {
+      	notReturn = afterSubmit(type, res)
+    } else if (typeof props.afterSubmit === 'function') {
+      	notReturn = props.afterSubmit(type, res)
+		//   console.log("notReturn--123456->",props.afterSubmit)
+    }
+	loading.value = false
+	if (notReturn === false) {
+		// 有返回false时则不提示
+		return
+    }
+    if (type === 'success') {
+      	ElMessage.success(res.msg || '保存成功！')
+    } else if (type === 'fail') {
+      	ElMessage.error(res.message || '保存失败！')
+    }
+	//不管结果，重置表单，防再次打开时保留上一次的值
+	resetFields()
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-06 09:14:16
+@ 功能: 表单检验方法
+*/
+const validate = (callback: any) => {
+	ruleForm.value.validate((valid: boolean, fields: any) => {
+		let fieldValue = fields
+		if (valid) {
+			// 校验通过，返回当前表单的值
+			fieldValue = getValue()
+		}
+		callback(valid, fieldValue)
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-06 09:17:29
+@ 功能: 提供一个取值的方法
+*/
+const getValue = (filter?: boolean) => {
+	if (filter) {
+		const obj: any = {}
+		for (const key in model.value) {
+			// eslint-disable-next-line no-prototype-builtins
+			if (model.value.hasOwnProperty(key)) {
+				const val = (model.value as any)[key]
+				if (!/^\s*$/.test(val)) {
+					obj[key] = val
+				}
+			}
+		}
+		return obj
+    } else {
+		// console.log("getValue--->model-value->",model.value)
+      	return model.value
+    }
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-06 13:18:58
+@ 功能: 表单组件分析
+*/
+const changeKeyVal = (key:any,val:any,type:any,attribute:any) => {
+	let unitsVal = val
+	let isUpdateFlowChart = false
+	//单选，多选，下拉菜单
+	if(notAsA_BasisForJudgment.indexOf(type) === -1){
+		let isWrite = true
+		flowFactor.forEach((item:any)=>{
+			if(item.factorid == key){
+				isWrite = false
+				
+				item.type=3
+				if(type == "checkbox"){
+					item.isCheckbox = true
+					item.answers = val.map(String)
+				}else{
+					item.isCheckbox = false
+					item.oneanswer = val.toString()
+				}
+				if(notAsA_BasisForJudgment.indexOf(type) === -1){
+					isUpdateFlowChart = true
+				}
+			}
+		})
+		if(isWrite){
+			if(type == "checkbox"){
+				flowFactor.push({
+					factorid:key,
+					type:3,
+					isCheckbox:true,
+					answers:val.map(String)
+				})
+			}else{
+				flowFactor.push({
+					factorid:key,
+					type:3,
+					isCheckbox:false,
+					oneanswer:val.toString()
+				})
+			}
+			isUpdateFlowChart = true
+		}
+		// console.log("改变表单值--flowFactor--->",flowFactor)
+		
+	}
+	//时间类空间附加判断条件
+	if(timeControl.indexOf(type) > -1 || fixedValueControl.indexOf(type) > -1 || type == "input"){
+		let addNewTime = true		//判断是否新增
+		flowFactor.forEach((item:any)=>{
+			// console.log("改变表单值--flowFactor--5->",item.type)
+			if(item.type == 2){
+				addNewTime = false
+				// console.log("改变表单值--flowFactor--5====1->",item.type)
+				// console.log("改变表单值--flowFactor--5====3->",item.customFields,item.customFields.length)
+				if(item.customFields && item.customFields.length > 0){
+					// console.log("改变表单值--flowFactor--5====2->",item.customFields)
+					let sunNewAdd = true
+					item.customFields.forEach((sunItem:any)=>{
+						// console.log("改变表单值--flowFactor-4->",sunItem.wordfield , key,sunItem.wordfield == key)
+						if(sunItem.wordfield == key){
+							sunNewAdd = false
+							isUpdateFlowChart = true
+							if(timeEquation.indexOf(attribute) === -1){			//非区间性时间
+								sunItem.leftval = val.toString()
+							}else{ //区间性时间
+								if(Array.isArray(val)){
+									if(val.length >= 2){
+										sunItem.leftval =  val[0].toString()
+										sunItem.rightval = val[val.length - 1].toString()
+									}
+								}
+							}
+						}
+					})
+					if(sunNewAdd){
+						isUpdateFlowChart = true
+						if(timeEquation.indexOf(attribute) === -1){//非区间性时间
+							let customFieldInfo = {
+								wordfield: key,
+								optType: "1",
+								leftval: val.toString()
+							}
+							item.customFields.push(customFieldInfo)
+						}else{ //区间性时间
+							if(Array.isArray(val)){
+								if(val.length >= 2){
+									let customFieldInfo = {
+										wordfield: key,
+										optType: "6",
+										leftval: val[0].toString(),
+										leftoptType:"3",
+										rightoptType:"3",
+										rightval:val[val.length - 1].toString()
+									}
+									item.customFields.push(customFieldInfo)
+								}
+							}
+						}
+					}
+				}
+			}
+		})
+		
+		if(addNewTime){	//新增自定义类数据判断
+			isUpdateFlowChart = true
+			if(timeEquation.indexOf(attribute) === -1){			//非区间性时间
+				let customFieldInfo = {
+					wordfield: key,
+					optType: "1",
+					leftval: val.toString()
+				}
+				let condInfo = {
+					factorid:"customFields",
+					type:2,
+					isCheckbox:false,
+					customFields:[customFieldInfo]
+				}
+				flowFactor.push(condInfo)
+			}else{		//区间性时间
+				if(Array.isArray(val)){
+					
+					if(val.length >= 2){
+						let customFieldInfo = {
+							wordfield: key,
+							optType: "6",
+							leftval: val[0].toString(),
+							leftoptType:"3",
+							rightoptType:"3",
+							rightval:val[val.length - 1].toString()
+						}
+						let condInfo = {
+							factorid:"customFields",
+							type:2,
+							isCheckbox:false,
+							customFields:[customFieldInfo]
+						}
+						flowFactor.push(condInfo)
+					}
+				}
+			}
+			
+		}
+	}
+	//操作人
+	if(asAnApprovalActionControl.indexOf(type) > -1){
+		isUpdateFlowChart = true
+		let isWriteUs = true
+		nodelUserList.forEach((item:any)=>{
+			if(item.factorid == key){
+				isWriteUs = false
+				item.userList = val
+			}
+		})
+		if(isWriteUs){
+			nodelUserList.push({
+				factorid:key,
+				userList:val
+			})
+		}
+	}
+	//更新工作流图
+	if(isUpdateFlowChart){
+		flowLoading.value = true
+		//获取工作流不进图
+		gainFlowChart.conditionList=flowFactor
+		gainFlowChart.nodelPeople=nodelUserList
+		gainFlowChart.oldFlow = flowMap
+		// console.log("获取工作流不进图--gainFlowChart--->",gainFlowChart)
+		realTimeUpdateFlow(gainFlowChart)
+			.then((data:any) =>{
+				// console.log("获取工作流不进图-new-->",data)
+				flowMap.value = data.data.flowList
+				nextStep.value = data.data.nextStep;
+				currentProgress.value  = data.data.Step;
+				nodeKey.value = data.data.nodeKey;
+				// // console.log("获取工作流不进图-1-->",flowMap.value)
+				flowLoading.value = false
+			})
+	}
+}
+defineExpose({
+    setOptions,
+    setValue,
+    getValue,
+    validate,
+    resetFields,
+	appFormSubmit,
+
+    // getData,	//功能待定
+	// anewSubmit,
+	// saveDraftPage,
+	// saveEditFormInfo,
+	// getEditData,
+	// submitEdit
+})
+</script>
+<template>
+	<div class="common-layout">
+		<el-container v-if="props.isWorkFlow==1">
+			<el-main class="formMainBox">
+				<el-form
+					v-bind="formData.form"
+					ref="ruleForm"
+					:model="model as any"
+					:disabled="disabled || type === 3"
+					class="add-form"
+					:class="{
+						'design-form': type === 5,
+						'detail-form': type === 3 || type === 4 || type === 1
+					}"
+				>
+
+					<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" />
+					
+					<slot></slot>
+				</el-form>
+			
+			</el-main>
+			<el-aside class="flowBox">
+				<el-text size="large">审批流程</el-text>
+				<FlowStep v-loading="flowLoading" v-model:flow-map="flowMap" :next-step="nextStep" :current-progress="currentProgress" :node-key="nodeKey" />
+			</el-aside>
+		</el-container>
+		<div v-else>
+		
+			<el-form
+				v-bind="formData.form"
+				ref="ruleForm"
+				:model="model as any"
+				:disabled="disabled || type === 3"
+				class="add-form"
+				:class="{
+					'design-form': type === 5,
+					'detail-form': type === 3 || type === 4 || type === 1
+				}"
+			>
+
+				<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" />
+				
+				<slot></slot>
+			</el-form>
+		</div>
+  	</div>
+</template>
+<style  lang='scss' scoped>
+.formMainBox{
+	padding: 0;
+}
+.flowBox{
+	width: 350px;
+	border-left: 1px solid #4f4f4f;
+	padding: 0 15px;
+}
+</style>
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
new file mode 100644
index 000000000..faaa24c2b
--- /dev/null
+++ b/src/components/DesignForm/app/index.vue
@@ -0,0 +1,14 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-06-03 13:23:59
+@ 备注: App表单列表
+-->
+<script lang='ts' setup>
+
+</script>
+<template>
+	<div>1</div>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index decf8634d..964f27e56 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -298,7 +298,7 @@ onUnmounted(() => {
     store.setControlAttr({})
 })
 onMounted(()=>{
-	console.log('formGroup onMounted',dataList,props.tableinfo)
+	console.log('formGroup onMounted',props.data,dataList.value,props.tableinfo)
 })
 
 const getFormItemLableStyle = (ele: any) => {
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 09e535875..a6372d014 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -11,6 +11,7 @@ declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default']
     AddNode: typeof import('./../components/workflow/addNode.vue')['default']
+    App: typeof import('./../components/DesignForm/app/index.vue')['default']
     AppMenuSvgPage: typeof import('./../components/IconSelect/appMenuSvgPage.vue')['default']
     ApproverDrawer: typeof import('./../components/workflow/drwer/approverDrawer.vue')['default']
     BianXian: typeof import('./../components/DesignForm/designLayout/bianXian.vue')['default']
@@ -35,7 +36,6 @@ declare module '@vue/runtime-core' {
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -111,6 +111,7 @@ declare module '@vue/runtime-core' {
     FormGroup: typeof import('./../components/DesignForm/public/form/formGroup.vue')['default']
     FormGroup1: typeof import('./../components/DesignForm/public/form/formGroup1.vue')['default']
     FormItem: typeof import('./../components/DesignForm/public/form/formItem.vue')['default']
+    FormPage: typeof import('./../components/DesignForm/app/formPage.vue')['default']
     FormPageCont: typeof import('./../components/DesignForm/tableListPage/formPageCont.vue')['default']
     FormVersion: typeof import('./../components/DesignForm/formVersion.vue')['default']
     FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default']
@@ -128,9 +129,12 @@ declare module '@vue/runtime-core' {
     IEpDownload: typeof import('~icons/ep/download')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+<<<<<<< HEAD
     IEpMinus: typeof import('~icons/ep/minus')['default']
     IEpOperation: typeof import('~icons/ep/operation')['default']
     IEpPicture: typeof import('~icons/ep/picture')['default']
+=======
+>>>>>>> v8_master
     IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpPosition: typeof import('~icons/ep/position')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
diff --git a/src/views/sysworkflow/codepage/index.ts b/src/views/sysworkflow/codepage/index.ts
index da5356626..403d875f3 100644
--- a/src/views/sysworkflow/codepage/index.ts
+++ b/src/views/sysworkflow/codepage/index.ts
@@ -3,6 +3,8 @@ import tableList from '@/components/DesignForm/public/form/components/list.vue'
 import flow from '@/components/DesignForm/public/form/components/flow.vue'
 import Screen from '@/components/DesignForm/public/form/components/screen.vue'
 import akPageList from '@/components/DesignForm/tableListPage/index.vue'
+import AppPageList from '@/components/DesignForm/app/index.vue'
+import AppFormPage from '@/components/DesignForm/app/formPage.vue'
 
 export default (app: any) => {
   app.component('AkForm', formDesign)
@@ -10,4 +12,6 @@ export default (app: any) => {
   app.component('AkFlow', flow)
   app.component('AkScreen', Screen)
 	app.component('AkPageList', akPageList)
+	app.component('AppPageList', AppPageList)
+	app.component('AppFormPage', AppFormPage)
 }
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index 68b02887e..b7a402796 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -250,6 +250,11 @@ const fanyePage = (val: number) =>{
 	pageApp.value = val
 	getFormAppList()
 }
+
+
+const pickAppInfo = ref<customerFormCont>()
+const runIsOpen = ref(false)
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-29 16:13:16
@@ -258,6 +263,7 @@ const fanyePage = (val: number) =>{
 const lookAppList = (val:any) => {
 	let appPower = 0;
 	emits('getRongQiAttr')
+	pickAppInfo.value = val
 	appJwtPower({id:val.signCodeStr,types:1})
 		.then(({data})=>{
 			console.log("打开应用------>data:",data)
@@ -273,7 +279,7 @@ const lookAppList = (val:any) => {
 		})
 }
 
-const runIsOpen = ref(false)
+
 
 
 </script>
@@ -333,7 +339,7 @@ const runIsOpen = ref(false)
 		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="props.drawerWith" v-model:form-key="formId" @refreshPage="refreshPage" />
 
 		<DesignAPPpage  v-model:is-show="appPageShow" v-model:form-key="appKey"  :group-key="props.groupId" :drawer-with="props.drawerWith"  @refreshPage="getFormAppList" />
-		<RunApplication v-model:run-is-open="runIsOpen" :drawer-with="props.drawerWith" @refreshPage="getFormAppList"/>
+		<RunApplication v-model:run-is-open="runIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" @refreshPage="getFormAppList"/>
 		<el-drawer
 			v-model="lookPageIsShow"
 			title="列表预览"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
index 887bce16e..3cf976928 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
@@ -88,7 +88,7 @@ const handleDrop = (
 	// console.log('树移动完毕后执行的操作=====2=======>',dropNode)
 	// console.log('树移动完毕后执行的操作=====3=======>',dropType)
 	// console.log('树移动完毕后执行的操作=====4=======>',ev)
-	return false;
+	// return false;
 	let sendCont = {
 		id:props.appCont.uuid,
 		menuTree:appMenuTree.value
@@ -290,6 +290,7 @@ const openAppPage = (val:any) =>{
 		:allow-drop="allowDrop"
 		:expand-on-click-node="true"
 		@node-drag-start="startDrop"
+		@node-drop="handleDrop"
 	>
 		<template #default="{ node, data }">
 		
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appSetUp/appDevOps.vue b/src/views/sysworkflow/lowcodepage/appPage/appSetUp/appDevOps.vue
index 42cc6f120..29f32684b 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appSetUp/appDevOps.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appSetUp/appDevOps.vue
@@ -27,7 +27,7 @@ const tableList = ref<any[]>([])
 onMounted(()=>{
 	gianAppFormTable({id:props.appCont.uuid})
 		.then((data:any)=>{
-			tableList.value = data.data
+			tableList.value = data.data.list
 		})
 })
 </script>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/index.vue b/src/views/sysworkflow/lowcodepage/runApp/index.vue
index 537503fa2..f37a5ed24 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/index.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/index.vue
@@ -4,7 +4,14 @@
 @ 备注: 运行自定义APP
 -->
 <script lang='ts' setup>
+import { appMenuTreeInfo,appSetInfo } from "@/api/date/type"
+import { gainAppEditPsge } from '@/api/DesignForm/requestapi'
 import { useUserStore } from "@/store/modules/user";
+
+//引入页面
+import  RegularPage  from "@/views/sysworkflow/lowcodepage/runApp/regularPage.vue"
+import  RunAppForm  from "@/views/sysworkflow/lowcodepage/runApp/runAppForm.vue"
+
 const props = defineProps({
 	drawerWith:{
 		type:Number,
@@ -13,9 +20,20 @@ const props = defineProps({
 	runIsOpen:{
 		type: Boolean,
 		default: false,
+	},
+	pickAppInfo:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
+const switchPAge = ref(1)
 const userStore = useUserStore();
+const emits = defineEmits(["update:runIsOpen","refreshPage"]);
+const menusTree = ref<appMenuTreeInfo[]>([])
+const pickAppMenu = ref("")
+const pickAppMenuSel = ref("")
 //应用基础配置
 const appCont = reactive<appSetInfo>({
 	appKey:"1",	
@@ -26,7 +44,72 @@ const appCont = reactive<appSetInfo>({
 	describe:""
 })
 
-const emits = defineEmits(["update:runIsOpen","refreshPage"]);
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-23 15:23:31
+@ 功能: 获取app信息
+*/
+const gainAppContent = () =>{
+	let sendInfo = {
+		id:props.pickAppInfo.signCodeStr
+	}
+	gainAppEditPsge(sendInfo)
+		.then((data)=>{
+			console.log("获取app信息---》",data)	
+			menusTree.value = data.data.menuTree
+			appCont.appKey = data.data.appKey;	
+			appCont.appName = data.data.appName;	
+			appCont.appSvg = data.data.appSvg;	
+			appCont.state = data.data.state;	
+			appCont.uuid = data.data.uuid;
+			let isIn = true;
+			data.data.menuTree.forEach((item)=>{
+				if(item.isLock == 1 && item.isMain == 1){
+					pickAppMenu.value = item;
+					isIn = false;
+					switchPAge.value = 1
+				}
+			})
+			if(isIn){
+				pickAppMenu.value = data.data.menuTree[0];
+				if (pickAppMenu.value.type == 2){
+					switchPAge.value = 2
+				}
+			}
+		})
+}
+watch(()=>props.runIsOpen,(val:boolean)=>{
+	if(val){
+		gainAppContent()
+	}
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-30 15:17:29
+@ 功能: 退出应用
+*/
+const closeRunApp = () => {
+	emits("update:runIsOpen",false)
+	emits("refreshPage")
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-30 15:32:05
+@ 功能: 打开页面
+*/
+const openAppPage = (val:appMenuTreeInfo) => {
+	console.log("打开页面---->",val.type,switchPAge.value)
+	if(val.type!=1){
+		if(val.isLock==1){
+			switchPAge.value = 1
+		}else{
+			switchPAge.value = 2
+		}
+		pickAppMenu.value = val
+	}
+	console.log("打开页面--2-->",val.type,switchPAge.value)
+	
+}
 </script>
 <template>
 	<div class="drawerClass">
@@ -42,43 +125,69 @@ const emits = defineEmits(["update:runIsOpen","refreshPage"]);
 							</el-space>
 						</div>
 						<div>
-							<!-- <el-dropdown>
+							<el-dropdown>
 								<el-avatar shape="square" :size="25" :src="userStore.avatar" />
 								<template #dropdown>
-									<table class="userTabel">
-										<tr>
-											<td rowspan="2"><el-avatar shape="square" :size="55" :src="userStore.avatar" /></td>
-											<td>{{ userStore.nickname }}({{ userStore.userInfoCont.number }})</td>
-										</tr>
-										<tr>
-											
-											<td>{{ userStore.userInfoCont.companyname }}/{{ userStore.userInfoCont.departmentname }}</td>
-										</tr>
-									</table>
+
+									<el-dropdown-item @click="editMenuName(data)">
+										<table class="userTabel">
+											<tr>
+												<td rowspan="2"><el-avatar shape="square" :size="55" :src="userStore.avatar" /></td>
+												<td>{{ userStore.nickname }}({{ userStore.userInfoCont.number }})</td>
+											</tr>
+											<tr>
+												
+												<td>{{ userStore.userInfoCont.companyname }}/{{ userStore.userInfoCont.departmentname }}</td>
+											</tr>
+										</table>
+									</el-dropdown-item>
+									<el-dropdown-item @click="closeRunApp()" divided>
+										<i class="fa fa-sign-out"></i>
+										<el-text class="mx-1" type="danger">退出</el-text>
+									</el-dropdown-item>
 								</template>
-							</el-dropdown> -->
-							<el-avatar shape="square" :size="25" :src="userStore.avatar" />
+							</el-dropdown>
+							<!-- <el-avatar shape="square" :size="25" :src="userStore.avatar" /> -->
 						</div>
 					</el-header>
 					<el-container>
 						<el-aside  class="asideBox">
 							<el-row>
 								<el-col :span="24" class="asideBoxSearch">
-									<el-input
-										v-model="input2"
-										style="width: 100%"
-										placeholder="搜索"
+									<el-tree-select
+										v-model="pickAppMenuSel"
+										:data="menusTree"
+										:render-after-expand="false"
 										:suffix-icon="Search"
+										clearable
 									/>
 								</el-col>
 							</el-row>
-
-
+							<el-tree
+								:data="menusTree"
+								default-expand-all
+								node-key="id"
+								:allow-drop="allowDrop"
+								:expand-on-click-node="true"
+								@node-drag-start="startDrop"
+							>
+								<template #default="{ node, data }">
+									<div class="appMenuTitle" @click="openAppPage(data)">
+										<el-space wrap>
+											<svg-icon  prefix="icon" :icon-class="data.svg"  />
+											<el-tooltip :content="node.label" placement="top" effect="dark">
+												<el-text class="w-120px mb-2" truncated >{{node.label}}</el-text>
+											</el-tooltip>
+										</el-space>
+									</div>
+								</template>
+							</el-tree>
 						</el-aside>
 						<el-main  class="mainBox">
-							<el-scrollbar class="scroBox">
-							{{ userStore }}
-							</el-scrollbar>
+							
+								<RegularPage v-if="switchPAge==1" :pick-app-menu="pickAppMenu" />
+								<RunAppForm v-else  :pick-app-menu="pickAppMenu" />
+							
 						</el-main>
 					</el-container>
 				</el-container>
@@ -127,7 +236,9 @@ const emits = defineEmits(["update:runIsOpen","refreshPage"]);
 		:deep(.el-tabs__header){
 			margin:0 0 1px 0;
 		}
-		
+		:deep .el-card__body{
+			padding: 0px 0;
+		}
 	}
 	.asideBox{
 		width:250px;
@@ -183,6 +294,10 @@ const emits = defineEmits(["update:runIsOpen","refreshPage"]);
 	}
 }
 .userTabel{
-	width:300px;
+	width:200px;
+	td {
+		padding: 0px 5px;
+	}
+	
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue b/src/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue
new file mode 100644
index 000000000..14e99d823
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue
@@ -0,0 +1,138 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-06-07 14:15:54
+@ 备注: 由草稿箱发起的编辑
+-->
+<script lang='ts' setup>
+import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton,editLookFormCont } from "@/utils/workflow/const";
+import {
+    json2string,
+    objToStringify,
+    string2json,
+    stringToObj
+} from '@/utils/DesignForm/form'
+import { haveCustomerFormVersion,generateFlow } from '@/api/taskapi/management'
+import { judgeSubmitCancel,startRunFlow,afreshRunFlow,onlyPublishFlow,gainEditFormFlowInfo,editTaskAppInfo } from '@/api/DesignForm/requestapi'
+
+
+const props = defineProps({
+	isOpen:{
+		type:Boolean,
+		default:false
+	},
+	drawerWidth:{
+		type:Number,
+		default:0
+	},
+	taskInfo:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+const emits = defineEmits(["update:isOpen","refreshFunction"]);
+const isShow =   computed({
+	get: () => props.isOpen,
+	set: (val) => {
+		emits("update:isOpen", val);
+	},
+});
+const formEl = ref()
+const flowLoading = ref(false)
+const tableForm  = ref(false)
+const formInfo = reactive({
+    formData: {
+      list: [],
+      form: {},
+      config: {}
+    },
+    dict: {},
+    formId: 25,
+    id: 1,
+    loading: true
+})
+const newLogAry = ref<any>("")
+const oldLogAry = ref<any>("")
+const newDataLen  = ref<number>(0);
+const logistrue = ref(false)
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 14:29:19
+@ 功能: 关闭
+*/
+const drawerBeforeClose = () => {
+	console.log("监听打开关闭",false)
+	emits("update:isOpen", false);
+	emits("refreshFunction")
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 14:59:34
+@ 功能: 监听页面开关状态
+*/
+watch(()=>props.isOpen,(val:Boolean)=>{
+	if(val){
+		formInfo.formData = stringToObj(props.taskInfo.mastesform)
+		haveCustomerFormVersion({id:props.taskInfo.version_id.toString()})
+			.then(({ data }) =>{
+				
+				formInfo.dict = string2json(data.dict)
+				judgeSubmitCancel({"name":data.mastesformjson})
+					.then((dataBut:any) =>{
+						if(dataBut.code == 0){
+							formInfo.formData.list.push(afreshSubmitButton)
+								// console.log("res----判断按钮------->",dataBut,props.operState)
+								// if (dataBut.data == 3 || dataBut.data == 4){
+								// 	formInfo.formData.list.push(editFormCont)
+								// }
+						}
+					})
+			})
+			.finally(() => {
+				editTaskAppInfo({ id: props.taskInfo.mastersKeyStr})
+					.then((data:any)=>{
+						if(data.data.logistrue){
+							formInfo.formData.list.push(editLookFormCont)
+						}
+						console.log("res----获得数据回显------->",data)
+						formEl.value.setValue(data.data.masterDataInfo)
+						newLogAry.value = data.data.newData
+						oldLogAry.value = data.data.oldData
+						logistrue.value = data.data.logistrue
+						newDataLen.value = data.data.newDataLen
+						
+					})
+
+		})
+	}
+})
+</script>
+<template>
+	<el-drawer  v-model="isShow"  :title="props.taskInfo.title"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWidth" class="drawerClass" :before-close="drawerBeforeClose">
+		<AppFormPage
+						ref="formEl"
+						:number="props.taskInfo.id"
+						:isWorkFlow="props.taskInfo.types"
+						:form-data="formInfo.formData"
+						:type="1"
+						:mastesformjson="mastesformjson"
+						:flowkey="props.taskInfo.flowKeyStr"
+						:groupid="props.taskInfo.appKeyStr"
+						:sign-code="props.taskInfo.signCode"
+						:version-id="props.taskInfo.versionIdStr"
+						add-url="addData"
+					/>
+	</el-drawer>
+</template>
+<style  lang='scss' scoped>
+.formMainBox{
+	padding: 0;
+}
+.flowBox{
+	width: 350px;
+	border-left: 1px solid #4f4f4f;
+	padding: 0 15px;
+	height: calc(100vh - 55px);
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage.vue
new file mode 100644
index 000000000..388787b80
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage.vue
@@ -0,0 +1,61 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 09:20:58
+@ 备注: 固定App项目
+-->
+<script lang='ts' setup>
+import { taskflowquery } from '@/api/DesignForm/type'
+
+
+//引入页面
+import MyToDoPage from '@/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue'
+import CompletedMattersPage from '@/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue'
+import SendCopy from '@/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue'
+import MyCreate from '@/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue'
+import MyDrafts from '@/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue'
+
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+const loadingTd = ref(false)
+const searckFormRefTd  = ref(ElForm);	//表单
+const taskFlowAryTd = ref<any>([])  //记录数组
+//搜索条件参数
+const selectInfoTd = reactive<taskflowquery>({
+	page: 1,
+	pagesize: 20,
+	class: 2
+})
+const totalstd = ref<number>(0)	//总共多少条记录
+
+//初始化数据
+const initData = () =>{
+	selectInfoTd.page = 1;
+	selectInfoTd.pagesize = 15;
+	selectInfoTd.title = ""
+	selectInfoTd.class = 2;
+	selectInfoTd.state = 0;
+}
+//重置表单
+const resetQueryTd = () =>{
+	searckFormRefTd.value.resetFields();
+	initData();
+}
+</script>
+<template>
+	<el-scrollbar class="scroBox">
+		<MyToDoPage v-if="props.pickAppMenu.isMain==1" :pick-app-menu="pickAppMenu" />
+		<CompletedMattersPage  v-if="props.pickAppMenu.isMain==2" :pick-app-menu="pickAppMenu" />
+		<SendCopy  v-if="props.pickAppMenu.isMain==3" :pick-app-menu="pickAppMenu" />
+		<MyCreate  v-if="props.pickAppMenu.isMain==4" :pick-app-menu="pickAppMenu" />
+		<MyDrafts  v-if="props.pickAppMenu.isMain==5" :pick-app-menu="pickAppMenu" />
+	</el-scrollbar>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
new file mode 100644
index 000000000..18e1b0134
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
@@ -0,0 +1,200 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 10:57:17
+@ 备注: 已办事宜
+-->
+<script lang='ts' setup>
+import { gainAppTaskList } from "@/api/DesignForm/requestapi"
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+const selectInfo = reactive<taskflowquery>({
+	page: 1,
+	pagesize: 20,
+	class:3,
+	id:props.pickAppMenu.appkey
+})
+const loading = ref(false)
+const searckFormRef  = ref(ElForm);
+const totals = ref<number>(0)	//总共多少条记录
+const taskFlowAry = ref<any>([])  //记录数组
+//重置表单
+const resetQuery = () =>{
+	searckFormRef.value.resetFields();
+	initData();
+}
+//初始化数据
+const initData = () =>{
+	selectInfo.page = 1;
+	selectInfo.pagesize = 15;
+	selectInfo.title = ""
+	selectInfo.class = 3;
+	selectInfo.state = 0;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 09:28:35
+@ 功能: 加载数据
+*/
+const getToDoList = () =>{
+	gainAppTaskList(selectInfo)
+		.then((data) =>{
+			console.log("加载数据--->",data)
+			totals.value = data.data.total
+			taskFlowAry.value = data.data.list
+		})
+}
+onMounted(() =>{
+	getToDoList()
+})
+</script>
+<template>
+	<div ref="myappbox" class="app_box">
+		<div class="app-container">
+			<div class="search">
+				<div class="titleBox">
+					已办事宜
+				</div>
+				<el-form ref="searckFormRef" :model="selectInfo" :inline="true">
+					<el-form-item label="任务标题" prop="name">
+						<el-input
+							v-model="selectInfo.title"
+							placeholder="请输入任务标题"
+							clearable
+							@keyup.enter="searchQuery"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="getToDoList()"><i-ep-search />搜索</el-button>
+						<el-button @click="resetQuery()"><i-ep-refresh />重置</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-card shadow="never">
+				<el-table
+					v-loading="loading"
+					element-loading-text="Loading..."
+					highlight-current-row
+					:data="taskFlowAry"
+					border
+					class="table_box"
+				>
+					<el-table-column fixed label="标题" prop="title" width="500" />
+					<el-table-column  label="创建人" prop="creater" >
+						<template #default="scope">
+							{{ scope.row.creatorInfo.name }}（<el-text  type="info">{{ scope.row.creatorInfo.number }}</el-text>）	
+						</template>
+					</el-table-column>
+					<el-table-column  label="发起日期" prop="startDate" align="center"  width="300" />
+					<el-table-column  label="状态" prop="status"  align="center"  width="220" >
+						
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.status==1"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								草稿
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								驳回
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==3"
+								type="success"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								审批中
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==4"
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								归档
+							</el-tag>
+							<el-tag
+								v-else
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								删除
+							</el-tag>
+						</template>
+						
+					</el-table-column>
+					<el-table-column label="当前节点及操作人" prop="currentStep" width="400" >
+						<template #default="scope">
+							<el-text v-if="scope.row.currentNodeName" type="success">{{ scope.row.currentNodeName }}：</el-text><el-text v-for="(item,index) in scope.row.currentNodeUser" :key="index" type="warning">{{ item.name }}({{ item.number }})</el-text>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" align="center" label="操作" width="100" >
+						<template #default="scope">
+							<el-tooltip
+								class="box-item"
+								effect="dark"
+								content="查看详情"
+								placement="top-end"
+							>
+								<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,3)" />
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-model:total="totals"
+					v-model:page="selectInfo.page"
+					v-model:limit="selectInfo.pagesize"
+					@pagination="getToDoList"
+				/>
+			</el-card>
+
+
+			
+
+
+
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.app_box{
+	width:100%;
+	overflow: hidden;
+	overflow-y: auto;
+	.search{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.titleBox{
+		font-size: 20px;
+   	 	margin-top: -20px;
+	}
+}
+.box-card {
+  width: 100%;
+}
+.table_box{
+	width: 100%;
+	height: calc(100vh - 260px);
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
new file mode 100644
index 000000000..ead1f2a45
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
@@ -0,0 +1,220 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 13:59:06
+@ 备注: 我创建的
+-->
+<script lang='ts' setup>
+
+import { gainAppAllTaskList } from "@/api/DesignForm/requestapi"
+
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+
+const selectInfo = reactive<taskflowquery>({
+	page: 1,
+	pagesize: 20,
+	class:1,
+	id:props.pickAppMenu.appkey
+})
+const loading = ref(false)
+const searckFormRef  = ref(ElForm);
+const totals = ref<number>(0)	//总共多少条记录
+const taskFlowAry = ref<any>([])  //记录数组
+//重置表单
+const resetQuery = () =>{
+	searckFormRef.value.resetFields();
+	initData();
+}
+//初始化数据
+const initData = () =>{
+	selectInfo.page = 1;
+	selectInfo.pagesize = 15;
+	selectInfo.title = ""
+	selectInfo.class = 3;
+	selectInfo.state = 0;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 09:28:35
+@ 功能: 加载数据
+*/
+const getToDoList = () =>{
+	gainAppAllTaskList(selectInfo)
+		.then((data) =>{
+			console.log("加载数据--->",data)
+			totals.value = data.data.total
+			taskFlowAry.value = data.data.list
+		})
+}
+onMounted(() =>{
+	getToDoList()
+})
+</script>
+<template>
+	<div ref="myappbox" class="app_box">
+		<div class="app-container">
+			<div class="search">
+				<div class="titleBox">
+					我创建的
+				</div>
+				<el-form ref="searckFormRef" :model="selectInfo" :inline="true">
+					<el-form-item label="任务标题" prop="name">
+						<el-input
+							v-model="selectInfo.title"
+							placeholder="请输入任务标题"
+							clearable
+							@keyup.enter="searchQuery"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="getToDoList()"><i-ep-search />搜索</el-button>
+						<el-button @click="resetQuery()"><i-ep-refresh />重置</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-card shadow="never">
+				<el-table
+					v-loading="loading"
+					element-loading-text="Loading..."
+					highlight-current-row
+					:data="taskFlowAry"
+					border
+					class="table_box"
+				>
+					<el-table-column fixed label="标题" prop="title" width="500" />
+					<el-table-column  label="创建人" prop="creater"  width="200">
+						<template #default="scope">
+							{{ scope.row.createrInfo.name }}（<el-text  type="info">{{ scope.row.createrInfo.number }}</el-text>）	
+						</template>
+					</el-table-column>
+					<el-table-column  label="发起日期" prop="createrTimeStr" align="center"  width="300" />
+					<el-table-column  label="状态" prop="status"  align="center"  width="220" >
+						
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.status==1"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								草稿
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								驳回
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==3"
+								type="success"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								审批中
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==4"
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								归档
+							</el-tag>
+							<el-tag
+								v-else
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								删除
+							</el-tag>
+						</template>
+						
+					</el-table-column>
+					<el-table-column label="任务性质" prop="currentStep" width="200" align="center">
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.types==1"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								流程任务
+							</el-tag>
+							<el-tag
+								v-else
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								普通任务
+							</el-tag>
+							
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" align="center" label="操作" width="100" >
+						<template #default="scope">
+							<el-tooltip
+								class="box-item"
+								effect="dark"
+								content="查看详情"
+								placement="top-end"
+							>
+								<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,3)" />
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-model:total="totals"
+					v-model:page="selectInfo.page"
+					v-model:limit="selectInfo.pagesize"
+					@pagination="getToDoList"
+				/>
+			</el-card>
+
+
+			
+
+
+
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.app_box{
+	width:100%;
+	overflow: hidden;
+	overflow-y: auto;
+	.search{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.titleBox{
+		font-size: 20px;
+   	 	margin-top: -20px;
+	}
+}
+.box-card {
+  width: 100%;
+}
+.table_box{
+	width: 100%;
+	height: calc(100vh - 260px);
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue
new file mode 100644
index 000000000..5a357f764
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue
@@ -0,0 +1,256 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 13:59:06
+@ 备注: 草稿箱
+-->
+<script lang='ts' setup>
+
+import { gainAppAllTaskList } from "@/api/DesignForm/requestapi"
+
+//引入页面
+import AppEditPage from '@/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue'
+
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+
+const selectInfo = reactive<taskflowquery>({
+	page: 1,
+	pagesize: 20,
+	class:2,
+	id:props.pickAppMenu.appkey
+})
+const myappbox = ref();
+const loading = ref(false)
+const searckFormRef  = ref(ElForm);
+const totals = ref<number>(0)	//总共多少条记录
+const taskFlowAry = ref<any>([])  //记录数组
+const drawerMyWith = ref<number>(0); //页面宽度
+const editPageShow = ref(false)
+const sendPageShow = ref(false)
+const taskInfo = ref<any>("")
+//重置表单
+const resetQuery = () =>{
+	searckFormRef.value.resetFields();
+	initData();
+}
+//初始化数据
+const initData = () =>{
+	selectInfo.page = 1;
+	selectInfo.pagesize = 15;
+	selectInfo.title = ""
+	selectInfo.class = 3;
+	selectInfo.state = 0;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 09:28:35
+@ 功能: 加载数据
+*/
+const getToDoList = () =>{
+	gainAppAllTaskList(selectInfo)
+		.then((data) =>{
+			console.log("加载数据--->",data)
+			totals.value = data.data.total
+			taskFlowAry.value = data.data.list
+		})
+}
+onMounted(() =>{
+	getToDoList()
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 13:24:09
+@ 功能: 提交审批
+*/
+const submitApproval = (val:any) =>{
+	taskInfo.value = val
+	drawerMyWith.value = myappbox.value?.clientWidth;
+	sendPageShow.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 14:05:52
+@ 功能: 编辑草稿内容
+*/
+const editFlow  = (val:any) =>{
+	taskInfo.value = val
+	drawerMyWith.value = myappbox.value?.clientWidth;
+	editPageShow.value = true
+}
+</script>
+<template>
+	<div ref="myappbox" class="app_box">
+		<AppEditPage v-model:is-open="editPageShow" :task-info="taskInfo" :drawer-width="drawerMyWith" @refreshFunction="getToDoList" />
+		<div class="app-container">
+			<div class="search">
+				<div class="titleBox">
+					草稿箱
+				</div>
+				<el-form ref="searckFormRef" :model="selectInfo" :inline="true">
+					<el-form-item label="任务标题" prop="name">
+						<el-input
+							v-model="selectInfo.title"
+							placeholder="请输入任务标题"
+							clearable
+							@keyup.enter="searchQuery"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="getToDoList()"><i-ep-search />搜索</el-button>
+						<el-button @click="resetQuery()"><i-ep-refresh />重置</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-card shadow="never">
+				<el-table
+					v-loading="loading"
+					element-loading-text="Loading..."
+					highlight-current-row
+					:data="taskFlowAry"
+					border
+					class="table_box"
+				>
+					<el-table-column fixed label="标题" prop="title" />
+					<el-table-column  label="创建人" prop="creater"  width="200" align="center">
+						<template #default="scope">
+							{{ scope.row.createrInfo.name }}（<el-text  type="info">{{ scope.row.createrInfo.number }}</el-text>）	
+						</template>
+					</el-table-column>
+					<el-table-column  label="发起日期" prop="createrTimeStr" align="center"  width="200" />
+					<el-table-column  label="状态" prop="status"  align="center"  width="100" >
+						
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.status==1"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								草稿
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								驳回
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==3"
+								type="success"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								审批中
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==4"
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								归档
+							</el-tag>
+							<el-tag
+								v-else
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								删除
+							</el-tag>
+						</template>
+						
+					</el-table-column>
+					<el-table-column fixed="right" align="center" label="操作" width="200">
+						<template #default="scope">
+							<el-button-group>
+								<el-tooltip
+									v-if="scope.row.types==1"
+									class="box-item"
+									effect="dark"
+									content="提交审批"
+									placement="top-end"
+								>
+									<el-button type="success" size="small" class="fa fa-send-o" @click="submitApproval(scope.row)"  />
+								</el-tooltip>
+								<el-tooltip
+									class="box-item"
+									effect="dark"
+									content="编辑"
+									placement="top-end"
+								>
+									<el-button
+										type="warning"
+										size="small"
+										class="fa fa-edit"
+										@click="editFlow(scope.row)"
+									/>
+								</el-tooltip>
+								<el-tooltip
+									class="box-item"
+									effect="dark"
+									content="删除"
+									placement="top-end"
+								>
+									<el-button
+										type="danger"
+										size="small"
+										class="fa fa-trash-o"
+										@click="delFlowForm(scope.row)"
+									/>
+								</el-tooltip>
+							</el-button-group>
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-model:total="totals"
+					v-model:page="selectInfo.page"
+					v-model:limit="selectInfo.pagesize"
+					@pagination="getToDoList"
+				/>
+			</el-card>
+
+
+			
+
+
+
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.app_box{
+	width:100%;
+	overflow: hidden;
+	overflow-y: auto;
+	.search{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.titleBox{
+		font-size: 20px;
+   	 	margin-top: -20px;
+	}
+}
+.box-card {
+  width: 100%;
+}
+.table_box{
+	width: 100%;
+	height: calc(100vh - 260px);
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
new file mode 100644
index 000000000..22917d10f
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
@@ -0,0 +1,204 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 10:50:09
+@ 备注: 待我处理
+-->
+<script lang='ts' setup>
+import { gainAppTaskList } from "@/api/DesignForm/requestapi"
+import { taskflowquery } from '@/api/DesignForm/type'
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+const loadingTd = ref(false)
+const searckFormRefTd  = ref(ElForm);	//表单
+const taskFlowAryTd = ref<any>([])  //记录数组
+//搜索条件参数
+const selectInfoTd = reactive<taskflowquery>({
+	page: 2,
+	pagesize: 20,
+	class: 1,
+	id:props.pickAppMenu.appkey
+})
+const totalstd = ref<number>(0)	//总共多少条记录
+
+//初始化数据
+const initData = () =>{
+	selectInfoTd.page = 1;
+	selectInfoTd.pagesize = 15;
+	selectInfoTd.title = ""
+	selectInfoTd.class = 2;
+	selectInfoTd.state = 0;
+}
+//重置表单
+const resetQueryTd = () =>{
+	searckFormRefTd.value.resetFields();
+	initData();
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 09:28:35
+@ 功能: 加载数据
+*/
+const getToDoList = () =>{
+	gainAppTaskList(selectInfoTd)
+		.then((data) =>{
+			console.log("加载数据--->",data)
+			totalstd.value = data.data.total
+			taskFlowAryTd.value = data.data.list
+		})
+}
+onMounted(() =>{
+	getToDoList()
+})
+</script>
+<template>
+	<div ref="myappbox" class="app_box">
+		
+		<div class="app-container">
+			<div class="search">
+				<div class="titleBox">
+					代办事宜
+				</div>
+				<el-form ref="searckFormRefTd" :model="selectInfoTd" :inline="true">
+					<el-form-item label="任务标题" prop="name">
+						<el-input
+							v-model="selectInfoTd.title"
+							placeholder="请输入任务标题"
+							clearable
+							@keyup.enter="searchQuery"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="getToDoListTd()"><i-ep-search />搜索</el-button>
+						<el-button @click="resetQueryTd()"><i-ep-refresh />重置</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-card shadow="never">
+				<el-table
+					v-loading="loadingTd"
+					element-loading-text="Loading..."
+					highlight-current-row
+					:data="taskFlowAryTd"
+					border
+					class="table_box"
+				>
+					<el-table-column fixed label="标题" prop="title" width="500" />
+					<el-table-column  label="创建人" prop="creater" width="150" align="center">
+						<template #default="scope">
+							{{ scope.row.creatorInfo.name }}（<el-text  type="info">{{ scope.row.creatorInfo.number }}</el-text>）	
+						</template>
+					</el-table-column>
+					<el-table-column  label="发起日期" prop="startDate" align="center"  width="200" />
+					<el-table-column  label="状态" prop="status"  align="center"  width="120" >
+						
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.status==1"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								草稿
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								驳回
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==3"
+								type="success"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								审批中
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==4"
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								归档
+							</el-tag>
+							<el-tag
+								v-else
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								删除
+							</el-tag>
+						</template>
+						
+					</el-table-column>
+					<el-table-column  label="当前节点及操作人" prop="currentStep"  >
+						<template #default="scope">
+							<el-text v-if="scope.row.currentNodeName" type="success">{{ scope.row.currentNodeName }}：</el-text><el-text v-for="(item,index) in scope.row.currentNodeUser" :key="index" type="warning">{{ item.name }}({{ item.number }})</el-text>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" align="center" label="操作" width="100" >
+						<template #default="scope">
+
+							<el-tooltip
+								class="box-item"
+								effect="dark"
+								content="查看详情"
+								placement="top-end"
+							>
+								<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,2)" />
+							</el-tooltip>
+
+
+
+						</template>
+					</el-table-column>
+				</el-table>
+					
+				<pagination
+					v-model:total="totalstd"
+					v-model:page="selectInfoTd.page"
+					v-model:limit="selectInfoTd.pagesize"
+					@pagination="getToDoListTd"
+				/>
+			
+			</el-card>
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.app_box{
+	width:100%;
+	overflow: hidden;
+	overflow-y: auto;
+	.search{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.titleBox{
+		font-size: 20px;
+   	 	margin-top: -20px;
+	}
+}
+.box-card {
+  	width: 100%;
+}
+.table_box{
+	width: 100%;
+	height: calc(100vh - 260px);
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
new file mode 100644
index 000000000..99341a3d1
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
@@ -0,0 +1,176 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 13:44:21
+@ 备注: 抄送给我
+-->
+<script lang='ts' setup>
+import { gainAppTaskList } from "@/api/DesignForm/requestapi"
+
+const selectInfo = reactive<taskflowquery>({
+	page: 1,
+	pagesize: 20,
+	class:3
+})
+const loading = ref(false)
+const searckFormRef  = ref(ElForm);
+const totals = ref<number>(0)	//总共多少条记录
+const taskFlowAry = ref<any>([])  //记录数组
+//重置表单
+const resetQuery = () =>{
+	searckFormRef.value.resetFields();
+	initData();
+}
+//初始化数据
+const initData = () =>{
+	selectInfo.page = 1;
+	selectInfo.pagesize = 15;
+	selectInfo.title = ""
+	selectInfo.class = 3;
+	selectInfo.state = 0;
+}
+</script>
+<template>
+	<div ref="myappbox" class="app_box">
+		<div class="app-container">
+			<div class="search">
+				<div class="titleBox">
+					抄送我的
+				</div>
+				<el-form ref="searckFormRef" :model="selectInfo" :inline="true">
+					<el-form-item label="任务标题" prop="name">
+						<el-input
+							v-model="selectInfo.title"
+							placeholder="请输入任务标题"
+							clearable
+							@keyup.enter="searchQuery"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="getToDoList()"><i-ep-search />搜索</el-button>
+						<el-button @click="resetQuery()"><i-ep-refresh />重置</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-card shadow="never">
+				<el-table
+					v-loading="loading"
+					element-loading-text="Loading..."
+					highlight-current-row
+					:data="taskFlowAry"
+					border
+					class="table_box"
+				>
+					<el-table-column fixed label="标题" prop="title" width="500" />
+					<el-table-column  label="创建人" prop="creater" >
+						<template #default="scope">
+							{{ scope.row.creatorInfo.name }}（<el-text  type="info">{{ scope.row.creatorInfo.number }}</el-text>）	
+						</template>
+					</el-table-column>
+					<el-table-column  label="发起日期" prop="startDate" align="center"  width="300" />
+					<el-table-column  label="状态" prop="status"  align="center"  width="220" >
+						
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.status==1"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								草稿
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								驳回
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==3"
+								type="success"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								审批中
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==4"
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								归档
+							</el-tag>
+							<el-tag
+								v-else
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								删除
+							</el-tag>
+						</template>
+						
+					</el-table-column>
+					<el-table-column label="当前节点及操作人" prop="currentStep" width="400" >
+						<template #default="scope">
+							<el-text v-if="scope.row.currentNodeName" type="success">{{ scope.row.currentNodeName }}：</el-text><el-text v-for="(item,index) in scope.row.currentNodeUser" :key="index" type="warning">{{ item.name }}({{ item.number }})</el-text>
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" align="center" label="操作" width="100" >
+						<template #default="scope">
+							<el-tooltip
+								class="box-item"
+								effect="dark"
+								content="查看详情"
+								placement="top-end"
+							>
+								<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,3)" />
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-model:total="totals"
+					v-model:page="selectInfo.page"
+					v-model:limit="selectInfo.pagesize"
+					@pagination="getToDoList"
+				/>
+			</el-card>
+
+
+			
+
+
+
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.app_box{
+	width:100%;
+	overflow: hidden;
+	overflow-y: auto;
+	.search{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.titleBox{
+		font-size: 20px;
+   	 	margin-top: -20px;
+	}
+}
+.box-card {
+  width: 100%;
+}
+.table_box{
+	width: 100%;
+	height: calc(100vh - 260px);
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
new file mode 100644
index 000000000..5248ae346
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -0,0 +1,226 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 09:22:06
+@ 备注: 执行表格
+-->
+<script lang='ts' setup>
+import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+import { judgeSubmitCancel,gainAppPageInfo } from '@/api/DesignForm/requestapi'
+import {  Edit,Picture as IconPicture  } from '@element-plus/icons-vue'
+import { appPageDataInit,appWorkFlow } from "@/api/date/type"
+import { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const'
+
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+const activePage = ref(0)	//默认选择的页面
+const appInitData = ref<appPageDataInit>("")
+//app表单
+const stateForm = reactive<any>({
+	type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    formData: {
+      list: [],
+      form: {},
+      config: {},
+	  powerstr:{}
+    },
+    dict: {},
+    formId: "1",
+    id: 0,
+	formId: 0,
+	versionId: 0,
+    loading: true
+})
+//表单列表
+const stateList = reactive({
+    tableData: {
+      // tableProps: {}, //表格所有参数
+      columns: [],
+      config: {},
+	  controlBtn:[],
+	  operateBtn:[]
+    },
+    searchData: [],
+    loading: false,
+    attrObj: {},
+    config: {
+		pageSize:10,
+		searchIsShow:true,
+		searchFormIsShow:true,
+		openPageMode:"drawer"
+	},
+    tagList: {},
+    formId: props.formKey || '',
+    formList: [], // 所有可选表单数据源
+    name: '',
+    treeData: {}, // 左侧树相关
+    previewVisible: false,
+    tabsName: 'second',
+    formFieldList: [], // 表单数据源所有可选字段
+	formApi:{
+		type:"1",
+		addApiUrl:"",
+		editApiUrl:"",
+		delApiUrl:"",
+		lookApiUrl:""
+	},
+    dict: {},
+    refreshTable: true
+})
+const appFormTitle = ref("")
+const versionTitle = ref<string>("")	//表单名称
+const versionId = ref<string>("")	//表单版本号
+const appFlowInfo = ref<appWorkFlow>("")	//流程
+const isFlow = ref(2)
+const mastesformjson = ref("")	//
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-03 09:54:30
+@ 功能: 加载页面
+*/
+onMounted(() => {
+	initLoadData()
+
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-03 09:00:10
+@ 功能: 初始化数据
+*/
+const initLoadData = () => {
+	console.log("initLoadData",props.pickAppMenu.type,props.pickAppMenu.type != 1)
+	if(props.pickAppMenu.type != 1){
+		appFormTitle.value = props.pickAppMenu.label
+		gainAppPageInfo({id:props.pickAppMenu.id})
+		.then((data)=>{
+			console.log("获取初始化表单数据",data)
+			appInitData.value = data.data
+			console.log("获取初始化表单数据---!",appInitData.value)
+			mastesformjson.value = data.data.appForm.mastesformjson
+			isFlow.value = data.data.appForm.flowIsOpen
+			if (data.data.page && data.data.pageList  && data.data.appFlow){
+				activePage.value = 1
+			}else if (data.data.page && !data.data.pageList  && data.data.appFlow){
+				activePage.value = 2
+			}else if (!data.data.page && !data.data.pageList  && data.data.appFlow){
+				activePage.value = 3
+			}else if (!data.data.page && data.data.pageList  && data.data.appFlow){
+				activePage.value = 1
+			}else if (data.data.page && !data.data.pageList  && !data.data.appFlow){
+				activePage.value = 2
+			}else{
+				activePage.value = 1
+			}
+			versionId.value = data.data.appForm.id.toString()
+			versionTitle.value = data.data.appForm.name
+			if(data.data.pageList){
+				let stateData = string2json(data.data.appForm.listjson)
+				stateList.tableData = stateData.tableData
+				stateList.searchData = stateData.searchData
+				stateList.loading = stateData.loading
+				stateList.attrObj = stateData.attrObj
+				stateList.config = stateData.config
+				stateList.tagList = stateData.tagList
+				stateList.formList = stateData.formList
+				stateList.name = stateData.name
+				stateList.treeData = stateData.treeData
+				stateList.previewVisible = stateData.previewVisible
+				stateList.formFieldList = stateData.formFieldList
+				stateList.formApi = stateData.formApi
+				stateList.dict = stateData.dict
+				stateList.refreshTable = stateData.refreshTable
+			}
+			if(data.data.page){
+				console.log("data.data.mastesform", data.data)
+				stateForm.id=data.data.appForm.version.toString()
+				stateForm.formId =data.data.appForm.cfid.toString()
+				stateForm.versionId =data.data.appForm.id.toString()
+				stateForm.formData = stringToObj(data.data.appForm.mastesform)
+				stateForm.dict = string2json(data.data.appForm.dict)
+				stateForm.formData.powerstr = string2json(data.data.appForm.powerstr)
+				console.log("data.data.mastesform", stateForm.formData)
+				
+				judgeSubmitCancel({"name":data.data.appForm.mastesformjson})
+					.then((datajud:any) =>{
+						if(datajud.code == 0){
+							if (datajud.data == 3 || datajud.data == 4){
+								stateForm.formData.list.push(submitButton)
+							}
+						}
+					})
+			}
+			if(data.data.appFlow){
+				appFlowInfo.value = data.data.workFlow
+			}
+		})
+	}
+	
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-03 09:26:17
+@ 功能: 监听菜单数据变化
+*/
+watch(() => props.pickAppMenu,(val:any) => {
+	initLoadData()
+},{
+    deep: true
+})
+</script>
+<template>
+	<el-row>
+		<el-col :span="24" class="pageBox pageHeader">
+			<el-text class="wordFont">{{ appFormTitle}}</el-text>
+		</el-col>
+		<el-col :span="24">
+			<el-scrollbar class="scroBox">
+				<el-card class="tispMsg"  shadow="always">
+					<!-- <akPageList /> -->
+					<AppFormPage
+						ref="formEl"
+						:number="props.pickAppMenu.id"
+						:isWorkFlow="isFlow"
+						:form-data="stateForm.formData"
+						:type="1"
+						:mastesformjson="mastesformjson"
+						:flowkey="appInitData.flowkey"
+						:groupid="appInitData.groupid"
+						:sign-code="appInitData.signCode"
+						:version-id="appInitData.versionId"
+						add-url="addData"
+					/>
+
+				</el-card>
+			</el-scrollbar>
+		</el-col>
+	</el-row>
+	
+</template>
+<style  lang='scss' scoped>
+.pageBox{
+	padding: 0 15px;
+	.wordFont{
+		font-size: 20px;
+	}
+}
+.pageHeader{
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	background-color: #FFFFFF;
+	padding:15px 15px 5px 15px;
+	margin-bottom: 15px;
+}
+.scroBox{
+	padding:0 15px;
+	height: calc(100vh - 110px);
+	.tispMsg{
+		margin:0 auto 15px auto;
+	}
+}
+</style>