Merge branch 'v8_master'

# Conflicts:
#	src/types/components.d.ts

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
+	});
+}

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查找数据

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
+	});
+}

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>

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) => {

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']

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)
 }

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="列表预览"

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 }">
 		

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>

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>
+									<el-dropdown-item @click="editMenuName(data)">
-											<td rowspan="2"><el-avatar shape="square" :size="55" :src="userStore.avatar" /></td>
+										<table class="userTabel">
-											<td>{{ userStore.nickname }}({{ userStore.userInfoCont.number }})</td>
+											<tr>
-										</tr>
+												<td rowspan="2"><el-avatar shape="square" :size="55" :src="userStore.avatar" /></td>
-										<tr>
+												<td>{{ userStore.nickname }}({{ userStore.userInfoCont.number }})</td>
-											
+											</tr>
-											<td>{{ userStore.userInfoCont.companyname }}/{{ userStore.userInfoCont.departmentname }}</td>
+											<tr>
-										</tr>
+												
-									</table>
+												<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-dropdown>
-							<el-avatar shape="square" :size="25" :src="userStore.avatar" />
+							<!-- <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
+									<el-tree-select
-										v-model="input2"
+										v-model="pickAppMenuSel"
-										style="width: 100%"
+										:data="menusTree"
-										placeholder="搜索"
+										: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 }}
+								<RegularPage v-if="switchPAge==1" :pick-app-menu="pickAppMenu" />
-							</el-scrollbar>
+								<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>

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>

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>

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>

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>

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>

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>

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>

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>