diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts
index 24009cccd..98a5a670d 100644
--- a/src/api/DesignForm/requestapi.ts
+++ b/src/api/DesignForm/requestapi.ts
@@ -333,3 +333,11 @@ export function gainFormListCont(data: getContForId) {
 		data: data
 	});
 }
+//获取表单列表数据
+export function gainFormPageListCont(data: any) {
+	return request({
+		url: '/systemapi/customer_form/gainFormPageListCont',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index ef336f33d..2614e184d 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -588,7 +588,8 @@ const submit = (params = {}) => {
 		case "saveFormContent":
 			//  apiUrl ="/systemapi/task_management/customer_form_adddata"
 			// apiUrl ="/systemapi/task_management/add_form_data"
-			apiUrl ="/systemapi/task_management/add_form_newdata"
+			// apiUrl ="/systemapi/task_management/add_form_newdata"
+			apiUrl ="/systemapi/task_management/add_customer_form"
 			break;
 		case "editFormContent":
 			 apiUrl ="/systemapi/task_management/newcust_form_editdata"
@@ -631,7 +632,7 @@ const submit = (params = {}) => {
 			console.log("submitParams--->",submitParams)
 			console.log("formatParams--->",formatParams)
 
-			debugger
+			// debugger
 			// 提交保存表单
 			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
 				.then((res: any) => {
@@ -793,7 +794,8 @@ const anewSubmit = (type: string, res: any) => {
 
 //保存草稿
 const saveDraft = (params = {}) => {
-	let apiUrl ="/systemapi/task_management/add_form_newdata"
+	// let apiUrl ="/systemapi/task_management/add_form_newdata"
+	let apiUrl ="/systemapi/task_management/add_customer_form"
 	if (props.isSearch || !apiUrl || loading.value) {
 		if (!props.isSearch && !apiUrl) {
 			console.error(
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 8313cf626..13d950c7f 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -10,8 +10,8 @@ import { useDesignFormStore } from '@/store/DesignForm/designForm'
 import { attrButton,FormPageList,FormPageConfig } from '@/api/DesignForm/tableButton'
 import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@/api/DesignForm/fieldUnit'
 import type { FormInstance, FormRules } from 'element-plus'
-
-
+import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
+import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue'
 
 const props = withDefaults(
     defineProps<{
@@ -73,7 +73,7 @@ const tableDataList = ref([]) // 表格行数据
 const state = reactive({
     loading: false,
     currentPage: 1,
-    pageSize: props.config?.pageSize || 20,
+    pageSize: props.config?.pageSize || 2,
     total: 0,
     selectionChecked: [],
     dict: {}, // 接口返回的
@@ -224,14 +224,71 @@ watch(()=>props.lookPageIsShow,(val:boolean)=>{
 @ 功能: 获取数据
 */
 const getPageData = () => {
+	state.loading = true;
 	let sendData = {
-			formId:props.formId,
-			page:state.currentPage,
-			pagesize:state.pageSize,
-			searchData:json2string(props.searchData)
-		}
-		console.log("获取列表详细信息",sendData)
+		formId:props.formId,
+		page:state.currentPage,
+		pagesize:state.pageSize,
+		searchData:json2string(props.searchData)
+	}
+	console.log("获取列表详细信息",sendData)
+	gainFormPageListCont(sendData)
+		.then((data)=>{
+			console.log("获取列表详细信息----------------->",data)
+			tableDataList.value = data.data.list
+			state.total = data.data.total
+			state.loading = false;
+		})
+}
+onMounted(()=>{
+	getPageData()
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-02 13:59:21
+@ 功能: 判断单选值
+*/
+const judjeRadio = (val: any, options: any[]) => {
+	// console.log("判断单选值",val, options)
+	if(options.length > 0){
+		options.forEach((item)=>{
+			if(item.value == val){
+				console.log("判断单选值",val, item.value,item.label)
+				val =  item.label
+			}
+		})
+	}
+	if(val == 0 || val == "0"){
+		val = ""
+	}
+	return val
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-02 14:49:40
+@ 功能: 判断开关类型
+*/
+const judjeSwitch = (val:any,yesVal:any) => {
+	if(val == yesVal) return true;
+	return false;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:13:56
+@ 功能: 列表信息删除安妮
+*/
+const confirmEvent = (val:any) => {
+  console.log('confirm!',val)
 }
+const cancelEvent = (val:any) => {
+  console.log('cancel!',val)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:24:06
+@ 功能: 查看详细内容
+*/
+const lookPageInfo = (val:any) => {}
 </script>
 <template>
 	<div ref="container" v-loading="state.loading" class="table-list-comm">
@@ -347,26 +404,127 @@ const getPageData = () => {
 					ref="table"
 					:data="tableDataList"
 					@selection-change="selectionChange"
+					table-layout="fixed"
 				>
 					<template
 						v-for="item in columnsFilter"
-						:key="item.prop || item.label"
+						:key="item.id || item.label"
 					>
-						<el-table-column v-if="['-'].includes(item.fieldClass)" v-bind="item" config="" width="60">
+					
+						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60">
 							<template v-if="item.help" #header="scope">
 								{{ scope.column.label }}
 								<tooltip :content="item.help" />
 							</template>
-							<template v-else-if="item.fieldClass === '__control'" #default="scope">
+						</el-table-column>
+						<el-table-column v-else-if="item.fieldClass=='__control'"  :prop="item.field" :label="item.label" config="">
+							<template #default="scope">
+								<el-button-group>
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==1"
+										class="box-item"
+										effect="dark"
+										content="提交审批"
+										placement="top-end"
+									>
+										<el-button type="success" size="small" class="fa fa-send-o"  />
+									</el-tooltip>
+
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==1"
+										class="box-item"
+										effect="dark"
+										content="重新申请"
+										placement="top-end"
+									>
+										<el-button type="warning" size="small" class="fa fa-retweet"   />
+									</el-tooltip>
+									<el-tooltip
+										class="box-item"
+										effect="dark"
+										content="查看详情"
+										placement="top-end"
+									>
+										<el-button @click="lookPageInfo(scope.row)" type="primary" size="small" class="fa fa-eye"  />
+									</el-tooltip>
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==1"
+										class="box-item"
+										effect="dark"
+										content="撤回"
+										placement="top-end"
+									>
+										<el-button  size="small" class="fa fa-reply-all"  />
+									</el-tooltip>
+
+									<el-popconfirm
+										confirm-button-text="确定"
+										cancel-button-text="取消"
+										:icon="QuestionFilled"
+										icon-color="#F56C6C"
+										title="您确定要删除此条记录?一经删除！数据将不可恢复！"
+										@confirm="confirmEvent(scope.row)"
+										@cancel="cancelEvent(scope.row)"
+									>
+										<template #reference>
+											<el-button type="danger" size="small" class="fa fa-trash-o"  />
+										</template>
+									</el-popconfirm>
+
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==1"
+										class="box-item"
+										effect="dark"
+										content="申请修改"
+										placement="top-end"
+									>
+										<el-button type="info" size="small" class="fa fa-edit"  />
+									</el-tooltip>
+								</el-button-group>
 							</template>
 						</el-table-column>
-						<el-table-column v-else v-bind="item" config="">
+						<el-table-column v-else  :prop="item.field" :label="item.label" config="">
 							<template v-if="item.help" #header="scope">
 								{{ scope.column.label }}
 								<tooltip :content="item.help" />
 							</template>
-							<template v-else-if="item.fieldClass === '__control'" #default="scope">
+							<template v-if="item.fieldClass=='radio'" #default="scope">
+								<!-- {{scope.row[scope.column.property]}}{{item}} -->
+								{{ judjeRadio(scope.row[scope.column.property],item.options) }}
+							</template>
+							<template v-if="item.fieldClass=='upload'" #default="scope" >
+							<div class="demo-image__error">
+								<el-image
+									style="width: 50px; height: 50px"
+									:src="scope.row[scope.column.property]"
+								>
+									<template #error>
+										<div class="image-slot">
+											<el-icon><Picture /></el-icon>
+										</div>
+									</template>
+								</el-image>
+							</div>
+							</template>
+							<template v-if="item.fieldClass=='switch'" #default="scope">	
 								
+								<el-tag
+									v-if="judjeSwitch(scope.row[scope.column.property],item.activeValue)"
+									type="success"
+									effect="light"
+								>
+									启用
+								</el-tag>
+								<el-tag
+									v-else
+									type="danger"
+									effect="light"
+								>
+									禁用
+								</el-tag>
+							</template>
+							<template v-if="item.fieldClass=='baidumap'" #default="scope">
+								{{scope.row[scope.column.property]}}
 							</template>
 						</el-table-column>
 					</template>
@@ -385,9 +543,9 @@ const getPageData = () => {
 					/>
 				</div>
 			</el-col>
-			<el-col :span="24" >
-				{{formId}}
-				{{ data.operateBtn}}
+			<el-col :span="24"  style="display:none">
+			
+				{{ searchData}}
 			</el-col>
 			<el-col :span="24" style="display:none">
 				<el-button-group>
@@ -487,4 +645,40 @@ const getPageData = () => {
 	width: auto;
     margin-right: 10px;
 }
+.demo-image__error .block {
+  padding: 0px 0;
+  text-align: center;
+  border-right: solid 1px var(--el-border-color);
+  display: inline-block;
+  width: 100%;
+  box-sizing: border-box;
+  vertical-align: top;
+}
+.demo-image__error .demonstration {
+  display: block;
+  color: var(--el-text-color-secondary);
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+.demo-image__error .el-image {
+  padding: 0 5px;
+  max-width: 300px;
+  max-height: 200px;
+  width: 100%;
+  height: 200px;
+}
+
+.demo-image__error .image-slot {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background: var(--el-fill-color-light);
+  color: var(--el-text-color-secondary);
+  font-size: 30px;
+}
+.demo-image__error .image-slot .el-icon {
+  font-size: 30px;
+}
 </style>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 5cea651e1..e908e393a 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -22,6 +22,7 @@ declare module '@vue/runtime-core' {
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
     ElAffix: typeof import('element-plus/es')['ElAffix']
+    ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
@@ -30,12 +31,14 @@ 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']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
@@ -52,10 +55,12 @@ 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']
+    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']
+    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
@@ -103,6 +108,11 @@ declare module '@vue/runtime-core' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+    IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpEdit: typeof import('~icons/ep/edit')['default']
+    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpOperation: typeof import('~icons/ep/operation')['default']
+    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']
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index 7294ae561..a6c10a0d5 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -207,17 +207,17 @@ const state = reactive({
 						:src="squareUrl"
 						title="示例图片"
 						class="picture"
-						@click.top="startUsing(item.id,item.name)"
+						@click.top="startUsing(item.versionId,item.name)"
 					/>
 					<img
 						v-else
 						:src="item.icon"
 						title="示例图片"
 						class="picture"
-						@click.top="startUsing(item.id,item.name)"
+						@click.top="startUsing(item.versionId,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>
+						<el-text  class="w-150px mb-2" truncated :title="item.name" @click.top="startUsing(item.versionId,item.name)">{{item.name}}</el-text>
 					</div>
 					<el-row>
 						<el-col :span="8" class="but_centent">
diff --git a/src/views/sysworkflow/lowcodepage/pageList.vue b/src/views/sysworkflow/lowcodepage/pageList.vue
index 0e9c7f425..48372c087 100644
--- a/src/views/sysworkflow/lowcodepage/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/pageList.vue
@@ -86,7 +86,7 @@ const state = reactive({
 		openPageMode:"drawer"
 	},
     tagList: {},
-    formId: props.formKey || '',
+    formId: props.formKey.toString() || '',
     formList: [], // 所有可选表单数据源
     name: '',
     treeData: {}, // 左侧树相关
@@ -638,7 +638,7 @@ const saveFormListData = () => {
 	}
 	let params: any = {
 		data: json2string(state),
-		id: props.formKey
+		id: props.formKey.toString()
 	}
 	console.log("添加自定义表单列表设定",params)
 	editCustomerFormList(params)
@@ -654,32 +654,35 @@ const saveFormListData = () => {
 */
 const getListInfo = () => {
 	console.log("获取列表内容1111",props.formKey)
-	gainFormListCont({id:props.formKey})
+	gainFormListCont({id:props.formKey.toString()})
 		.then((data)=>{
 			console.log("获取列表内容",data)
-			let stateData = string2json(data.data.listjson)
-			console.log("获取列表内容---->",stateData)
-			state.tableData = stateData.tableData
-			state.searchData = stateData.searchData
-			state.loading = stateData.loading
-			state.attrObj = stateData.attrObj
-			state.config = stateData.config
-			state.tagList = stateData.tagList
-			state.formId = stateData.formId
-			state.formList = stateData.formList
-			state.name = stateData.name
-			state.treeData = stateData.treeData
-			state.previewVisible = stateData.previewVisible
-			state.formFieldList = stateData.formFieldList
-			state.formApi = stateData.formApi
-			state.dict = stateData.dict
-			state.refreshTable = stateData.refreshTable
+			if(data.data.listjson != null && data.data.listjson != ""){
+				let stateData = string2json(data.data.listjson)
+				console.log("获取列表内容---->",stateData)
+				state.tableData = stateData.tableData
+				state.searchData = stateData.searchData
+				state.loading = stateData.loading
+				state.attrObj = stateData.attrObj
+				state.config = stateData.config
+				state.tagList = stateData.tagList
+				state.formId = stateData.formId
+				state.formList = stateData.formList
+				state.name = stateData.name
+				state.treeData = stateData.treeData
+				state.previewVisible = stateData.previewVisible
+				state.formFieldList = stateData.formFieldList
+				state.formApi = stateData.formApi
+				state.dict = stateData.dict
+				state.refreshTable = stateData.refreshTable
+			}
+			
 
 			zhuDaunIsTrue.value = false
 			
-			if(state.tableData.columns.length > 0) {
+			if(state.tableData && state.tableData.columns && state.tableData.columns.length > 0) {
 				
-				if(formTableField.masterTable.length > 0){
+				if(formTableField.masterTable && formTableField.masterTable.length > 0){
 					state.tableData.columns.forEach((itemCol:any)=>{
 						formTableField.masterTable.forEach((item:any)=>{
 							if(itemCol.id == item.id){
@@ -692,7 +695,7 @@ const getListInfo = () => {
 					
 				}
 				
-				if(tableAttrLogButtonList.length > 0){
+				if(tableAttrLogButtonList && tableAttrLogButtonList.length > 0){
 					state.tableData.columns.forEach((itemCol:any)=>{
 						tableAttrLogButtonList.forEach((item:any)=>{
 							if(itemCol.id == item.id){
@@ -727,7 +730,7 @@ const getListInfo = () => {
 			// 	// }
 			}
 			
-			if(state.tableData.controlBtn.length > 0) {
+			if(state.tableData && state.tableData.controlBtn && state.tableData.controlBtn.length > 0) {
 				
 				state.tableData.controlBtn.forEach((itemCol:any)=>{
 					tableButtonList.forEach((item:any)=>{
@@ -771,7 +774,7 @@ const getListInfo = () => {
 			<div  ref="container"  class="table_box main_table">
 
 				<div class="search-box" >
-					<SearchField v-if="state.searchData.length>0&&state.config.searchIsShow" v-model:searchData="state.searchData" />
+					<SearchField v-if="state.searchData&&state.searchData.length>0&&state.config.searchIsShow" v-model:searchData="state.searchData" />
 					<div v-else class="tipBox" >条件查询搜索区域</div>
 				</div>