diff --git a/src/api/hr/org/index.ts b/src/api/hr/org/index.ts
index e9f09bd..c9cb5e6 100644
--- a/src/api/hr/org/index.ts
+++ b/src/api/hr/org/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { searchFormTitle,orgClassListCont,addOrgTypesCont,orgClassCont,editOrgTypeEditOrDel,searchOrgCont,orgInfo,addOrgInfo,editOrgDel,searchTeamList,orgTeamListCont,orgFormTree,archivesList } from './type';
+import { searchFormTitle,orgClassListCont,addOrgTypesCont,orgClassCont,editOrgTypeEditOrDel,searchOrgCont,orgInfo,addOrgInfo,editOrgDel,searchTeamList,orgTeamListCont,orgFormTree,archivesList,getContId } from './type';
 /**
  * 获取组织类别
  */
@@ -31,6 +31,16 @@ export function addOrgClassInfo(data: addOrgTypesCont){
 		data: data
 	});
 }
+/**
+ * 获取行政组织内容
+ */
+ export function getgovcont(data: getContId){
+	return request({
+		url: '/hrapi/org/getgovcont',
+		method: 'post',
+		data: data
+	});
+}
 /**
  * 编辑组织分类
  */
diff --git a/src/api/hr/org/type.ts b/src/api/hr/org/type.ts
index d106e34..5c34dbb 100644
--- a/src/api/hr/org/type.ts
+++ b/src/api/hr/org/type.ts
@@ -178,3 +178,8 @@ export type archivesList = PageResult<criteriaForPeopleList[]>
 export interface msgAry {
 	msg:string[]
 }
