diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts
index 97bdfcc06..3f71ea8d5 100644
--- a/src/api/DesignForm/requestapi.ts
+++ b/src/api/DesignForm/requestapi.ts
@@ -285,3 +285,27 @@ export function customerFormGroupList(data?:any){
 		data: data
 	});
 }
+//查看分组详情
+export function gainFormGroupInfo(data:getContForId){
+	return request({
+		url: '/systemapi/customer_form/gainFormGroupInfo',
+		method: 'post',
+		data: data
+	});
+}
+//改变自定义表单分组内容
+export function editCustomerFormGroup(data?:any){
+	return request({
+		url: '/systemapi/customer_form/editCustomerFormGroup',
+		method: 'post',
+		data: data
+	});
+}
+//改变自定义表单分组状态
+export function editFormGroupState(data?:any){
+	return request({
+		url: '/systemapi/customer_form/editFormGroupState',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts
index 8f4b867cf..ae9143d77 100644
--- a/src/api/DesignForm/type.ts
+++ b/src/api/DesignForm/type.ts
@@ -2,17 +2,29 @@
 export interface SearchForm extends PageQuery{
 	keywords?: string;
 	classify?:number;
+	groupId?:string;
 }
 //自定义表单列表内容
 export interface customerFormCont{
-	id:string;
-	name:string;
-	tablename:string;
-	states:number;
-	classify:number;
-	creatername:string;
-	creatertime:string;
-	flowkey:any;
+	id: number,
+	name: string,
+	tablename: string,
+	classify: number,
+	permit: string,
+	permitstr: string,
+	states: number,
+	createrTime: number,
+	editTime: number,
+	flowkey: number,
+	userpermit: string,
+	postpermit: string,
+	groupid: number,
+	icon: string,
+	flowIsOpen: 1,
+	idStr: string,
+	creatername: string,
+	creatertimeStr: string,
+	flowkeyStr: string
 }
 
 export type CustomerFormPageResult = PageResult<customerFormCont[]>;
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 91b4ff083..aaabc54a7 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2147,14 +2147,14 @@ const loadNextPage = () => {
                 </el-tab-pane>
                 <el-tab-pane label="表单配置" name="second">
                     <el-form size="small" class="form">
-    
                         <el-divider content-position="left">基础配置</el-divider>
 								<el-form-item  class="form_cont">
 									<template #label>
 										归属分组
 									</template>
+									
 									<el-select id="groupForm" v-model="formConfig.groupKey" placeholder="Select" ref="groupForm">
-										<el-option v-for="item in formGroup" :key="item.idStr" :label="item.title" :value="item.idStr" />
+										<el-option v-for="item in formGroup.list" :key="item.idStr" :label="item.title" :value="item.idStr" />
 										<p v-if="loadingmore">加载中</p>
 										<p v-if="loadingnomore">无数据</p>
 									</el-select>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 8113e13bd..8c3f87071 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -21,10 +21,7 @@ declare module '@vue/runtime-core' {
     DesignLayoutPage: typeof import('./../components/DesignForm/designLayout/designLayoutPage.vue')['default']
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
-<<<<<<< HEAD
     ElAffix: typeof import('element-plus/es')['ElAffix']
-=======
->>>>>>> 9299e8c04ce00872839549eb7248e22456687126
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
@@ -50,6 +47,7 @@ declare module '@vue/runtime-core' {
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
+    ElFooter: typeof import('element-plus/es')['ElFooter']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
@@ -57,25 +55,22 @@ declare module '@vue/runtime-core' {
     ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-<<<<<<< HEAD
-=======
-    ElLink: typeof import('element-plus/es')['ElLink']
->>>>>>> 9299e8c04ce00872839549eb7248e22456687126
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElResult: typeof import('element-plus/es')['ElResult']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -109,21 +104,15 @@ declare module '@vue/runtime-core' {
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
-<<<<<<< HEAD
-=======
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
     IEpOperation: typeof import('~icons/ep/operation')['default']
-    IEpPicture: typeof import('~icons/ep/picture')['default']
->>>>>>> 9299e8c04ce00872839549eb7248e22456687126
     IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
-    IEpView: typeof import('~icons/ep/view')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 50538278e..9dd156a4d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -194,6 +194,7 @@ function handleLogin() {
           );
 						console.log("登陆输出：",redirect,otherQueryParams);
           router.push({ path: redirect, query: otherQueryParams });
+					getCaptcha();
         })
         .catch(() => {
           // 验证失败，重新生成验证码
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
new file mode 100644
index 000000000..7d4af2255
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -0,0 +1,169 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-03-21 09:51:02
+@ 备注: 自定义表单分组内容列表
+-->
+<script lang='ts' setup>
+import { customerFormCont } from "@/api/DesignForm/type";
+import { getCustomerFormList } from '@/api/DesignForm/requestapi'
+import {Delete,Edit,View,MoreFilled} from '@element-plus/icons-vue'
+
+import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue"
+import TaskCustomerForm from '@/views/taskplatform/taskmanagement/taskcustomerformnew.vue'
+
+
+const props = defineProps({
+	groupId:{
+		type:String,
+		default:""
+	},
+	drawerWith:{
+		type:Number,
+		default:true
+	},
+	formKey:{
+		type:String,
+		default:""
+	}
+});
+
+const emits = defineEmits(["update:formKey"]);
+
+//表单ID
+const formKeyStr =  computed({
+	get() {
+		return props.formKey
+	},
+	set(val: formStruct) {
+		emits('update:formKey', val)
+	}
+});
+const formId = ref<string>("")
+const versionTitle = ref<string>("")	//表单名称
+const versionId = ref<string>("")	//表单版本号
+const addFormIsShow = ref(false)
+const openTaskDrawer = ref(false) //新增任务
+const squareUrl = ref<string>('https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png')
+const pageApp = ref<number>(1)			//页码
+const pageAppSize = ref<number>(12)	//每页显示几个
+const pageAppTotal = ref<number>(0)	//总记录数
+const contList = ref<customerFormCont[]>()
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-21 10:54:23
+@ 功能: 获取表单列表
+*/
+const getFormAppList = () => {
+	let sendInfo = {
+		page:pageApp.value,
+		pagesize:pageAppSize.value,
+		groupId:props.groupId
+	}
+	getCustomerFormList(sendInfo)
+		.then(({ data }) => {
+			// console.log("搜索表单-->",data);
+			pageAppTotal.value = data.total
+			contList.value = data.list
+		})
+		.finally(() => {})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-21 13:39:51
+@ 功能: 创建表单任务
+*/
+const startUsing = (id:string,title:string) => {
+	versionId.value = id
+	versionTitle.value = title
+	openTaskDrawer.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-21 10:57:11
+@ 功能: 编辑表单
+*/
+const editFormApp = (id:string) => {
+	formId.value = id.toString()
+	addFormIsShow.value= true
+	console.log("编辑表单",id,"-",formId.value,"-",addFormIsShow.value)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-09 09:06:44
+@ 功能: 刷新页面
+*/
+const refreshPage = (pageType:string) =>{
+	addFormIsShow.value = false;
+	getFormAppList()
+}
+onMounted(()=>{
+	getFormAppList()
+})
+</script>
+<template>
+    <div>
+		<el-row :gutter="10" >
+			<el-col v-for="item in contList" :key="item.id"  :xs="8" :sm="12" :md="8" :lg="8" :xl="8" style=" margin-top: 10px;">
+				<el-card class="cardpattern"  body-style="padding:5px;">
+					<img
+						v-if="item.icon==''"
+						:src="squareUrl"
+						title="示例图片"
+						class="picture"
+						@click.top="startUsing(item.id,item.name)"
+					/>
+					<img
+						v-else
+						:src="item.icon"
+						title="示例图片"
+						class="picture"
+						@click.top="startUsing(item.id,item.name)"
+					/>
+					<div class="cardhead">
+						<el-text  class="w-150px mb-2" truncated :title="item.name" @click.top="startUsing(item.id,item.name)">{{item.name}}</el-text>
+					</div>
+					<el-row>
+						<el-col :span="8" class="but_centent">
+							<el-button size="small" circle class="button" :icon="View"></el-button>
+						</el-col>
+						<el-col :span="8" class="but_centent">
+							<el-button size="small" circle class="button" :icon="Edit" @click="editFormApp(item.idStr)"></el-button>
+						</el-col>
+						<el-col :span="8" class="but_centent">
+							<el-button size="small" circle class="button" :icon="Delete" @click="() => deleteCard(index)"></el-button>
+						</el-col>
+					</el-row>
+				</el-card>
+			</el-col>		
+		</el-row>
+		<div class="formGroupPage">
+			<el-pagination layout="prev, pager, next" v-model:current-page="pageApp" :page-size="pageAppSize" :total="pageAppTotal" />
+		</div>
+		<TaskCustomerForm v-model:isopen="openTaskDrawer" :versionid="versionId" :versiontitle="versionTitle" :drawerwith="props.drawerWith" @searchquery="getFormAppList" />
+		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="props.drawerWith" v-model:form-key="formId" @refreshPage="refreshPage" />
+	</div>
+</template>
+<style  lang='scss' scoped>
+.cardhead{
+	padding: 5px 0;
+}
+.formGroupPage{
+	width:100%;
+	text-align: center;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+/* 图片 */
+.picture {
+  height: 100%;
+  min-height: 50px;
+  max-height: 100px;
+  display: block;
+  width: 100%;
+  min-width: 50px;
+}
+.but_centent{
+	text-align: center;
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue
index 1029960d8..8e13153e7 100644
--- a/src/views/sysworkflow/lowcodepage/index.vue
+++ b/src/views/sysworkflow/lowcodepage/index.vue
@@ -5,7 +5,9 @@
 -->
 <script lang='ts' setup>
 import { SearchForm,customerFormCont,customerFormConfig } from "@/api/DesignForm/type";
-import { getCustomerFormList,getProductionMarkForm,editProductionFormStatus } from '@/api/DesignForm/requestapi'
+import { customerFormGroupList,editFormGroupState } from '@/api/DesignForm/requestapi'
+
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-09 08:59:37
@@ -13,34 +15,53 @@ import { getCustomerFormList,getProductionMarkForm,editProductionFormStatus } fr
 */
 import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue"
 import LowCodeFormGroupPage from "@/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue"
+import AppFormList from "@/views/sysworkflow/lowcodepage/appFormList.vue"
 
 const contbody = ref()	//实例化内容容器
 const addFormIsShow = ref(false)
 const addFormGroupIsShow = ref(false)
 const drawerWith = ref();	//编辑表单时抽屉宽度
+const drawerGroupWith = ref();	//编辑表单时抽屉宽度
 const formKey = ref<string>("") //表单标识
+const formGroupKey = ref<string>("") //表单标识
 const groupKey = ref<string>("") //分组标识
+const squareUrl = ref<string>('https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png')
 
+const page = ref<number>(1)			//页码
+const pageSize = ref<number>(12)	//每页显示几个
+const pageTotal = ref<number>(0)	//总记录数
+const groupFormList = ref<any[]>([]) //记录数组
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-09 09:06:32
 @ 功能: 选择添加项目
 */
-const handleCommand = (command: string) => {
+const handleCommand = (command: string,groupId: string) => {
 	// ElMessage(`click on item ${command}`)
 	if (command == "addForm"){
 		formKey.value = ""
+		formGroupKey.value = groupId
 		// addFormIsShow.value = true
 		drawerWith.value = contbody.value?.clientWidth
 		addFormIsShow.value = true;
 		
 	}else{
 		addFormGroupIsShow.value = true
-		drawerWith.value = 400
+		drawerGroupWith.value = 400
 	}
 }
 /**
 @ 作者: 秦东
+@ 时间: 2024-03-21 13:53:29
+@ 功能: 编辑分组
+*/
+const editFormGroup = (id: string) =>{
+	groupKey.value = id
+	addFormGroupIsShow.value = true
+	drawerGroupWith.value = 400
+}
+/**
+@ 作者: 秦东
 @ 时间: 2024-03-09 09:06:44
 @ 功能: 刷新页面
 */
@@ -50,13 +71,68 @@ const refreshPage = (pageType:string) =>{
 	}else{
 		addFormGroupIsShow.value = false;
 	}
+	gainFormGroup()
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-21 09:30:27
+@ 功能: 获取表单分组
+*/
+const gainFormGroup = () => {
+	let sendInfo = {
+		page:page.value,
+		pagesize:pageSize.value,
+		state:1
+	}
+	customerFormGroupList(sendInfo)
+		.then((data) =>{
+			console.log("获取表单分组",data)
+			pageTotal.value = data.data.total
+			groupFormList.value = data.data.list
+		})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-21 14:22:58
+@ 功能: 改变分组状态
+*/
+const eidtGroupStatus = (id: string, state: number) => {
+
+	ElMessageBox.confirm(
+		'您确定要删除此分组吗？一经删除！数据将不可恢复！请慎重执行此操作！！！',
+		'温馨提示',
+		{
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning',
+		}
+	)
+	.then(() => {
+		let sendInfo = {
+			id: id.toString(),
+			status: state
+		}
+		editFormGroupState(sendInfo)
+			.then((data) =>{
+				ElMessageBox.alert(data.msg, '温馨提示！', {
+						confirmButtonText: '确定',
+						callback: (action: Action) => {
+							gainFormGroup()
+						}
+				});
+			})
+	})
 
+	
+}
+onMounted(()=>{
+	drawerWith.value = contbody.value?.clientWidth
+	gainFormGroup()
+})
 </script>
 <template>
 	<div ref="contbody" class="box_content">
-		
-		<el-affix :offset="100" class="affix_box">
+		<!-- <el-affix :offset="100" >
 			<el-dropdown  @command="handleCommand">
 				<el-button type="primary" class="fa fa-plus" circle ></el-button>
 				<template #dropdown>
@@ -66,16 +142,50 @@ const refreshPage = (pageType:string) =>{
 					</el-dropdown-menu>
 				</template>
 			</el-dropdown>
-		</el-affix>
-
-
-		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="drawerWith" v-model:form-key="formKey" @refreshPage="refreshPage" />
-		<LowCodeFormGroupPage v-if="addFormGroupIsShow" :drawer-with="drawerWith"  :group-key="groupKey" @refreshPage="refreshPage" />
-
+		</el-affix> -->
+		
+		<el-row :gutter="10" class="formGroupList">
+			<el-col v-for="item in groupFormList" :key="item.id" :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
+				<el-card class="cardlarge" body-style="padding:0px 10px 10px 5px;">
+					<template #header>
+						<div class="cardHeadBox">
+							<div class="textBox">
+								<el-avatar v-if="item.icon!=''" shape="square" size="small" :src="item.icon" />
+								<el-avatar v-else shape="square" size="small" :src="squareUrl" />
+								<el-text  class="w-200px mb-2 left_suojin" truncated size="large">{{item.title}}</el-text>
+							</div>
+							<el-dropdown>
+								<span class="el-dropdown-link">
+								<el-icon><MoreFilled /></el-icon>
+								</span>
+								<template #dropdown>
+									<el-dropdown-menu>
+										<el-dropdown-item @click="handleCommand('addFormGroup',item.idStr)" >新增分组</el-dropdown-item>
+										<el-dropdown-item @click="handleCommand('addForm',item.idStr)" >添加表单</el-dropdown-item>
+										<el-dropdown-item @click="handleCommand('addFormApp',item.idStr)" >添加应用</el-dropdown-item>
+										<el-dropdown-item @click="editFormGroup(item.idStr)">编辑</el-dropdown-item>
+										<el-dropdown-item @click="eidtGroupStatus(item.idStr,3)">删除</el-dropdown-item>
+									</el-dropdown-menu>
+								</template>
+							</el-dropdown>
+						</div>
+					</template>
+					<AppFormList v-model:form-key="formKey" :group-id="item.idStr" :drawer-with="drawerWith" />
+					
+				</el-card>
+				
+			</el-col>
+			
+		</el-row>
+		<!-- 分页 -->
+		<div class="formGroupPage">
+			<el-pagination layout="prev, pager, next" v-model:current-page="page" :page-size="pageSize" :total="pageTotal" />
+		</div>
 
 
 			
-		
+		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="drawerWith" v-model:form-key="formKey" :form-group-key="formGroupKey" @refreshPage="refreshPage" />
+		<LowCodeFormGroupPage v-if="addFormGroupIsShow" :drawer-with="drawerGroupWith"  :group-key="groupKey" @refreshPage="refreshPage" />
 	</div>
 </template>
 <style  lang='scss' scoped>
@@ -84,9 +194,72 @@ const refreshPage = (pageType:string) =>{
 	height: calc(100vh - 90px);
 	overflow: hidden;
 	overflow-y: auto;
+	padding: 0;
+	.formGroupList{
+		width:100%;
+		padding: 0 0 10px 10px;
+	}
+	.formGroupPage{
+		width:100%;
+		position: fixed;
+		bottom: 0px;
+		text-align: center;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 }
 .affix_box{
+	display: flex;
 	margin-left: 10px;
 }
+.cardHeadBox{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	.textBox{
+		display: flex;
+		align-items: center;
+		vertical-align: middle;
+		word-wrap: break-word;
+		.mx-1{
+			padding-left:10px;
+		}
+	}
+}
+.but_centent{
+	text-align: center;
+}
+.foot_bottom{
+	padding: 0 ;
+}
+/* 小卡片 */
+.cardpattern{
+//   padding-bottom: 0px;
+//   margin-bottom: 10px;
+//   min-width: 100px;
+}
+/* 小卡片标题 */
+.cardhead{
+  font-size: 15px;
+}
+/* 大卡片 */
+.cardlarge{
+  max-width: 480px;
+  margin-top:10px;
+  ::v-deep .el-card__header{
+	padding:10px !important;
+  }
+}
+
+/* 大卡片标题 */
+.cardhead-large{
+  font-size: 20px;
+}
+.left_suojin{
+	padding-left: 10px;
+}
+
+
 
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue b/src/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue
index 3c73a8d64..ebc2febaf 100644
--- a/src/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue
+++ b/src/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue
@@ -6,7 +6,7 @@
 <script lang='ts' setup>
 import { fromGroupSearch,fromGroupInfo,editFromGroupInfo } from "@/api/DesignForm/gromGroup/types";
 import { gainFormGroupInfo,addCustomerFormGroup } from "@/api/DesignForm/gromGroup/api";
-
+import { editCustomerFormGroup } from '@/api/DesignForm/requestapi'
 
 
 const props = defineProps({
@@ -52,6 +52,7 @@ const handleClose = (done: () => void) => {
 			.then(() => {
 				//   done()
 				submitForm();
+				
 			})
 			.catch(() => {
 				// catch error
@@ -62,6 +63,7 @@ const handleClose = (done: () => void) => {
 	}
 	
 }
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-09 11:51:28
@@ -71,17 +73,40 @@ const submitForm =  () => {
 	butLoading.value = true;
 	ruleFormGroup.value.validate((isValid: boolean) => {
 		if (isValid) {
-			addCustomerFormGroup(formGroupContent)
-				.then((data) =>{
-					ElMessage({
-						message: data.msg,
-						type: 'success',
+			if(props.groupKey != ""){
+				//编辑
+				let sendInfo = {
+					id: props.groupKey,
+					title: formGroupContent.title,
+					sort: formGroupContent.sort,
+					icon: formGroupContent.icon
+				}
+				editCustomerFormGroup(sendInfo)
+					.then((data) =>{
+						ElMessage({
+							message: data.msg,
+							type: 'success',
+						})
+						closeFormGroupBox();
+					})
+					.finally(() =>{
+						butLoading.value = false;
+					});
+			}else{
+				//新增
+				addCustomerFormGroup(formGroupContent)
+					.then((data) =>{
+						ElMessage({
+							message: data.msg,
+							type: 'success',
+						})
+						closeFormGroupBox();
 					})
-					closeFormGroupBox();
-				})
-				.finally(() =>{
-					butLoading.value = false;
-				});
+					.finally(() =>{
+						butLoading.value = false;
+					});
+			}
+			
 		}else{
 			butLoading.value = false;
 		}
diff --git a/src/views/sysworkflow/lowcodepage/lowCodeFormPage.vue b/src/views/sysworkflow/lowcodepage/lowCodeFormPage.vue
index 3801251b9..4503a5fa9 100644
--- a/src/views/sysworkflow/lowcodepage/lowCodeFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/lowCodeFormPage.vue
@@ -23,6 +23,10 @@ const props = defineProps({
 	formKey:{
 		type:String,
 		default:""
+	},
+	formGroupKey:{
+		type:String,
+		default:""
 	}
 });
 const formConfigCont = reactive<customerFormConfig>({
@@ -46,7 +50,9 @@ const state = reactive<formStruct>({
 			name:'',
 			formName: formConfigCont.formName
 		},
-		config: {},
+		config: {
+			groupKey:props.formGroupKey
+		},
 		styles:{
 			divStyle:{},
 			labelStyle:{},
@@ -191,7 +197,7 @@ const runNextWindows = (val:number) => {
 	tabsActive.value = val
 }
 onMounted(()=>{
-	formKeyStr.value = "13"
+	// formKeyStr.value = "13"
 })
 </script>
 <template>
@@ -200,7 +206,6 @@ onMounted(()=>{
 		<el-drawer  v-model="drawerOpenOrClose" title="设置/编辑自定义表单" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith">
 			<el-tabs v-model="tabsActive" @tab-click="handleClick" stretch class="tabsMain">
 				<el-tab-pane label="页面设计" :name="1">
-					
 					<PageDesignEs v-model:state="state"  v-model:form-key="formKeyStr" v-model:form-version="formVersion" :formconfigcont="formConfigCont" @judgeFormIsEdit="judgeFormIsEdit" @runNextWindows="runNextWindows" @closeFormPage="closeFormPage" />
 				</el-tab-pane>
 				<el-tab-pane label="流程设计" :name="2">
diff --git a/src/views/sysworkflow/lowcodepage/pageDesignes.vue b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
index 0130f58ad..1bf614aed 100644
--- a/src/views/sysworkflow/lowcodepage/pageDesignes.vue
+++ b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
@@ -496,6 +496,7 @@ const getInitData = ()	=> {
 			.then((res:any) => {
 				if(res.code == 0){
 					const result = res.data
+					console.log("初始设计搜索时--1--->",result)
 					// 初始设计搜索时res.data=''
 					if (result.mastesform) {
 						state.value.formData = stringToObj(result.mastesform)
@@ -507,6 +508,7 @@ const getInitData = ()	=> {
 						state.value.formData.purview=kjdkjksd.purview
 						console.log("初始设计搜索时--->",kjdkjksd)
 					}
+					state.value.formData.config.groupKey = result.groupKey
 					console.log("初始设计搜索时--end->",state.value.formData)
 					state.value.formDict = string2json(result.dict)
 					// 恢复表单名称
diff --git a/src/views/taskplatform/taskmanagement/taskcustomerformnew.vue b/src/views/taskplatform/taskmanagement/taskcustomerformnew.vue
index 62dabb8a9..9481265cb 100644
--- a/src/views/taskplatform/taskmanagement/taskcustomerformnew.vue
+++ b/src/views/taskplatform/taskmanagement/taskcustomerformnew.vue
@@ -102,7 +102,7 @@ const getTaskFormData = () =>{
 	loadingData.value = true;
 	formLoading.value = true;
 	formLoading.value = true;
-	haveCustomerFormVersion({id:props.versionid})
+	haveCustomerFormVersion({id:props.versionid.toString()})
 		.then(({ data }) =>{
 			console.log("表单数据",data)
 			gainFlowChart.id=data.flowkeystr