+
+export interface getContId{
+	id: number;
+	idstr?: string;
+}
diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 66e9b69..304279f 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -743,8 +743,8 @@ const appFormSubmit = (params = {}) => {
 			formatParams.versionId=props.versionId
 			formatParams.appKey=props.groupid
 			formatParams.status=2
-			// console.log("提交表单-----------1------------>", submitParams)
-			// console.log("提交表单-----------2------------>", formatParams)
+			console.log("提交表单-----------1------------>", submitParams)
+			console.log("提交表单-----------2------------>", formatParams)
 
 			createAppTask(submitParams ?? formatParams)
 				.then((data:any) => {
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 0e00de5..332b472 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -817,14 +817,14 @@ const attrList = computed(() => {
 					vIf: state.isSearch,
 					vShow: ['lowcodeImage']
 				},
-				{
-					label: '内外四边距',
-					value: config.lowcodeImage,
-					path: 'config.lowcodeImage',
-					type: 'lowcodeImage_marginAndPadding',
-					vIf: state.isSearch,
-					vShow: ['lowcodeImage']
-				},
+				// {
+				// 	label: '内外四边距',
+				// 	value: config.lowcodeImage,
+				// 	path: 'config.lowcodeImage',
+				// 	type: 'lowcodeImage_marginAndPadding',
+				// 	vIf: state.isSearch,
+				// 	vShow: ['lowcodeImage']
+				// },
                 /* {
                     label: '上传视频封面',
                     value: config.uploadvideo,
diff --git a/src/components/DesignForm/public/expand/digitpage.vue b/src/components/DesignForm/public/expand/digitpage.vue
new file mode 100644
index 0000000..d0c69b5
--- /dev/null
+++ b/src/components/DesignForm/public/expand/digitpage.vue
@@ -0,0 +1,50 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-12 10:25:52
+@ 备注: 分值
+-->
+<script lang='ts' setup>
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
+
+const props = withDefaults(
+    defineProps<{
+		modelValue?: string
+		disabled?: boolean
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: string): void
+}>()
+const value = computed({
+	get: () => {
+		return props.modelValue
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+	},
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-01 09:07:11
+@ 功能: 布局处理
+*/
+const getFormItemLableStyle = (ele: any) => {
+    if(ele?.labelStyle){
+     // console.log("返回栅格宽度3",AnalysisCss(ele?.labelStyle))
+      return AnalysisCss(ele?.labelStyle)
+    }
+}
+const getFormItemInputStyle = (ele: any,sty:number) => {
+    if(ele?.inputStyle){
+      //console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
+      return AnalysisInputCss(ele?.inputStyle,sty)
+    }
+}
+</script>
+<template>
+	<el-input v-bind="$props" v-model="value" :style="getFormItemInputStyle(configStyle,2)" :input-style="getFormItemInputStyle(configStyle,3)" oninput ="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '')" placeholder="请输入"></el-input>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/public/expand/lowcodeImage.vue b/src/components/DesignForm/public/expand/lowcodeImage.vue
new file mode 100644
index 0000000..676123c
--- /dev/null
+++ b/src/components/DesignForm/public/expand/lowcodeImage.vue
@@ -0,0 +1,121 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-12 10:44:17
+@ 备注: 图片
+-->
+<script lang='ts' setup>
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
+import errimg from '@/assets/404_images/imgNotFound.png'
+import { uploadUrl,getRequest } from '@/api/DesignForm'
+
+
+const props = withDefaults(
+    defineProps<{
+		modelValue?: string
+		disabled?: boolean
+		tablekey?: Object
+		data?: Object
+		formTableSetUp?: Object
+		imgUrl?: string
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: string): void
+}>()
+const value = computed({
+	get: () => {
+		if(props.data.control.imgUrl == ""){
+			return props.modelValue?props.modelValue:errimg;
+		}else{
+			return props.data.control.imgUrl
+		}
+		
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+		return newVal
+	},
+});
+//组件css部分
+const configStyle = computed(() => {
+    return props.data.styles || {}
+})
+
+
+
+const imgLoading = ref(false)
+const imgPath = ref(errimg)
+
+//文件上传的格式与大小
+const beforeAvatarUpload = (rawFile) => {
+	imgLoading.value = true
+  // console.log("文件上传的格式与大小",rawFile.type)
+  let imgType = ['image/jpeg','image/jpg','image/png','image/gif','image/svg']
+  if (!imgType.includes(rawFile.type)) {
+    ElMessage.error('您上传的不是图片!')
+	imgLoading.value = false
+    return false
+  } else if (rawFile.size / 1024 / 1024 > 200) {
+    ElMessage.error('您上传到额图片大于 200MB!')
+	imgLoading.value = false
+    return false
+  }
+  return true
+}
+//上传成功回调
+const handleAvatarSuccess = (
+  response,
+  uploadFile
+) => {
+  // imageUrl.value = URL.createObjectURL(uploadFile.raw!)
+  console.log("上传成功回调",value)
+  
+  emits('update:modelValue', response.data.url)
+  imgPath.value = response.data.url
+  value.value=response.data.url 
+  console.log("上传成功回调---------->",value.value)
+	// let oldFormSetUp = props.formTableSetUp
+	// if(props.formTableSetUp && props.formTableSetUp.list && props.formTableSetUp.list.length > 0){
+	// 	oldFormSetUp.list.forEach((item)=>{
+	// 		if(item.name && item.name == props.data.name){
+	// 			// value.value = response.data.url
+	// 			// item.control.link = response.data.url
+	// 			value.set(response.data.url)
+	// 			emits('update:modelValue', response.data.url)
+	// 			console.log("上传成功回调------>",response.data.url)
+	// 		}
+	// 	})
+	// }
+	// props.setimgurl=response.data.url
+	// emits("update:imgUrl",response.data.url)
+	// console.log("上传成功回调------>",url.value)
+	// emits("updateCont",response.data.url)
+
+	imgLoading.value = false
+}
+const getFormItemInputStyle = (ele: any,sty:number) => {
+    if(ele?.inputStyle){
+      console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
+      return AnalysisInputCss(ele?.inputStyle,sty)
+    }
+}
+</script>
+<template>
+	<el-upload
+		v-bind="$props"
+		class="upload-demo"
+		:action="uploadUrl"
+		:show-file-list="false"
+		:on-success="handleAvatarSuccess"
+		:before-upload="beforeAvatarUpload"
+		v-loading="imgLoading"
+	>
+	<!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  /> -->
+		<img v-if="value" :src="value" class="avatar"  :style="getFormItemInputStyle(configStyle,2)" />
+		<el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+	</el-upload>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/public/expand/org.vue b/src/components/DesignForm/public/expand/org.vue
new file mode 100644
index 0000000..fae9667
--- /dev/null
+++ b/src/components/DesignForm/public/expand/org.vue
@@ -0,0 +1,85 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-12 10:03:22
+@ 备注: 行政组织选择
+-->
+<script lang='ts' setup>
+import { orgInfo } from '@/api/hr/org/type'
+import { getOrgTreeList } from '@/api/hr/org/index'
+
+const props = withDefaults(
+    defineProps<{
+		modelValue?: string
+		disabled?: boolean
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: string): void
+}>()
+const value = computed({
+	get: () => {
+		return props.modelValue*1
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+			// let newValJson:criteriaForPeopleList[] = JSON.parse(newVal)
+			// if(newValJson.length > 0){
+			// 	let userAry = new Array
+			// 	let userKeyAry = new Array
+			// 	newValJson.forEach(item =>{
+			// 		userAry.push(item.name+"("+item.number+")")
+			// 		userKeyAry.push(item.userkey.toString())
+			// 	})
+			// 	emits('update:modelValue', userAry.join(','))
+			// 	// userlist.value = userAry.join(',')
+			// 	// 
+			// }else{
+			// 	emits('update:modelValue', "")
+			// }
+	},
+});
+const orgTreeList = ref<orgInfo[]>();	
+const orgTreeLoading = ref(false);	//加载行政组织树
+const orgTreeProps ={
+  children: 'child',
+  label: 'name',
+}	//行政组织树对照值
+
+function haveOrgTreeInfo(){
+	orgTreeLoading.value = true;
+	getOrgTreeList({})
+		.then(({ data })=>{
+			orgTreeList.value = data
+		}).finally(()=>{orgTreeLoading.value = false;})
+}
+
+onBeforeMount(() => {
+	haveOrgTreeInfo();
+})
+
+
+
+
+
+
+onMounted(() => {
+	// console.log("value---1--》",value.value,props.modelValue)
+    nextTick(() => {})
+})
+</script>
+<template>
+	<el-tree-select
+		v-bind="$props"
+		v-model="value"
+		v-loading="orgTreeLoading" 
+		node-key="id"
+		:props="orgTreeProps" 
+		:data="orgTreeList"
+		check-strictly
+		:render-after-expand="false"
+	/>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 9936b26..81ef855 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -9,6 +9,12 @@ import { inject, computed } from 'vue'
 import Tooltips from '@/components/DesignForm/tooltip.vue'
 import {constFormProps } from '@/api/DesignForm/utils'
 import { jsonParseStringify } from '@/utils/DesignForm'
+import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+
+
+import LokOrgCentent from '@/widget/org/cont.vue' 
+
+
 const props = withDefaults(
     defineProps<{
       	data: any
@@ -59,9 +65,124 @@ const getText = (text: any,val:any,name:any) => {
 const delColumn = (index: number) => {
     tableDataNew.value.splice(index, 1)
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:22:14
+@ 功能: 时间戳转换对象
+*/
+const timeToAry = (timestamp:number) => {
+	const date = new Date(timestamp);
+	const year = date.getFullYear();
+	const month = ('0' + (date.getMonth() + 1)).slice(-2);
+	const day = ('0' + date.getDate()).slice(-2);
+	const hours = ('0' + date.getHours()).slice(-2);
+	const minutes = ('0' + date.getMinutes()).slice(-2);
+	const seconds = ('0' + date.getSeconds()).slice(-2);
+	return {
+		year:year,
+		month:month,
+		day:day,
+		hours:hours,
+		minutes:minutes,
+		seconds
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:02:49
+@ 功能: 将时间戳转换成字符串
+*/
+const timeToString = (timeVal:any,types:int) => {
+	let timeStr = ""
+	if(Array.isArray(timeVal)){
+		if(timeVal.length >= 2){
+			let startTime = timeToAry(timeVal[0])
+			let endTime = timeToAry(timeVal[1])
+			switch(types){
+			case "year":	//年
+				timeStr = `${startTime.year} 至 ${endTime.year}`;
+				break;
+			case "month":	//月
+				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+				break;
+			case "datetime": //日期+时间
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case  "week":	//周
+				let startWeek = getYearWeek(startTime)
+				let endWeek = getYearWeek(endTime)
+				timeStr = `${startWeek} 至 ${endWeek}`;
+				break;
+			case "timeCalss": //时间
+				timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case "datetimerange":
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case "daterange":
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+				break;
+			case "monthrange":
+				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+				break;
+			default:
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+				break;
+			}
+		}else if(timeVal.length == 1){
+			let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal[0])
+			switch(types){
+				case "year":	//年
+					timeStr = `${year}`;
+					break;
+				case "month":	//月
+					timeStr = `${year}-${month}`;
+					break;
+				case "datetime": //日期+时间
+					timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+					break;
+				case  "week":	//周
+					timeStr = getYearWeek(timeVal)
+					break;
+				case "timeCalss": //时间
+					timeStr = `${hours}:${minutes}:${seconds}`;
+					break;
+				default:
+					timeStr = `${year}-${month}-${day}`
+					break;
+			}
+		}else{
+			timeStr = "未知时间"
+		}
+	}else{
+		let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal)
+		switch(types){
+			case "year":	//年
+				timeStr = `${year}`;
+				break;
+			case "month":	//月
+				timeStr = `${year}-${month}`;
+				break;
+			case "datetime": //日期+时间
+				timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				break;
+			case  "week":	//周
+				timeStr = getYearWeek(timeVal)
+				break;
+			case "timeCalss": //时间
+				timeStr = `${hours}:${minutes}:${seconds}`;
+				break;
+			default:
+				timeStr = `${year}-${month}-${day}`
+				break;
+		}
+	}
+	
+	return timeStr
+}
 </script>
 <template>
-	{{formProps}}
+	
 	<div class="form-table form-table-add">
 		<el-table
 			v-bind="data.control"
@@ -76,10 +197,17 @@ const delColumn = (index: number) => {
 				:width="item.item.span"
 			>
 				<template #default="scope">
-				{{type}}
+				
 					<span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
 					<div v-if="type === 4 || editDisabled">
-						{{ getText(scope.row[item.name],scope.row,item.name) }}
+						<LokOrgCentent  v-if="item.type == 'orgCentent'" :orgid="scope.row[item.name].toString()" />
+						<div v-else-if="item.type=='lowcodeImage'">
+							<LowcodeImagePage :data="item" 
+								v-model="scope.row[item.name]" />
+						</div>
+						<div v-else-if="item.type=='datePicker'" v-html="timeToString(scope.row[item.name],item.control.type)">
+						</div>
+						<div v-else>{{ getText(scope.row[item.name],scope.row,item.name) }}</div>
 					</div>
 					<div v-else>
 				
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index ba5874a..8ceb0ba 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -27,6 +27,12 @@ import {
 } from '@/api/DesignForm/utils'
 import validate from '@/api/DesignForm/validate'
 import ExpandUser from '@/components/DesignForm/public/expand/user.vue'
+import OrgCentent from '@/components/DesignForm/public/expand/org.vue' 
+import LokOrgCentent from '@/widget/org/cont.vue' 
+
+import DigitpagePage from '@/components/DesignForm/public/expand/digitpage.vue'
+import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+
 import AKSelect from './select.vue'
 import { uploadUrl,getRequest } from '@/api/DesignForm'
 import formatResult from '@/utils/DesignForm/formatResult'
@@ -41,6 +47,8 @@ import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/for
 
 import request from '@/utils/request';
 
+import { getgovcont } from '@/api/hr/org/index'
+
 const props = withDefaults(
     defineProps<{
 		data: FormList
@@ -164,6 +172,15 @@ const currentComponent = computed(() => {
     }
     if (props.data.type === 'expand-user') {
       	return markRaw(ExpandUser)
+    }
+	if (props.data.type === 'orgCentent') {
+      	return markRaw(OrgCentent)
+    }
+	if (props.data.type === 'digitpage') {
+      	return markRaw(DigitpagePage)
+    }
+	if (props.data.type === 'lowcodeImage') {
+      	return markRaw(LowcodeImagePage)
     }
 	if (props.data.type === 'datePicker') {
 		props.data.control.valueFormat="x"
@@ -852,14 +869,15 @@ const pickUserVal = (val:any) => {
 		// console.log("选择用户-2->",valAry)
 		return val
 	}
-	
 }
+
+
 </script>
 <template>
 	<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />
-	<DigitPage v-else-if="judgeIsShow(data.name) &&data.type === 'digitpage' && type != 4" :data="data" :model-value="data.control.modelValue" />
-	<OrgCentent v-else-if="judgeIsShow(data.name) &&data.type === 'orgCentent'" :data="data" />
-	<LowcodeImage  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" ></LowcodeImage>
+	
+	
+	
 	<!--拥有者-->
 	<OwnerPage v-else-if="judgeIsShow(data.name) && data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun"  />
 	<SerialNumber  v-else-if="judgeIsShow(data.name) && data.type === 'serialNumber' && type != 4" :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
@@ -885,22 +903,11 @@ const pickUserVal = (val:any) => {
 				<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
 				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
 
-	<el-form-item
-		v-bind="data.item"
-		v-if="judgeIsShow(data.name) && type === 4 &&  data.type == 'digitpage'"
-		:disabled="judgeIsDisabled(data.name)"
-		:prop="tProp || data.name"
-		:class="config.className"
-		:rules="itemRules as any"
-		:label="getLabel(data.item as FormItem)"
-	>
-			<div class="form-value"  v-html="value">
-			</div>
-	</el-form-item>
+	
 
 	<el-form-item
 		v-bind="data.item"
-		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
+		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap'   && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
 		:disabled="judgeIsDisabled(data.name)"
 		:prop="tProp || data.name"
 		:class="config.className"
@@ -967,6 +974,8 @@ const pickUserVal = (val:any) => {
 			<div class="form-value" v-else-if="data.type == 'expand-user'" v-html="pickUserVal(value)">
 				
 			</div>
+			<LokOrgCentent  v-else-if="data.type == 'orgCentent'" :orgid="value" />
+			
 			<div class="form-value" v-else  v-html="value">
 			</div>
 		</template>
@@ -1112,7 +1121,9 @@ const pickUserVal = (val:any) => {
 					
 					'datePicker',
 					'component',
-					'expand-user'
+					'expand-user',
+					'orgCentent',
+					'digitpage',
 				].includes(data.type)
 				"
 				:is="currentComponent"
@@ -1121,7 +1132,21 @@ const pickUserVal = (val:any) => {
 				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
 				v-model="value"
 			/>
-			
+			<component
+				v-if="
+				[
+					'lowcodeImage'
+				].includes(data.type)
+				"
+				:is="currentComponent"
+				v-bind="control"
+				:disabled="judgeIsDisabled(data.name)"
+				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
+				:data="data" 
+				:tablekey="props.tablekey" 
+				:form-table-set-up="props.alldata"
+				v-model="value"
+			/>
 				
 				
 				<!--所属部门-->
diff --git a/src/components/DesignForm/public/form/formItem_20240912.vue b/src/components/DesignForm/public/form/formItem_20240912.vue
new file mode 100644
index 0000000..ba5874a
--- /dev/null
+++ b/src/components/DesignForm/public/form/formItem_20240912.vue
@@ -0,0 +1,1153 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-07-14 08:50:36
+@ 备注: 表单项目
+-->
+<script lang='ts' setup>
+import {
+    inject,
+    onMounted,
+    computed,
+    watch,
+    onUnmounted,
+    markRaw
+} from 'vue'
+import { Md5 } from 'ts-md5'
+import { ElMessage } from 'element-plus'
+import Tooltips from '@/components/DesignForm/tooltip.vue'
+import TinymceEdit from './tinymce.vue'
+import { FormItem, FormList } from '@/api/DesignForm/types'
+import { 
+	formatNumber, 
+	objectToArray,
+	constControlChange,
+    constSetFormOptions,
+    constFormProps,
+    constGetControlByName
+} from '@/api/DesignForm/utils'
+import validate from '@/api/DesignForm/validate'
+import ExpandUser from '@/components/DesignForm/public/expand/user.vue'
+import AKSelect from './select.vue'
+import { uploadUrl,getRequest } from '@/api/DesignForm'
+import formatResult from '@/utils/DesignForm/formatResult'
+import { debounce } from '@/utils/DesignForm/index'
+import { useRoute } from 'vue-router'
+
+import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+
+import TextImg from "@/assets/image/tinymce.png"
+
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
+
+import request from '@/utils/request';
+
+const props = withDefaults(
+    defineProps<{
+		data: FormList
+		modelValue?: any // 子表和弹性布局时时有传
+		tProp?: string // 子表时的form-item的prop值，用于子表校验用
+		nodeKey?:string
+		purview?:any[]
+		optionsValue3Get1?:any
+		tablekey?:any
+		numrun?:any
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', val: any): void
+	(e: 'optionsValue3Get1', val: any,fieldName: string): void
+}>()
+const route = useRoute()
+const formProps = inject(constFormProps, {}) as any
+const type = computed(() => {
+    return formProps.value.type
+})
+const config = computed(() => {
+    return props.data.config || {}
+})
+//组件css部分
+const configStyle = computed(() => {
+    return props.data.styles || {}
+})
+
+const control = computed(() => {
+	if(props.data.type == "upload"){
+		props.data.control.action = uploadUrl
+	}
+    return props.data.control
+	// return props.data
+})
+const 	options = ref(props.data.options)
+//console.log("FormItem*********************************************************"+JSON.stringify(props.data))
+const changeEvent = inject(constControlChange, '') as any
+const updateModel = (val: any) => {
+	let controlAttribute = ""
+	if(props.data.control){
+		if(props.data.control.type){
+			controlAttribute = props.data.control.type
+		}
+	}
+    changeEvent &&
+    changeEvent({
+        key: props.data.name,
+        value: val,
+        data: props.data,
+        tProp: props.tProp,
+		type: props.data.type,
+		attribute: controlAttribute
+    })
+}
+const value = computed({
+    get() {
+		if (props.tProp) {
+			// 表格和弹性布局
+			return props.modelValue
+		} else {
+			if(props.data.type == "checkbox"){
+				if (formProps.value.model[props.data.name] == null || formProps.value.model[props.data.name] == ""){
+					// formProps.value.model[props.data.name] = []
+					// return formProps.value.model[props.data.name]
+					return []
+				}else{
+					return formProps.value.model[props.data.name]
+				}
+			}else{
+				return formProps.value.model[props.data.name]
+			}
+			
+		}
+    },
+    set(newVal: any) {
+		if (props.tProp) {
+			emits('update:modelValue', newVal)
+		}
+		updateModel(newVal)
+    }
+})
+// 选择数据转换，默认尝试转数字
+const transformOption = (val: string | number, type?: string) => {
+    switch (config.value.transformData || type) {
+		case 'none':
+				return val
+		case 'string':
+			try {
+				return val.toString()
+			} catch (e) {
+				return val
+			}
+    }
+    return formatNumber(val)
+ }
+
+// 当通用修改属性功能添加新字段时，数组更新但toRefs没更新
+const getControlByName = inject(constGetControlByName) as any
+const sourceFunKey = computed(() => {
+    const iReg = new RegExp('(?<=\\${)(.*?)(?=})', 'g')
+    //const iReg = new RegExp('\\${.*?}', 'g') // 结果会包含开头和结尾=>${name}
+    const apiUrl = config.value.optionsFun
+    const replace = apiUrl?.match(iReg)
+    return replace && replace[0]
+})
+const getLabel = (ele: FormItem) => {
+    const showColon = formProps.value.showColon ? '：' : ''
+    if (ele) {
+    	return ele.showLabel ? '' : ele.label + showColon
+    } else {
+      	return ''
+    }
+}
+const currentComponent = computed(() => {
+    if (props.data.type === 'component') {
+      	// 自定义组件
+      	return config.value.componentName
+    }
+    if (props.data.type === 'expand-user') {
+      	return markRaw(ExpandUser)
+    }
+	if (props.data.type === 'datePicker') {
+		props.data.control.valueFormat="x"
+	}
+	if (props.data.type === 'switch') {
+		if(typeof props.data.control.activeValue === "number"){
+			props.data.control.activeValue=props.data.control.activeValue.toString()
+		}
+		if(typeof props.data.control.inactiveValue === "number"){
+			props.data.control.inactiveValue=props.data.control.inactiveValue.toString()
+		}
+	}
+	// if (props.data.type === 'timePicker') {
+	// 	props.data.control.valueFormat="timestamp"
+	// }
+	// console.log("自定义组件",props.data)
+    	return `el-${props.data.type}`
+})
+// 控制编辑模式下是否可用
+const editDisabled = computed(() => {
+    if (type.value === 3) {
+      	return true // 查看模式，为不可编辑状态
+    }
+    if (type.value === 1 && config.value.addDisabled) {
+      	return true
+    }
+    if (type.value === 2 && config.value.editDisabled) {
+      	return true // 编辑模式
+    }
+	// return judgeIsDisabled(key)
+    return control.value.disabled
+})
+// 返回当前item项的校验规则
+const itemRules = computed(() => {
+    let temp
+    const itemR: any = props.data.item?.rules || []
+    const customR = formatCustomRules()
+    // 如果三个都没有设置，则返回undefined
+    if (itemR?.length || customR?.length) {
+      	temp = [...customR, ...itemR]
+    }
+    return temp
+})
+// data 根据条件搜索，select远程搜索里data有值
+const getAxiosOptions = debounce((data?: any) => {
+	//console.log(props.data)
+    const {
+		optionsType,
+		optionsFun,
+		method = 'post',
+		afterResponse,
+		beforeRequest,
+		label,
+		value,
+		debug // =true可用于调试，不存sessionStorage
+    } = config.value
+    if (optionsType !== 0) {
+      	let sourceFun = optionsFun
+      	// 接口数据源
+      	if (optionsType === 1 && sourceFun) {
+        	// 当前控件为动态获取数据，防多次加载，先从本地取。data=true时直接请求
+			let md5Object:any = new Md5()
+			md5Object.appendAsciiStr(JSON.stringify(sourceFun + data))
+			let md5Str = md5Object.end()
+			// const key = 'getOptions_' + props.data.name + md5(sourceFun + data)
+			const key = 'getOptions_' + props.data.name + md5Str
+			const storage = window.sessionStorage.getItem(key)
+        if (storage && !data && !debug) {
+          	const val = JSON.parse(storage)
+			if (props.data.type === 'treeSelect') {
+				control.value.data = val
+			} else {
+				options.value = val
+			}
+        } else {
+          	// 从url里提取一个动态值,${name}形式提取name
+			if (sourceFunKey.value) {
+				const val = formProps.value.model[sourceFunKey.value]
+				const string = '${' + sourceFunKey.value + '}'
+				sourceFun = sourceFun.replace(string, val)
+			}
+			// 处理请求前的数据
+			//let newData = Object.assign({}, data || {}, queryParams)
+          	let newData = data || {}
+			if (typeof beforeRequest === 'function') {
+				newData =
+				beforeRequest(newData, route, formProps.value.model) ?? data
+			}
+			if (newData === false) {
+				return
+			}
+			if (method === 'get') {
+				newData = { params: newData }
+			}
+          	// getRequest(sourceFun, newData, { method: method })
+			// 	.then((res: any) => {
+			// 	const result = res.data.list || res.data
+			// 	let formatRes: any = result
+			// 	// 这里做数据转换，很多时候后端并不能提供完全符合且一样的数据
+			// 	if (typeof afterResponse === 'string' && afterResponse) {
+			// 		formatRes = formatResult(result, afterResponse)
+			// 	} else if (typeof afterResponse === 'function') {
+			// 		// 没有return时，使用原来的，相当于没处理
+			// 		formatRes = afterResponse(result) ?? result
+			// 	} else if (label || value) {
+			// 		// 没有设置afterResponse时，这里将数据转换为[{label:'',value:''}]形式。只处理一级
+			// 		formatRes = []
+			// 		result.forEach((item: any) => {
+			// 		formatRes.push({
+			// 			label: item[label] || item.label,
+			// 			value: item[value] || item.value
+			// 		})
+			// 		})
+			// 	}
+			// 	if (formatRes === false) {
+			// 		return
+			// 	}
+			// 	// console.log('formatRes', formatRes)
+			// 	if (props.data.type === 'treeSelect') {
+			// 		control.value.data = formatRes
+			// 	} else {
+			// 		options.value = formatRes
+			// 	}
+			// 	if (typeof formatRes === 'object') {
+			// 		window.sessionStorage.setItem(key, JSON.stringify(formatRes)) //缓存，例如子表添加时不用每添加一行就请求一次
+			// 	}
+			// 	})
+			// 	.catch((res: any) => {
+			// 	if (props.data.type === 'treeSelect') {
+			// 		control.value.data = []
+			// 	} else {
+			// 		options.value = []
+			// 	}
+			// 		console.log(res)
+			// 	})
+        	}
+    	}else if(optionsType === 3){//liwenxuan 20240611 系统表单字段效果实现
+			/*
+				在这里请求后台获取字段
+			*/
+			console.log("formItem---291",props.data.control.optionsValue3Field)
+			if(props.data.control.optionsValue3Field && props.data.control.optionsValue3Field != "" && props.data.control.optionsValue3Field != null && props.data.control.optionsValue3Field != "undefined"){
+				getFieldRecord(props.data.control.optionsValue3Field).then(({ data }) => {
+					
+					let fieldName = props.data.name
+					
+					emits('optionsValue3Get1',data,fieldName)
+					
+				})
+			}
+			
+		}
+      	setFormDict(formProps.value.dict) // 表格里新增时行时需要重新设一次
+    }
+})
+watch(
+    () => props.data.control.optionsValue3Field,
+    (val:any) => {
+		console.log("监听--optionsValue3Field-》",val)
+		getAxiosOptions() 
+    }
+)
+watch(
+    () => props.data.config.optionsType,
+    () => {
+		getAxiosOptions() 
+    }
+)
+
+
+function getFieldRecord(param1: any) {
+	return request({
+		url: '/javasys/lowCode/AssociatedForms/getFieldRecord',
+		method: 'post',
+		data: {
+			optionsValue3Field:param1
+		},
+	});
+}
+watch(
+    () => formProps.value.model[sourceFunKey.value],
+    () => {
+      	getAxiosOptions() 
+    }
+)
+// 处理自定义校验规则，将customRules转换后追加到rules里
+const formatCustomRules = () => {
+    const rulesReg: any = {}
+    validate &&
+    validate.forEach(item => {
+        rulesReg[item.type] = item.regExp
+    })
+
+    // 获取校验方法 父级使用provide方法注入
+    const temp: any = []
+    props.data.customRules?.forEach((item: any) => {
+		if (!item.message && item.type !== 'methods') {
+			return // 方法时允许提示信息为空
+		}
+		let obj = {}
+		if (item.type === 'required') {
+			obj = { required: true }
+		} else if (item.type === 'rules') {
+			// 自定义表达式
+			obj = { pattern: item.rules }
+		} else if (item.type === 'methods') {
+			// 方法时
+			const methods: any = item.methods
+			if (methods) {
+			obj = { validator: inject(methods, {}) }
+			}
+		} else if (item.type) {
+			obj = { pattern: rulesReg[item.type as string] }
+		}
+		// 这里判断下防某些条件下重复push的可能或存重复校验类型
+		let message: any = { message: item.message }
+		if (!item.message) {
+			// 当使用validator校验时，如果存在message字段则不能使用 callback(new Error('x'));的提示
+			message = {}
+		}
+		temp.push(
+			Object.assign(
+				{
+					trigger: item.trigger || 'blur'
+				},
+				obj,
+				message
+			)
+		)
+    })
+    return temp
+  }
+// 从数据接口获取数据设置options，在表单添加或编辑时数据加载完成
+const setFormDict = (val: any) => {
+	// console.log("从数据接口获取数据设置options",val)
+    if (val && config.value.optionsType === 2) {
+      		const opt = val[config.value.optionsFun] || val[props.data.name] // 不填写默认为当前字段名
+      	if (opt !== undefined) {
+        	options.value = objectToArray(opt)
+      	}
+    }
+}
+  // 从接口返回的dict会在这里触发
+watch(
+    () => formProps.value.dict,
+    (val: any) => {
+      	setFormDict(val)
+    },
+    {
+      	/*deep: true*/
+    }
+)
+// 对单选多选select设置options
+const formOptions = inject(constSetFormOptions, {}) as any
+watch(
+    () => formOptions.value,
+    (val: any) => {
+		// console.log("子表内的需要注意下，只有在子表有记录时才生效",val)
+		const opt = val[props.data.name]
+		// 子表内的需要注意下，只有在子表有记录时才生效
+		if (val && opt !== undefined) {
+			if (props.data.type === 'treeSelect') {
+			// 树结构的参数为data
+			control.value.data = objectToArray(opt)
+			} else {
+			options.value = objectToArray(opt)
+			}
+		}
+    }
+)
+// ------------图片上传处理-----------
+const fileList = computed<any>(() => {
+    const imgVal = formProps.value.model[props.data.name]
+	// console.log("图片上传处理-->",imgVal)
+    if (imgVal && typeof imgVal === 'string') {
+		// console.log("图片上传处理-2->",imgVal)
+		const temp: any = []
+		imgVal.split(',').forEach((item: string) => {
+			// console.log("图片上传处理-3->",item)
+			temp.push({
+			name: item,
+			url: item
+			})
+		})
+		return temp
+    }
+    return imgVal || [] // 这样可支持默认值为array([name:'',url:''这种形式])
+})
+// 上传成功时
+const uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => {
+	// console.log("response==>",response)
+	// console.log("uploadFile==>",uploadFile)
+	// console.log("uploadFiles==>",uploadFiles)
+    const oldList = []
+    fileList.value.forEach((item: any) => {
+      	oldList.push(item.url)
+    })
+    // oldList.push(response.path)
+	oldList.push(response.data.url)
+    updateModel(oldList.join(','))
+    control.value.onSuccess &&
+    control.value.onSuccess(response, uploadFile, uploadFiles)
+	// console.log("uploadSuccess===>",control.value)
+	// console.log("uploadSuccess=fileList==>",fileList)
+}
+// 从列表移除
+const uploadRemove = (uploadFile: any, uploadFiles: any) => {
+    const oldList: any = []
+    fileList.value.forEach((item: any) => {
+		if (item.url !== uploadFile.url) {
+			oldList.push(item.url)
+		}
+    })
+    updateModel(oldList.join(','))
+    control.value.onRemove && control.value.onRemove(uploadFile, uploadFiles)
+    // todo 需从服务端删除已上传图片时，这里需要发删除请求接口
+}
+// 上传错误
+const uploadError = (err: any, file: any, fileList: any) => {
+    // console.log('uploadError')
+    ElMessage.error(file.name + '上传失败')
+    control.value.onError && control.value.onError(err, file, fileList)
+}
+// -------------图片上传结束----------------
+/****input slot处理***/
+const getInputSlot = (key?: string) => {
+    const slot = key === 'p' ? config.value.prepend : config.value.append
+    const has = slot.indexOf('key:') === 0
+    if (!has) {
+      	return false
+    }
+    const slotKey = slot.replace('key:', '')
+    const control = getControlByName(slotKey)
+    if (!control || Object.keys(control)?.length === 0) {
+      	return false
+    }
+    return control
+}
+const inputSlotChange = (val: string | number, name: string) => {
+    changeEvent &&
+    changeEvent({
+        key: name,
+        value: val,
+        data: {},
+        tProp: ''
+    })
+}
+  /****input slot处理结束***/
+  // treeSelect
+  // const filterMethod = (val: string) => {
+  //   if (props.data.type === 'treeSelect') {
+  //     // 请求参数名，可使用config.queryName传进来
+  //     const queryName = config.value.queryName || 'name'
+  //     control.value.filterMethod && control.value.filterMethod(val)
+  //     getAxiosOptions({ [queryName]: val })
+  //   }
+  // }
+onMounted(() => {
+    getAxiosOptions()
+})
+onUnmounted(() => {})
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-01 09:07:11
+@ 功能: 布局处理
+*/
+const getFormItemLableStyle = (ele: any) => {
+    if(ele?.labelStyle){
+    //   console.log("返回栅格宽度3",AnalysisCss(ele?.labelStyle))
+      return AnalysisCss(ele?.labelStyle)
+    }
+}
+const getFormItemInputStyle = (ele: any,sty:number) => {
+    if(ele?.inputStyle){
+    //   console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
+      return AnalysisInputCss(ele?.inputStyle,sty)
+    }
+}
+const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-27 14:17:16
+@ 功能: 判断此组件是否可见
+*/
+const judgeIsShow = (key:string) => {
+	// console.log("判断此组件是否可见---->",key)
+	if(props.nodeKey != undefined && props.purview != undefined && props.purview != null && props.purview != null && props.purview != "" && props.purview != "") {
+		if(props.purview.length < 1){
+			return true;
+		}else{
+			let isShow = false;
+			if(Array.isArray(props.purview)){
+				props.purview.forEach((item)=>{
+					if(item.nodeKey == props.nodeKey){
+						
+						if(item.powerAry && item.powerAry.length > 0){
+							item.powerAry.forEach((itm)=>{
+								if(itm.id == key){
+									// console.log("判断此组件是否可见",itm,itm.id == key,"--------->",itm.isLook)
+									isShow =  itm.isLook
+									
+								}
+							})
+						}
+					}
+					
+				})
+			}
+			
+			return isShow
+		}
+	}else{
+		return true;
+	}
+
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-27 15:11:42
+@ 功能: 判断是否禁用
+*/
+const judgeIsDisabled = (key:string)  => {
+	if (type.value === 3) {
+      	return true // 查看模式，为不可编辑状态
+    }
+    if (type.value === 1 && config.value.addDisabled) {
+      	return true
+    }
+    if (type.value === 2 && config.value.editDisabled) {
+      	return true // 编辑模式
+    }
+	if(props.nodeKey != undefined && props.purview != undefined && props.purview != null && props.purview != null && props.purview != "" && props.purview != "") {
+		if(props.purview.length < 1){
+			return false;
+		}else{
+			let isShow = true;
+			props.purview.forEach((item)=>{
+				if(item.nodeKey == props.nodeKey){
+					
+					if(item.powerAry && item.powerAry.length > 0){
+						item.powerAry.forEach((itm)=>{
+							if(itm.id == key){
+								console.log("判断此组件是否禁用",itm,itm.id == key,"--------->",itm.isLook)
+								isShow =  !itm.isEdit
+								
+							}
+						})
+					}
+				}
+				
+			})
+			return isShow
+		}
+	}else{
+		return false;
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:02:49
+@ 功能: 将时间戳转换成字符串
+*/
+const timeToString = (timeVal:any,types:int) => {
+	let timeStr = ""
+	if(Array.isArray(timeVal)){
+		if(timeVal.length >= 2){
+			let startTime = timeToAry(timeVal[0])
+			let endTime = timeToAry(timeVal[1])
+			switch(types){
+			case "year":	//年
+				timeStr = `${startTime.year} 至 ${endTime.year}`;
+				break;
+			case "month":	//月
+				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+				break;
+			case "datetime": //日期+时间
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case  "week":	//周
+				let startWeek = getYearWeek(startTime)
+				let endWeek = getYearWeek(endTime)
+				timeStr = `${startWeek} 至 ${endWeek}`;
+				break;
+			case "timeCalss": //时间
+				timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case "datetimerange":
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case "daterange":
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+				break;
+			case "monthrange":
+				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+				break;
+			default:
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+				break;
+			}
+		}else if(timeVal.length == 1){
+			let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal[0])
+			switch(types){
+				case "year":	//年
+					timeStr = `${year}`;
+					break;
+				case "month":	//月
+					timeStr = `${year}-${month}`;
+					break;
+				case "datetime": //日期+时间
+					timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+					break;
+				case  "week":	//周
+					timeStr = getYearWeek(timeVal)
+					break;
+				case "timeCalss": //时间
+					timeStr = `${hours}:${minutes}:${seconds}`;
+					break;
+				default:
+					timeStr = `${year}-${month}-${day}`
+					break;
+			}
+		}else{
+			timeStr = "未知时间"
+		}
+	}else{
+		let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal)
+		switch(types){
+			case "year":	//年
+				timeStr = `${year}`;
+				break;
+			case "month":	//月
+				timeStr = `${year}-${month}`;
+				break;
+			case "datetime": //日期+时间
+				timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				break;
+			case  "week":	//周
+				timeStr = getYearWeek(timeVal)
+				break;
+			case "timeCalss": //时间
+				timeStr = `${hours}:${minutes}:${seconds}`;
+				break;
+			default:
+				timeStr = `${year}-${month}-${day}`
+				break;
+		}
+	}
+	
+	return timeStr
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:22:14
+@ 功能: 时间戳转换对象
+*/
+const timeToAry = (timestamp:number) => {
+	const date = new Date(timestamp);
+	const year = date.getFullYear();
+	const month = ('0' + (date.getMonth() + 1)).slice(-2);
+	const day = ('0' + date.getDate()).slice(-2);
+	const hours = ('0' + date.getHours()).slice(-2);
+	const minutes = ('0' + date.getMinutes()).slice(-2);
+	const seconds = ('0' + date.getSeconds()).slice(-2);
+	return {
+		year:year,
+		month:month,
+		day:day,
+		hours:hours,
+		minutes:minutes,
+		seconds
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:21:05
+@ 功能: 计算当前时间戳是今年第几周
+*/
+const getYearWeek = (timestamp:number) => {
+    const date = new Date(timestamp);
+  	const firstDayOfYear = new Date(date.getFullYear(), 0, 1);
+  	const pastDaysOfYear = (date - firstDayOfYear) / 86400000;
+  	const weekNumber = Math.ceil((pastDaysOfYear + firstDayOfYear.getDay() + 1) / 7);
+  return weekNumber;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:42:22
+@ 功能: 判断单选值
+*/
+const judgeRadio = (val:any,list:any) => {
+	let valStr = ""
+	if(Array.isArray(list)){
+		if(list.length > 0){
+			list.forEach((item) => {
+				if(item.value == val){
+					valStr = item.label
+				} 
+			})
+		}
+	}
+	return valStr
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:42:22
+@ 功能: 判断多选值
+*/
+const judgeCheckbox = (val:any,list:any) => {
+	let valAry = []
+	if(Array.isArray(val)){
+		if(val.length > 0){
+			if(Array.isArray(list)){
+				val.forEach((item) => {
+					list.forEach((ltem) => {
+						if(item == ltem.value){
+							valAry.push(ltem.label)
+						}
+					})
+				})
+			}
+		}
+	}
+	return valAry
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-05 10:00:31
+@ 功能: 下拉菜单处理
+*/
+const selectValue = (val:any,list:any) => {
+	// console.log("下拉菜单处理",val,list)
+	let valAry = []
+	if(val && val != "" && val != null ){
+		let pickSelect = val
+		if(Array.isArray(val)){
+			pickSelect = val
+		}else{
+			pickSelect = JSON.parse(val)
+		}
+		 
+		// console.log("下拉菜单处理-----3------->",pickSelect)
+	
+
+		if(Array.isArray(pickSelect)){
+			if(pickSelect.length > 0){
+				
+				if(Array.isArray(list)){
+					pickSelect.forEach((item) => {
+						
+						list.forEach((ltem) => {
+							if(item*1 == ltem.value*1){
+								valAry.push(ltem.label)
+							}
+						})
+					})
+				}
+			}
+		}else{
+			if(Array.isArray(list)){
+				list.forEach((ltem) => {
+					if(val == ltem.value){
+						valAry.push(ltem.label)
+					}
+				})
+			}
+		}
+	}else{
+		// console.log("下拉菜单处理-4->",val)
+	}
+	
+	// console.log("下拉菜单处理-2->",valAry)
+	return valAry
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-06 08:34:05
+@ 功能: 选择用户
+*/
+const pickUserVal = (val:any) => {
+	// console.log("选择用户-2->",val)
+	if(Array.isArray(val)){
+		return val
+	}else{
+		// let valAry = string2json(val)
+		// console.log("选择用户-2->",valAry)
+		return val
+	}
+	
+}
+</script>
+<template>
+	<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />
+	<DigitPage v-else-if="judgeIsShow(data.name) &&data.type === 'digitpage' && type != 4" :data="data" :model-value="data.control.modelValue" />
+	<OrgCentent v-else-if="judgeIsShow(data.name) &&data.type === 'orgCentent'" :data="data" />
+	<LowcodeImage  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" ></LowcodeImage>
+	<!--拥有者-->
+	<OwnerPage v-else-if="judgeIsShow(data.name) && data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun"  />
+	<SerialNumber  v-else-if="judgeIsShow(data.name) && data.type === 'serialNumber' && type != 4" :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+	<!--创建人-->
+	<FounderForm v-else-if="judgeIsShow(data.name) && data.type === 'founder' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+	<!--创建时间-->
+	<FounderTime  v-else-if="judgeIsShow(data.name) && data.type === 'founderTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+	<!--修改时间-->
+	<EditTime v-else-if="judgeIsShow(data.name) && data.type === 'editTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+	<!--关联表单-->
+	<AssociatedForms  v-else-if="judgeIsShow(data.name) && data.type === 'associatedForms' && type != 4" :data="data" :form-props="formProps" :tablekey="props.tablekey" />
+
+	<VideoUpAndPlay  v-else-if="judgeIsShow(data.name) && data.type === 'videoUpAndPlay' " :data="data" />
+
+
+	<LowcodeTransfer  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeTransfer' && type != 4" :data="data" />
+				
+				<LowcodeCarsusel  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeCarsusel'" :data="data" />
+				<SignatureMap  v-else-if="judgeIsShow(data.name) && data.type === 'signaturemap' && type != 4" :data="data" />
+
+				
+				
+				<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
+				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
+
+	<el-form-item
+		v-bind="data.item"
+		v-if="judgeIsShow(data.name) && type === 4 &&  data.type == 'digitpage'"
+		:disabled="judgeIsDisabled(data.name)"
+		:prop="tProp || data.name"
+		:class="config.className"
+		:rules="itemRules as any"
+		:label="getLabel(data.item as FormItem)"
+	>
+			<div class="form-value"  v-html="value">
+			</div>
+	</el-form-item>
+
+	<el-form-item
+		v-bind="data.item"
+		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
+		:disabled="judgeIsDisabled(data.name)"
+		:prop="tProp || data.name"
+		:class="config.className"
+		:rules="itemRules as any"
+		:label="getLabel(data.item as FormItem)"
+	>
+	
+		<template #label v-if="config.help">
+			<span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
+			<Tooltips :content="config.help" />
+		</template>
+		<template #label v-else>
+			<span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
+			{{editDisabled}}
+		</template>
+		<template class="form-value" v-if="type === 4">
+	
+			<div class="form-value" v-if="data.type === 'datePicker'" v-html="timeToString(value,data.control.type)">
+
+			</div>
+			<div class="form-value" v-else-if="data.type == 'timePicker'" v-html="timeToString(value,'timeCalss')">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'radio'" v-html="judgeRadio(value,data.options)">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'checkbox'" v-html="judgeCheckbox(value,data.options)">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'colorPicker'" >
+				<div :style="'width:20px; height:20px; background-color:'+value+';'"></div>
+			</div>
+			<div class="form-value" v-else-if="data.type == 'slider'" style="width:200px;" >
+				<el-slider v-model="value" disabled />
+			</div>
+			<div class="form-value" v-else-if="data.type == 'rate'" >
+				<el-rate  v-model="value" disabled  />
+			</div>
+			<div class="form-value" v-else-if="data.type == 'switch'" >
+				<el-switch
+					v-model="value"
+					:active-value="data.control.activeValue"
+					:inactive-value="data.control.inactiveValue"
+					disabled 
+				/>
+			</div>
+			<div class="form-value" v-else-if="data.type == 'select'" v-html="selectValue(value,data.options)">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'upload'" v-html="value">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'tinymce'"  v-html="value">
+			
+			</div>
+			<template class="form-value" v-else-if="data.type == 'signaturemap'" >
+				<el-image style="width: 100%; height: 100%" :src="value"  />
+			</template>
+			<div class="form-value" v-else-if="data.type == 'lowcodeTransfer'"  v-html="value">
+			</div>
+			<div class="form-value" v-else-if="data.type == 'baidumap'" style="width: 100%;" >
+				<BaiduMapLook :address="value" />
+			</div>
+			<div class="form-value" v-else-if="data.type == 'expand-user'" v-html="pickUserVal(value)">
+				
+			</div>
+			<div class="form-value" v-else  v-html="value">
+			</div>
+		</template>
+		<template v-else>
+	
+			<el-input
+				v-bind="control"
+				v-model="value"
+				:disabled="judgeIsDisabled(data.name)"
+				:type="data.type === 'password' ? 'password' : 'text'"
+				:style="getFormItemInputStyle(configStyle,2)"
+        		:input-style="getFormItemInputStyle(configStyle,3)"
+				v-if="['input', 'password'].includes(data.type)"
+				:placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"
+				
+			>
+				<template #prepend v-if="config.prepend">
+					<div v-if="getInputSlot('p')">
+						<AKSelect
+							:data="getInputSlot('p')"
+							:disabled="judgeIsDisabled(data.name)"
+							:transform-option="transformOption"
+							@change="inputSlotChange"
+							type="slot"
+						/>
+					</div>
+					<span v-else>{{ config.prepend }}</span>
+				</template>
+				<template #append v-if="config.append">
+					<div v-if="getInputSlot()">
+						<AKSelect
+							:data="getInputSlot()"
+							:disabled="judgeIsDisabled(data.name)"
+							:transform-option="transformOption"
+							type="slot"
+							@change="inputSlotChange"
+						/>
+					</div>
+					<span v-else>{{ config.append }}</span>
+				</template>
+				
+			</el-input>
+			<el-input
+				v-bind="control"
+				v-model="value"
+				:disabled="judgeIsDisabled(data.name)"
+				type="textarea"
+				:placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"
+				:style="getFormItemInputStyle(configStyle,2)"
+        		:input-style="getFormItemInputStyle(configStyle,3)"
+				v-if="['textarea', 'description'].includes(data.type)"
+			/>
+			<el-radio-group
+				v-bind="control"
+				:disabled="judgeIsDisabled(data.name)"
+				v-model="value"
+				v-if="data.type === 'radio'"
+				:style="getFormItemInputStyle(configStyle,4)"
+			>
+				<el-radio
+					:key="index"
+					:label="transformOption(item.value)"
+					v-for="(item, index) in props.data.options"
+					
+				>
+					<span :style="getFormItemInputStyle(configStyle,5)">{{ item.label }}</span>
+				</el-radio>
+			</el-radio-group>
+			<el-checkbox-group
+				v-bind="control"
+				:disabled="judgeIsDisabled(data.name)"
+				v-model="value"
+				v-if="data.type === 'checkbox'"
+				:style="getFormItemInputStyle(configStyle,4)"
+			>
+				<el-checkbox
+					v-for="(item, index) in props.data.options"
+					:key="index"
+					:label="transformOption(item.value)"
+				>
+				<span :style="getFormItemInputStyle(configStyle,5)">{{ item.label }}</span>
+				</el-checkbox>
+			</el-checkbox-group>
+			<AKSelect
+				v-if="
+				data.type === 'select' || (type === 5 && data.type === 'inputSlot')
+				"
+				:data="data"
+				:disabled="judgeIsDisabled(data.name)"
+				v-model="value"
+				:options="props.data.options"
+				:remote-method="getAxiosOptions"
+				:transformOption="transformOption"
+				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
+			/>
+			<el-upload
+				class="upload-style"
+				v-if="data.type === 'upload'"
+				:action="uploadUrl"
+				v-bind="control"
+				:name="control.file || 'file'"
+				:disabled="judgeIsDisabled(data.name)"
+				:file-list="fileList as any"
+				:class="{limit: control.limit <= fileList.length}"
+				:on-error="uploadError"
+				:on-success="uploadSuccess"
+				:on-remove="uploadRemove"
+			>
+				<i class="icon-plus" v-if="control?.listType=='picture-card'"></i>
+				<el-button type="primary" plain v-else-if="control?.listType=='picture'">
+						<span v-if="config?.btnText">{{ config?.btnText }} </span>
+						<span class="fa fa-plus" v-else></span>
+				</el-button>
+				<template v-else>
+					<el-button type="primary" plain v-if="config?.btnText">
+						{{ config?.btnText }} 
+					</el-button>
+					<i class="icon-plus" v-else></i>
+				</template>
+				<template #tip v-if="config?.tip">
+					<div class="el-upload__tip">
+						{{ config?.tip }}
+					</div>
+				</template>
+			</el-upload>
+			<component
+				v-if="['cascader', 'treeSelect'].includes(data.type)"
+				:is="currentComponent"
+				v-bind="control"
+				:disabled="judgeIsDisabled(data.name)"
+				:options="options"
+				v-model="value"
+			/>
+			<el-time-picker v-if="data.type=='timePicker'" v-model="value" value-format="x" :placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)" />
+			<component
+				v-if="
+				[
+					'rate',
+					'slider',
+					'switch',
+					'inputNumber',
+					'colorPicker',
+					
+					'datePicker',
+					'component',
+					'expand-user'
+				].includes(data.type)
+				"
+				:is="currentComponent"
+				v-bind="control"
+				:disabled="judgeIsDisabled(data.name)"
+				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
+				v-model="value"
+			/>
+			
+				
+				
+				<!--所属部门-->
+				
+				
+				
+				
+				
+				
+			
+			<template v-if="data.type === 'tinymce'">
+				<!--  设计模式时拖动会出现异常，设计模式暂用图片代替-->
+				
+				<div class="app-container" v-if="[1, 2, 3].includes(type as number)">
+					<editor  v-if="[1, 2, 3].includes(type as number)" v-bind="control" v-model="value" :disabled="judgeIsDisabled(data.name)" style="height: 500px" />
+				</div>
+				<img
+					alt=""
+					:src="TextImg"
+					v-if="type === 5"
+					style="max-width: 100%"
+				/>
+			</template>
+		</template>
+  	</el-form-item>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index 18108dd..75f39d0 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -273,7 +273,7 @@ const jsuanKuandu = () => {
 						:after-submit="afterSubmit"
 						:submit-edit="submitEdit"
 					/>
-					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史3记录</el-divider>
+					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
 					<el-timeline style="width: 100%">
 						<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
 							<el-card>
@@ -337,7 +337,7 @@ const jsuanKuandu = () => {
 				:send-draft-submit= "sendDraftSubmit"
 				:submit-edit="submitEdit"
 			/>
-			<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史3记录</el-divider>
+			<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
 			<el-timeline style="width: 100%">
 				<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
 					<el-card >
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 6c5cc9f..280a3bf 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -287,6 +287,7 @@ const getListData = (page?: number) => {
 	if (page) {
       	state.currentPage = page
     }
+	console.log("筛选查询列表数据--->",page)
 	getPageData()
 }
 watch(()=>props.lookPageIsShow,(val:boolean)=>{
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
index 9814f53..fdd2609 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
@@ -62,6 +62,7 @@ const state = reactive<any>({
     id: 0,
     loading: true
 })
+
 const emits = defineEmits(["update:isopen","searchquery","optionsValue3Get4"]);
 const drawerOpenOrClose =   computed({
 	get: () => props.isopen,
@@ -352,6 +353,7 @@ const afterSubmit = (type: string,val?:any) => {
 	// console.log("表单提交成功------------------>",type,val)
 	// console.log("流程------------------>",flowMap)
 	if (type === 'success') {
+		emits("searchquery")
 		if(isFlowTable.value){
 			if(val.code == 0){
 				if(val.data){
@@ -396,6 +398,7 @@ const closeAppSubmit = () =>{
 */
 const saveDraftPage = (type: string,val?:any) => {
 	if (type === 'success') {
+		emits("searchquery")
 		if(isFlowTable.value){
 			if(val.code == 0){
 				let sendInfo ={
diff --git a/src/widget/lowcodeimage/lowcodeImage.vue b/src/widget/lowcodeimage/lowcodeImage.vue
index 134c2e9..843f5a8 100644
--- a/src/widget/lowcodeimage/lowcodeImage.vue
+++ b/src/widget/lowcodeimage/lowcodeImage.vue
@@ -209,7 +209,7 @@ watch(() =>props.imgUrl,(val)=>{
 	<div>
 <!-- <img v-if="url!=errimg" referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" /> -->
 	<el-upload
-	
+		v-bind="$props"
     class="upload-demo"
     :action="uploadUrl"
 
diff --git a/src/widget/org/cont.vue b/src/widget/org/cont.vue
new file mode 100644
index 0000000..157864e
--- /dev/null
+++ b/src/widget/org/cont.vue
@@ -0,0 +1,46 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-12 14:41:53
+@ 备注: 获取行政组织数据
+-->
+<script lang='ts' setup>
+import { getgovcont } from '@/api/hr/org/index'
+const props = defineProps({
+	orgid:{
+		type: String,
+		default:""
+	}
+})
+const orgName = ref("")
+//选择行政组织
+const pickOrgVal = (val:any) => {
+
+	if(val != "" && val != null){
+		
+		getgovcont({id:val*1,idstr:val})
+		 	.then(({data}) =>{
+		 		// console.log("选择行政组织-3->",data,data.name)
+				orgName.value =  data.name
+		 	})
+		 	.finally(()=>{
+
+		 	})
+	}
+}
+onBeforeMount(() => {
+	pickOrgVal(props.orgid)
+})
+onMounted(() => {
+	pickOrgVal(props.orgid)
+});
+watch(() =>props.orgid,(val:string) => {
+	// console.log("选择行政组织-4->",val)
+	pickOrgVal(val)
+})
+</script>
+<template>
+	<div>{{ orgName }}</div>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/widget/videoupload/videoUploadPlay.vue b/src/widget/videoupload/videoUploadPlay.vue
index 64afe2a..c51cefb 100644
--- a/src/widget/videoupload/videoUploadPlay.vue
+++ b/src/widget/videoupload/videoUploadPlay.vue
@@ -5,14 +5,15 @@
     :src="data?.control.videoMsg[0].url"
     :loop="data?.control.videoMsg[0].loop"
     :autoplay="data?.control.videoMsg[0].videoAutoPlay"
-    :style="{height:heightVal,width:widthtVal}"
+
+		:style="getFormItemInputStyle(configStyle,2)"
     controls
     >
   </video>
 </template>
 
 <script setup lang="ts">
-
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
 
 const props = defineProps({
   // eslint-disable-next-line vue/require-default-prop
@@ -20,7 +21,10 @@ const props = defineProps({
     type: Object,
   }
 })
-
+const configStyle = computed(() => {
+	console.log("视频宽度",props.data)
+    return props.data.styles || {}
+})
 const videoHeight = props.data?.control.videoMsg[0].videoHeight+'px'
 
 const videoWidth = props.data?.control.videoMsg[0].videoWidth+'px'
@@ -40,6 +44,13 @@ watch(()=>props.data?.control.videoMsg[0], (val:any) => {
 },{
   deep: true,
 })
+
+const getFormItemInputStyle = (ele: any,sty:number) => {
+    if(ele?.inputStyle){
+      console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
+      return AnalysisInputCss(ele?.inputStyle,sty)
+    }
+}
 </script>
 
 <style scoped></style>