diff --git a/src/api/DesignForm/fieldUnit.ts b/src/api/DesignForm/fieldUnit.ts
index 70aedaf..903c2bf 100644
--- a/src/api/DesignForm/fieldUnit.ts
+++ b/src/api/DesignForm/fieldUnit.ts
@@ -4,3 +4,4 @@ export const orgUnit = ["org"]
 export const choiceUnit = ["radio"]
 export const switchUnit = ["switch"]
 export const checkboxUnit = ["checkbox"]
+export const orgDeptUnit = ["deptOrg"]
diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 7c72b31..023db0e 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -3,371 +3,401 @@
 @ 时间: 2024-06-03 13:43:43
 @ 备注: 表格
 -->
-<script lang='ts' setup>
-import '@/assets/scss/element-var.scss'
-import '@/assets/scss/index.scss'
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { FormData,FormList,FormDataStyle } from '@/api/DesignForm/types'
-import { useRoute, useRouter } from 'vue-router'
-import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types'
+<script lang="ts" setup>
+import "@/assets/scss/element-var.scss";
+import "@/assets/scss/index.scss";
 import {
-    constGetControlByName,
-    constSetFormOptions,
-    constFormBtnEvent,
-    constControlChange,
-    constFormProps,
-    appendOrRemoveStyle
-} from '@/api/DesignForm/utils'
-import formatResult from '@/utils/DesignForm/formatResult'
-import formChangeValue from '@/utils/DesignForm/formChangeValue'
-import { judgeSubmitCancel,gainRunFlowStart,startRunFlow,saveDraftAgain,afreshAppSubmit } from '@/api/DesignForm/requestapi'
-import { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const'
-import { jsonParseStringify } from '@/utils/DesignForm'
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+import { FormData, FormList, FormDataStyle } from "@/api/DesignForm/types";
+import { useRoute, useRouter } from "vue-router";
+import { nodeFlow, conditionInfo, nodelPeoples } from "@/api/taskapi/types";
+import {
+  constGetControlByName,
+  constSetFormOptions,
+  constFormBtnEvent,
+  constControlChange,
+  constFormProps,
+  appendOrRemoveStyle,
+} from "@/api/DesignForm/utils";
+import formatResult from "@/utils/DesignForm/formatResult";
+import formChangeValue from "@/utils/DesignForm/formChangeValue";
+import {
+  judgeSubmitCancel,
+  gainRunFlowStart,
+  startRunFlow,
+  saveDraftAgain,
+  afreshAppSubmit,
+} from "@/api/DesignForm/requestapi";
+import {
+  notAsA_BasisForJudgment,
+  asAnApprovalActionControl,
+  fixedValueControl,
+  timeControl,
+  timeEquation,
+  submitButton,
+  afreshSubmitButton,
+} from "@/utils/workflow/const";
+import { jsonParseStringify } from "@/utils/DesignForm";
 //通用提交
-import { currencyFormApiSubmit,realTimeUpdateFlow,createAppTask } from '@/api/taskapi/management'
+import {
+  currencyFormApiSubmit,
+  realTimeUpdateFlow,
+  createAppTask,
+} from "@/api/taskapi/management";
 
-import FormGroup from '@/components/DesignForm/public/form/formGroup.vue'
-import FlowStep from '@/views/taskplatform/taskmanagement/flowStep.vue'
+import FormGroup from "@/components/DesignForm/public/form/formGroup.vue";
+import FlowStep from "@/views/taskplatform/taskmanagement/flowStep.vue";
 
 const props = withDefaults(
-	defineProps<{
-		formData: FormData
-		type?: number // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
-		numrun?: number	//1：获取；非1：不变
-		disabled?: boolean // 禁用表单提交
-		requestUrl?: string // 编辑数据请求url
-		beforeRequest?: Function // 请求编辑数据前参数处理方法，可对请求参数处理
-		afterResponse?: Function | string // 请求数据加载完成后数据处理方法，可对返回数据处理
-		addUrl?: string // 表单数据新增提交保存url
-		editUrl?: string // 表单数据修改保存提交url
-		beforeSubmit?: Function | string // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
-		afterSubmit?: Function // 表单提交后，默认提示提交结果，可return false阻止提示
-		closeAppSubmit?: Function	//关闭拉窗
-		changeKeyVal?: Function //监听表单值该表
-		anewSubmit?: Function	//重新提交表单
-		saveDraftPage?: Function	//保存草稿
-		saveEditFormInfo?: Function //保存草稿  只改表单不操作流程
-		sendDraftSubmit?: Function //草稿提交审批
-		submitEdit?: Function //提交修改数据申请
-		value?: { [key: string]: any } // 表单初始值，同setValue
-		options?: { [key: string]: any } // 表单组件选项，同setOptions
-		dict?: object // 固定匹配的字典
-		isSearch?: boolean // 列表里作为筛选使用
-		isWorkFlow?: number //
-		flowkey?: string //
-		groupid?: string //
-		signCode?: string //
-		versionId?: string //
-		mastesformjson?: string //
-	}>(),
-	{
-		type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
-		numrun:2,
-		formData: () => {
-			return {
-				list: [],
-				form: {},
-				config: {
-					style:''
-				},
-				styles:{
-					divStyle:{},
-					labelStyle:{},
-					inputStyle:{}
-				}
-			}
-		},
-		dict: () => {
-			return {}
-		},
-		isSearch: false,
-		issave:{
-			type:Boolean,
-			default:true
-		},
-		isWorkFlow:2,
-		flowkey:"",
-		groupid:"",
-		signCode:"",
-		mastesformjson:"",
-	}
-)
+  defineProps<{
+    formData: FormData;
+    type?: number; // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun?: number; //1：获取；非1：不变
+    disabled?: boolean; // 禁用表单提交
+    requestUrl?: string; // 编辑数据请求url
+    beforeRequest?: Function; // 请求编辑数据前参数处理方法，可对请求参数处理
+    afterResponse?: Function | string; // 请求数据加载完成后数据处理方法，可对返回数据处理
+    addUrl?: string; // 表单数据新增提交保存url
+    editUrl?: string; // 表单数据修改保存提交url
+    beforeSubmit?: Function | string; // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
+    afterSubmit?: Function; // 表单提交后，默认提示提交结果，可return false阻止提示
+    closeAppSubmit?: Function; //关闭拉窗
+    changeKeyVal?: Function; //监听表单值该表
+    anewSubmit?: Function; //重新提交表单
+    saveDraftPage?: Function; //保存草稿
+    saveEditFormInfo?: Function; //保存草稿  只改表单不操作流程
+    sendDraftSubmit?: Function; //草稿提交审批
+    submitEdit?: Function; //提交修改数据申请
+    value?: { [key: string]: any }; // 表单初始值，同setValue
+    options?: { [key: string]: any }; // 表单组件选项，同setOptions
+    dict?: object; // 固定匹配的字典
+    isSearch?: boolean; // 列表里作为筛选使用
+    isWorkFlow?: number; //
+    flowkey?: string; //
+    groupid?: string; //
+    signCode?: string; //
+    versionId?: string; //
+    mastesformjson?: string; //
+  }>(),
+  {
+    type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun: 2,
+    formData: () => {
+      return {
+        list: [],
+        form: {},
+        config: {
+          style: "",
+        },
+        styles: {
+          divStyle: {},
+          labelStyle: {},
+          inputStyle: {},
+        },
+      };
+    },
+    dict: () => {
+      return {};
+    },
+    isSearch: false,
+    issave: {
+      type: Boolean,
+      default: true,
+    },
+    isWorkFlow: 2,
+    flowkey: "",
+    groupid: "",
+    signCode: "",
+    mastesformjson: "",
+  }
+);
 
 const emits = defineEmits<{
-	(e: 'btnClick', type: string): void
-	(e: 'change', val: any): void // 表单组件值发生变化时
-	(e: 'update:issave', type: boolean): void
-	(e: 'closePage', type: string): void
-	(e: 'optionsValue3Get3', val: any,fieldName: string): void 
-}>()
+  (e: "btnClick", type: string): void;
+  (e: "change", val: any): void; // 表单组件值发生变化时
+  (e: "update:issave", type: boolean): void;
+  (e: "closePage", type: string): void;
+  (e: "optionsValue3Get3", val: any, fieldName: string): void;
+}>();
 
-const route = useRoute()
-const router = useRouter()
-const loading = ref(false)
+const route = useRoute();
+const router = useRouter();
+const loading = ref(false);
+const formLoading = ref(false);
 //工作流相关
-const flowLoading = ref(false) //loading
-const flowFactor = reactive<conditionInfo[]>([])	//表单组件
-const flowMap = ref<any[]>();			//工作流
+const flowLoading = ref(false); //loading
+const flowFactor = reactive<conditionInfo[]>([]); //表单组件
+const flowMap = ref<any[]>(); //工作流
 const nextStep = ref<number>(0);
-const currentProgress  = ref<number>(1);
-const nodeKey = ref<string>('');
-const ruleForm = ref();	//表单
+const currentProgress = ref<number>(1);
+const nodeKey = ref<string>("");
+const ruleForm = ref(); //表单
 //获取工作流条件
 const gainFlowChart = reactive<nodeFlow>({
-	id:props.flowkey
-})
-const nodelUserList = reactive<nodelPeoples[]>([])
+  id: props.flowkey,
+});
+const nodelUserList = reactive<nodelPeoples[]>([]);
 
-let timer = 0
-let eventName = ''
-let getValueEvent = ''
+let timer = 0;
+let eventName = "";
+let getValueEvent = "";
 
 const dictForm = computed(() => {
-    const storage = window.localStorage.getItem('akFormDict')
-    let storageDict = {}
-    if (storage) {
-      	storageDict = JSON.parse(storage)
-    }
-    // 全局的、当前表单配置的以及接口返回的
-    return Object.assign({}, storageDict, props.dict, resultDict.value)
-})
+  const storage = window.localStorage.getItem("akFormDict");
+  let storageDict = {};
+  if (storage) {
+    storageDict = JSON.parse(storage);
+  }
+  // 全局的、当前表单配置的以及接口返回的
+  return Object.assign({}, storageDict, props.dict, resultDict.value);
+});
 // 表单参数
 const formProps = computed(() => {
-    return {
-		model: model.value,
-		type: props.type,
-		hideField: props.formData.config?.hideField as [],
-		showColon: props.formData.form.showColon,
-		dict: dictForm.value
-    }
-})
+  return {
+    model: model.value,
+    type: props.type,
+    hideField: props.formData.config?.hideField as [],
+    showColon: props.formData.form.showColon,
+    dict: dictForm.value,
+  };
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:47:53
 @ 功能: 重置表单
 */
 const resetFields = () => {
-	if(ruleForm.value){
-		ruleForm.value.resetFields()
-	}
-    
-}
-provide(constFormProps, formProps)
-
+  if (ruleForm.value) {
+    ruleForm.value.resetFields();
+  }
+  formLoading.value = false;
+};
+provide(constFormProps, formProps);
 
 // 设置全局事件结束
-const resultDict = ref({})
+const resultDict = ref({});
 // 处理表单值开始
-const model = ref<any>({})
+const model = ref<any>({});
 
 //监听是否为流程表单
-watch(()=>props.isWorkFlow,(val:number)=>{
-	// console.log("监听是否为流程表单----->",val,formProps)
-	if(val == 1){
-		getFlowInitSwps()
-	}
-	
-})
+watch(
+  () => props.isWorkFlow,
+  (val: number) => {
+    // console.log("监听是否为流程表单----->",val,formProps)
+    if (val == 1) {
+      getFlowInitSwps();
+    }
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-10 10:21:15
 @ 功能: 获取流程
 */
 const getFlowInitSwps = () => {
-	gainRunFlowStart({id:props.flowkey})
-		.then(({data})=>{
-			console.log("获取流程",data)
-			flowMap.value = data.flowList
-			nextStep.value = data.nextStep
-			currentProgress.value = data.Step
-			gainFlowChart.id = props.flowkey
-			nodeKey.value = data.nodeKey
-			flowLoading.value = false;
-		})
-}
+  gainRunFlowStart({ id: props.flowkey }).then(({ data }) => {
+    console.log("获取流程", data);
+    flowMap.value = data.flowList;
+    nextStep.value = data.nextStep;
+    currentProgress.value = data.Step;
+    gainFlowChart.id = props.flowkey;
+    nodeKey.value = data.nodeKey;
+    flowLoading.value = false;
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 11:19:30
 @ 功能:  提供一个方法，用于根据name从formData.list里查找数据
 */
 const getNameForEach = (data: any, name: string) => {
-	let temp = {}
-	for (const key in data) {
-		const dataKey = data[key]
-		if (dataKey.name === name) {
-			return dataKey
-		}
-		if (['grid', 'tabs'].includes(dataKey.type)) {
-			dataKey.columns.forEach((co: any) => {
-				temp = getNameForEach(co.list, name)
-			})
-		}
-		if (['card', 'div'].includes(dataKey.type)) {
-			temp = getNameForEach(dataKey.list, name)
-		}
-	}
-	return temp
-}
+  let temp = {};
+  for (const key in data) {
+    const dataKey = data[key];
+    if (dataKey.name === name) {
+      return dataKey;
+    }
+    if (["grid", "tabs"].includes(dataKey.type)) {
+      dataKey.columns.forEach((co: any) => {
+        temp = getNameForEach(co.list, name);
+      });
+    }
+    if (["card", "div"].includes(dataKey.type)) {
+      temp = getNameForEach(dataKey.list, name);
+    }
+  }
+  return temp;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 09:31:40
 @ 功能: 注册win事件
 */
 const setWindowEvent = (bool?: boolean) => {
-	if (props.formData.list.length > 0) {
-		const formName = props.formData.form?.name
-		if (!formName) {
-			return
-		}
-		eventName = `get${formName}ControlByName`
-		getValueEvent = `get${formName}ValueByName`
-		
-		if (formName && (!window[eventName as any] || !bool)) {
-			// 根据name获取当前数据项
-			// @ts-ignore
-			window[eventName] = (name: string) => {
-				return getNameForEach(props.formData.list, name)
-			}
-			// 根据name获取当前项的值
-			// @ts-ignore
-			window[getValueEvent] = (name: string) => {
-				return model.value[name]
-			}
-		}
-		
-	}
-}
-setWindowEvent()
+  if (props.formData.list.length > 0) {
+    const formName = props.formData.form?.name;
+    if (!formName) {
+      return;
+    }
+    eventName = `get${formName}ControlByName`;
+    getValueEvent = `get${formName}ValueByName`;
+
+    if (formName && (!window[eventName as any] || !bool)) {
+      // 根据name获取当前数据项
+      // @ts-ignore
+      window[eventName] = (name: string) => {
+        return getNameForEach(props.formData.list, name);
+      };
+      // 根据name获取当前项的值
+      // @ts-ignore
+      window[getValueEvent] = (name: string) => {
+        return model.value[name];
+      };
+    }
+  }
+};
+setWindowEvent();
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 13:16:50
 @ 功能: 检测表单是否有变动
 */
-watch(() => props.formData,() => {
-	emits('update:issave', false)
-},{ deep: true })
+watch(
+  () => props.formData,
+  () => {
+    emits("update:issave", false);
+  },
+  { deep: true }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 13:20:01
 @ 功能: 监听表单样式变化
 */
-watch(() => props.formData.config,()=>{
-	if (timer < 2) {
-		setWindowEvent() // 简单判断下，这里不是每次都更新
-	}
-	timer++
-	appendRemoveStyle(true) // 更新样式
-},{ deep: true });
+watch(
+  () => props.formData.config,
+  () => {
+    if (timer < 2) {
+      setWindowEvent(); // 简单判断下，这里不是每次都更新
+    }
+    timer++;
+    appendRemoveStyle(true); // 更新样式
+  },
+  { deep: true }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 13:32:57
 @ 功能: 追加移除style样式
 */
 const appendRemoveStyle = (type?: boolean) => {
-	try {
-		const {
-			config:{ style }
-		} = props.formData
-		appendOrRemoveStyle('formStyle', style || '', type)
-	} catch (e) {
-      /* empty */
-    }
-}
+  try {
+    const {
+      config: { style },
+    } = props.formData;
+    appendOrRemoveStyle("formStyle", style || "", type);
+  } catch (e) {
+    /* empty */
+  }
+};
 const getControlByName = (name: string) => {
-    return getNameForEach(props.formData.list, name)
-}
-provide(constGetControlByName, getControlByName)
+  return getNameForEach(props.formData.list, name);
+};
+provide(constGetControlByName, getControlByName);
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:14:24
 @ 功能: DOM挂载完毕时执行
 */
 onMounted(() => {
-	getInitModel()
-	nextTick(() => {
-		gainFlowChart.id = props.flowkey
-		appendRemoveStyle(true)
-		if(props.isWorkFlow==1){
-			getFlowInitSwps()
-		}
-		
-	})
-	getAsfs()
-})
+  getInitModel();
+  nextTick(() => {
+    gainFlowChart.id = props.flowkey;
+    appendRemoveStyle(true);
+    if (props.isWorkFlow == 1) {
+      getFlowInitSwps();
+    }
+  });
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:17:05
 @ 功能: 获取表单初始model
 */
 const getInitModel = () => {
-	const obj = {}
-    forEachGetFormModel(props.formData.list, obj)
-	// console.log("obj===>",obj)
-	// console.log("obj===>",props.formData.list)
-    model.value = obj
-}
+  const obj = {};
+  forEachGetFormModel(props.formData.list, obj);
+  // console.log("obj===>",obj)
+  // console.log("obj===>",props.formData.list)
+  model.value = obj;
+};
 watch(
-    () => props.formData.list,
-    () => {
-		// formData从接口获取时
-		getInitModel()
-    }
-)
+  () => props.formData.list,
+  () => {
+    // formData从接口获取时
+    getInitModel();
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:18:03
 @ 功能: 从表单数据里提取表单所需的model
 */
 const forEachGetFormModel = (list: FormList[], obj: any) => {
-	list.forEach((item: any) => {
-		if (['table', 'flex'].includes(item.type)) {
-			obj[item.name] = jsonParseStringify(item.tableData)
-		} else if (['grid', 'tabs'].includes(item.type)) {
-			item.columns.forEach((col: any) => {
-				forEachGetFormModel(col.list, obj)
-			})
-		} else if (['card', 'div'].includes(item.type)) {
-			forEachGetFormModel(item.list, obj)
-		} else {
-			const excludeType = ['title', 'divider', 'txt', 'button']
-			if (excludeType.indexOf(item.type) === -1) {
-				obj[item.name] = jsonParseStringify(item.control.modelValue)
-			}
-		}
-	})
-}
+  list.forEach((item: any) => {
+    if (["table", "flex"].includes(item.type)) {
+      obj[item.name] = jsonParseStringify(item.tableData);
+    } else if (["grid", "tabs"].includes(item.type)) {
+      item.columns.forEach((col: any) => {
+        forEachGetFormModel(col.list, obj);
+      });
+    } else if (["card", "div"].includes(item.type)) {
+      forEachGetFormModel(item.list, obj);
+    } else {
+      const excludeType = ["title", "divider", "txt", "button"];
+      if (excludeType.indexOf(item.type) === -1) {
+        obj[item.name] = jsonParseStringify(item.control.modelValue);
+      }
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:15:55
 @ 功能: 销毁完毕
 */
 onUnmounted(() => {
-	if (eventName) {
-		window[eventName] = ''
-	}
-	resetFields()
-	appendRemoveStyle()
-	
-})
+  if (eventName) {
+    window[eventName] = "";
+  }
+  resetFields();
+  appendRemoveStyle();
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:45:25
 @ 功能: 对表单选择项快速设置
 */
-const setFormOptions = ref({})
-provide(constSetFormOptions, setFormOptions)
+const setFormOptions = ref({});
+provide(constSetFormOptions, setFormOptions);
 const setOptions = (obj: { [key: string]: string[] }) => {
-    setFormOptions.value = obj
-}
+  setFormOptions.value = obj;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:46:13
 @ 功能: 表单options设置
 */
-watch(() => props.options,(val:any) => {
-	val && setOptions(vval)
-})
-
+watch(
+  () => props.options,
+  (val: any) => {
+    val && setOptions(vval);
+  }
+);
 
 /**
 @ 作者: 秦东
@@ -375,412 +405,412 @@ watch(() => props.options,(val:any) => {
 @ 功能: 按钮组件事件
 */
 provide(constFormBtnEvent, (obj: any) => {
-	emits('btnClick', obj.key)
-    console.log("按钮组件事件-----2-------->",obj.key)                                
-	if ([3, 4, 5].includes(props.type)) {
-      	return ElMessage.error('当前模式不能提交表单')
-    }
-	switch (obj.key) {
-		case 'submit':			//新增提交
-			appFormSubmit();
-			break
-		case 'reset':
-			resetFields() // 重置表单
-			break
-		case 'cancel': // 取消返回，
-			let notReturn
-			if (typeof props.closeAppSubmit === 'function') {
-				notReturn = props.closeAppSubmit()
-			}
-			break
-		case 'saveDraft': //保存草稿		只保存表单不操作流程
-			saveDraft()
-			break
-		case 'saveEditDraft':	//修改草稿箱数据后，再次保存草稿箱
-			saveDraftAgainSend()
-			break
-		case 'afreshSubmit':	//重新提交流程
-			appAfreshSubmit()
-			break
-		case 'draftSubmit':	//草稿提交审批
-			
-			break
-		case 'submitEdit': //申请修改
-			
-			break
-		default:
-			break
-	}
-})
+  emits("btnClick", obj.key);
+  console.log("按钮组件事件-----2-------->", obj.key);
+  formLoading.value = true;
+  if ([3, 4, 5].includes(props.type)) {
+    return ElMessage.error("当前模式不能提交表单");
+  }
+  switch (obj.key) {
+    case "submit": //新增提交
+      appFormSubmit();
+      break;
+    case "reset":
+      resetFields(); // 重置表单
+      break;
+    case "cancel": // 取消返回，
+      let notReturn;
+      if (typeof props.closeAppSubmit === "function") {
+        notReturn = props.closeAppSubmit();
+      }
+      formLoading.value = false;
+      break;
+    case "saveDraft": //保存草稿		只保存表单不操作流程
+      saveDraft();
+      break;
+    case "saveEditDraft": //修改草稿箱数据后，再次保存草稿箱
+      saveDraftAgainSend();
+      break;
+    case "afreshSubmit": //重新提交流程
+      appAfreshSubmit();
+      break;
+    case "draftSubmit": //草稿提交审批
+      break;
+    case "submitEdit": //申请修改
+      break;
+    default:
+      break;
+  }
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-13 11:11:13
 @ 功能: app重新提交表单
 */
 const appAfreshSubmit = (params = {}) => {
-	let addUrl = props.formData.config?.addUrl || props.addUrl
-	// console.log("自定义App提交表单", props.addUrl)
-	if (props.isSearch || !addUrl || loading.value) {
-		if (!props.isSearch && !addUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		return
+  let addUrl = props.formData.config?.addUrl || props.addUrl;
+  // console.log("自定义App提交表单", props.addUrl)
+  if (props.isSearch || !addUrl || loading.value) {
+    if (!props.isSearch && !addUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			formatParams.versionId=props.versionId
-			formatParams.appKey=props.groupid
-			formatParams.status=1
-			formatParams.flowList=json2string(flowMap.value)
+    formLoading.value = false;
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 1;
+      formatParams.flowList = json2string(flowMap.value);
 
-			// console.log("submitParams--111->",submitParams )
-			// console.log("formatParams--111->",formatParams)
-			afreshAppSubmit(submitParams??formatParams)
-				.then((data:any)=>{
-					// console.log("app重新提交表单--112221->",data)
-					emits("closePage")
-				})
-		}
-	})
-}
+      // console.log("submitParams--111->",submitParams )
+      // console.log("formatParams--111->",formatParams)
+      afreshAppSubmit(submitParams ?? formatParams).then((data: any) => {
+        // console.log("app重新提交表单--112221->",data)
+        emits("closePage");
+        formLoading.value = false;
+      });
+      formLoading.value = false;
+    } else {
+      formLoading.value = false;
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-10 10:37:30
 @ 功能: 再次保存草稿箱
 */
 const saveDraftAgainSend = (params = {}) => {
-	let addUrl = props.formData.config?.addUrl || props.addUrl
-	// console.log("自定义App提交表单", props.addUrl)
-	if (props.isSearch || !addUrl || loading.value) {
-		if (!props.isSearch && !addUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		return
+  let addUrl = props.formData.config?.addUrl || props.addUrl;
+  // console.log("自定义App提交表单", props.addUrl)
+  if (props.isSearch || !addUrl || loading.value) {
+    if (!props.isSearch && !addUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			formatParams.versionId=props.versionId
-			formatParams.appKey=props.groupid
-			formatParams.status=1
-			
+    formLoading.value = false;
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 1;
 
-			// console.log("submitParams--111221->",submitParams )
-			// console.log("formatParams--1112222->",formatParams)
-			saveDraftAgain(submitParams??formatParams)
-				.then((data:any)=>{
-					// console.log("提交草稿数据--112221->",data)
-					emits("closePage")
-				})
-		}else{
-			afterSubmit('validate', fields)
-		}
-	})
-}
+      // console.log("submitParams--111221->",submitParams )
+      // console.log("formatParams--1112222->",formatParams)
+      saveDraftAgain(submitParams ?? formatParams).then((data: any) => {
+        // console.log("提交草稿数据--112221->",data)
+        emits("closePage");
+        formLoading.value = false;
+      });
+    } else {
+      afterSubmit("validate", fields);
+      formLoading.value = false;
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-06 15:51:16
 @ 功能: 保存草稿箱
 */
 const saveDraft = (params = {}) => {
-	let addUrl = props.formData.config?.addUrl || props.addUrl
-	// console.log("自定义App提交表单", props.addUrl)
-	if (props.isSearch || !addUrl || loading.value) {
-		if (!props.isSearch && !addUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		return
+  let addUrl = props.formData.config?.addUrl || props.addUrl;
+  // console.log("自定义App提交表单", props.addUrl)
+  if (props.isSearch || !addUrl || loading.value) {
+    if (!props.isSearch && !addUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			formatParams.versionId=props.versionId
-			formatParams.appKey=props.groupid
-			formatParams.status=1
-			
-
-			createAppTask(submitParams ?? formatParams)
-				.then((data:any) => {
-					// console.log("formatParams--111->",data)
-					
-					if(props.isWorkFlow == 1){
-						nextTick(() => {
-							let sendInfo ={
-								id:data.data.uuid,
-								flowList:flowMap.value,
-								state:1
-							}
-							startRunFlow(sendInfo)
-								.then((data:any)=>{
-									// console.log("流程提交成功--------1---------->",data)
-								})
-						})
-					}
-					afterSubmit('success', data)
-				})
-				.catch(res => {
-					afterSubmit('fail', res)
-				})
+    formLoading.value = false;
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 1;
 
-		}else{
-			afterSubmit('validate', fields)
-		}
+      createAppTask(submitParams ?? formatParams)
+        .then((data: any) => {
+          // console.log("formatParams--111->",data)
 
-	})
-}
+          if (props.isWorkFlow == 1) {
+            nextTick(() => {
+              let sendInfo = {
+                id: data.data.uuid,
+                flowList: flowMap.value,
+                state: 1,
+              };
+              startRunFlow(sendInfo).then((data: any) => {
+                // console.log("流程提交成功--------1---------->",data)
+              });
+            });
+          }
+          afterSubmit("success", data);
+          formLoading.value = false;
+        })
+        .catch((res) => {
+          afterSubmit("fail", res);
+          formLoading.value = false;
+        });
+    } else {
+      afterSubmit("validate", fields);
+      formLoading.value = false;
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 14:59:31
 @ 功能: 表单组件值改变事件 tProp为子表格相关
 */
 provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
-	let fieldVal =  {}
-	for(let i in model.value){
-		if(i == key){
-			fieldVal[i] = typeof value=="number"?value.toString():value;
-		}else{
-			fieldVal[i] = typeof model.value[i]=="number"?model.value[i].toString():model.value[i];
-		}
-		// console.log("监听表单--constControlChange----------1--------->",i,model.value[i])
-	}
-	//判断是否进行计算
-	if(type == "digitpage"){
-			let oldFormConfig = props.formData.config
-			let newFormConfig = props.formData.config.groupKey
-			let odlHideField = props.formData.config.hideField
-			console.log( props.formData)
-			delete  props.formData.config.groupKey
-			delete  props.formData.config.hideField
-			let sendInfo = {
-				"fieldKey":key,
-				"mathsFornula":props.formData.config,
-				"keyVal":fieldVal
-			}
-			// console.log("sendInfoe-1->",sendInfo)
-			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
-				.then((data:any)=>{
-					// console.log("结果-->",data)
-					let formatRes: any = data.data
-					// 比较适用通用表单，保存在服务端
-					const afterResponse = props.formData.events?.afterResponse
-					
-					if (typeof afterResponse === 'string' && afterResponse) {
-						formatRes = formatResult(result, afterResponse)
-					} else if (typeof afterResponse === 'function') {
-						formatRes = afterResponse(result) ?? result
-					}
-					// 比较适用于导出vue文件
-					if (typeof props.afterResponse === 'string' && props.afterResponse) {
-						formatRes = formatResult(result, props.afterResponse)
-					} else if (typeof props.afterResponse === 'function') {
-						formatRes = props.afterResponse(result) ?? result
-					}
-					if (formatRes === false) {
-						return
-					}
-					// console.log("停止数据请求--->",formatRes)
-					setValue(formatRes.result || formatRes)
-					nextTick(() => {
-						// 将dict保存，可用于从接口中设置表单组件options。
-						if (formatRes.dict && Object.keys(formatRes.dict).length) {
-							resultDict.value = formatRes.dict
-						}
-						props.formData.config.groupKey = newFormConfig
-						props.formData.config.hideField = odlHideField
-						console.log( props.formData)
-					})
-				})
-				.finally(()=>{
-					props.formData.config.groupKey = newFormConfig
-					props.formData.config.hideField = odlHideField
-					console.log( props.formData)
-				})
-	}
-	if (typeof props.changeKeyVal === 'function') {
-		props.changeKeyVal(key, value,type,attribute)
-	}
-	if(props.isWorkFlow == 1){
-		changeKeyVal(key, value,type,attribute) //值改变时，检测一下有没有触发流程分支条件
-	}
-	
-    if (key) {
-		if (!tProp) {
-			// 表格和弹性布局不是这里更新，只触change
-			model.value[key] = value
-		}
-		// 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
-		if (props.formData.events?.change) {
-			model.value = props.formData.events.change(key, model.value)
-		}
-		const onFormChange = props.formData.events?.change
-		if (onFormChange) {
-			if (typeof onFormChange === 'function') {
-				model.value = onFormChange(key, model.value)
-			} else {
-				model.value = formChangeValue(key, model.value, onFormChange)
-			}
-		}
-		// 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
-		emits('change', { key, value, model: model.value, data, tProp })
+  let fieldVal = {};
+  for (let i in model.value) {
+    if (i == key) {
+      fieldVal[i] = typeof value == "number" ? value.toString() : value;
+    } else {
+      fieldVal[i] =
+        typeof model.value[i] == "number" ? model.value[i].toString() : model.value[i];
     }
-})
+    // console.log("监听表单--constControlChange----------1--------->",i,model.value[i])
+  }
+  //判断是否进行计算
+  if (type == "digitpage") {
+    let oldFormConfig = props.formData.config;
+    let newFormConfig = props.formData.config.groupKey;
+    let odlHideField = props.formData.config.hideField;
+    console.log(props.formData);
+    delete props.formData.config.groupKey;
+    delete props.formData.config.hideField;
+    let sendInfo = {
+      fieldKey: key,
+      mathsFornula: props.formData.config,
+      keyVal: fieldVal,
+    };
+    // console.log("sendInfoe-1->",sendInfo)
+    currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations", sendInfo)
+      .then((data: any) => {
+        // console.log("结果-->",data)
+        let formatRes: any = data.data;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        // console.log("停止数据请求--->",formatRes)
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+          props.formData.config.groupKey = newFormConfig;
+          props.formData.config.hideField = odlHideField;
+          console.log(props.formData);
+        });
+      })
+      .finally(() => {
+        props.formData.config.groupKey = newFormConfig;
+        props.formData.config.hideField = odlHideField;
+        console.log(props.formData);
+      });
+  }
+  if (typeof props.changeKeyVal === "function") {
+    props.changeKeyVal(key, value, type, attribute);
+  }
+  if (props.isWorkFlow == 1) {
+    changeKeyVal(key, value, type, attribute); //值改变时，检测一下有没有触发流程分支条件
+  }
+
+  if (key) {
+    if (!tProp) {
+      // 表格和弹性布局不是这里更新，只触change
+      model.value[key] = value;
+    }
+    // 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
+    if (props.formData.events?.change) {
+      model.value = props.formData.events.change(key, model.value);
+    }
+    const onFormChange = props.formData.events?.change;
+    if (onFormChange) {
+      if (typeof onFormChange === "function") {
+        model.value = onFormChange(key, model.value);
+      } else {
+        model.value = formChangeValue(key, model.value, onFormChange);
+      }
+    }
+    // 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
+    emits("change", { key, value, model: model.value, data, tProp });
+  }
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-05 15:03:25
 @ 功能:  对表单设置初始值
 */
 const setValue = (obj: { [key: string]: any }, filter?: boolean) => {
-    // 分两种，false时将obj所有值合并到model，当obj有某些值不存于表单中，也会合并到model，当提交表单也会提交此值
-    // true则过滤没用的值，即存在当前表单的才合并
-    if (filter) {
-		for (const key in obj) {
-			if (model.value[key] !== undefined) {
-				model.value[key] = obj[key]
-			}
-		}
-    } else {
-      	model.value = Object.assign({}, model.value, jsonParseStringify(obj)) // 防止列表直接使用set方法对弹窗表单编辑，当重置表单时当前行数据被清空
+  // 分两种，false时将obj所有值合并到model，当obj有某些值不存于表单中，也会合并到model，当提交表单也会提交此值
+  // true则过滤没用的值，即存在当前表单的才合并
+  if (filter) {
+    for (const key in obj) {
+      if (model.value[key] !== undefined) {
+        model.value[key] = obj[key];
+      }
     }
-}
+  } else {
+    model.value = Object.assign({}, model.value, jsonParseStringify(obj)); // 防止列表直接使用set方法对弹窗表单编辑，当重置表单时当前行数据被清空
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-06 08:23:50
 @ 功能: 自定义App提交表单
 */
 const appFormSubmit = (params = {}) => {
-	let addUrl = props.formData.config?.addUrl || props.addUrl
-	// console.log("自定义App提交表单", props.addUrl)
-	if (props.isSearch || !addUrl || loading.value) {
-		if (!props.isSearch && !addUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		return
+  let addUrl = props.formData.config?.addUrl || props.addUrl;
+  // console.log("自定义App提交表单", props.addUrl)
+  if (props.isSearch || !addUrl || loading.value) {
+    if (!props.isSearch && !addUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	// console.log(params)
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			// console.log("params--->",params)
-			// console.log("fields--->",fields)
-			// console.log("自定义A2pp提交表单", formatParams)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			// console.log("beforeSubmit--->", beforeSubmit)
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			formatParams.versionId=props.versionId
-			formatParams.appKey=props.groupid
-			formatParams.status=2
-			console.log("提交表单-----------1------------>", submitParams)
-			console.log("提交表单-----------2------------>", formatParams)
+    formLoading.value = false;
+    return;
+  }
+  // console.log(params)
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      // console.log("params--->",params)
+      // console.log("fields--->",fields)
+      // console.log("自定义A2pp提交表单", formatParams)
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      // console.log("beforeSubmit--->", beforeSubmit)
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 2;
+      console.log("提交表单-----------1------------>", submitParams);
+      console.log("提交表单-----------2------------>", formatParams);
 
-			createAppTask(submitParams ?? formatParams)
-				.then((data:any) => {
-					// console.log("formatParams--111->",data)
-					
-					if(props.isWorkFlow == 1){
-						nextTick(() => {
-							let sendInfo ={
-								id:data.data.uuid,
-								flowList:flowMap.value,
-								state:3
-							}
-							startRunFlow(sendInfo)
-								.then((data:any)=>{
-									// console.log("流程提交成功--------1---------->",data)
-								})
-								.finally(() =>{
-									afterSubmit('success', data)
-								})
-						})
-					}else{
-						afterSubmit('success', data)
-					}
-					
-				})
-				.catch(res => {
-					afterSubmit('fail', res)
-				})
+      createAppTask(submitParams ?? formatParams)
+        .then((data: any) => {
+          // console.log("formatParams--111->",data)
 
-		}else{
-			afterSubmit('validate', fields)
-		}
-
-	})
-}
+          if (props.isWorkFlow == 1) {
+            nextTick(() => {
+              let sendInfo = {
+                id: data.data.uuid,
+                flowList: flowMap.value,
+                state: 3,
+              };
+              startRunFlow(sendInfo)
+                .then((data: any) => {
+                  // console.log("流程提交成功--------1---------->",data)
+                  formLoading.value = false;
+                })
+                .finally(() => {
+                  afterSubmit("success", data);
+                });
+            });
+          } else {
+            afterSubmit("success", data);
+          }
+          formLoading.value = false;
+        })
+        .catch((res) => {
+          afterSubmit("fail", res);
+          formLoading.value = false;
+        });
+    } else {
+      afterSubmit("validate", fields);
+      formLoading.value = false;
+    }
+  });
+};
 
 /**
 @ 作者: 秦东
@@ -788,460 +818,478 @@ const appFormSubmit = (params = {}) => {
 @ 功能: 不管成功失败，有事件时都需要执行回调
 */
 const afterSubmit = (type: string, res: any) => {
-	const afterSubmit = props.formData.events?.afterSubmit
-	let notReturn
-	if (typeof afterSubmit === 'function') {
-      	notReturn = afterSubmit(type, res)
-    } else if (typeof props.afterSubmit === 'function') {
-      	notReturn = props.afterSubmit(type, res)
-		//   console.log("notReturn--123456->",props.afterSubmit)
-    }
-	loading.value = false
-	if (notReturn === false) {
-		// 有返回false时则不提示
-		return
-    }
-    if (type === 'success') {
-      	ElMessage.success(res.msg || '保存成功！')
-    } else if (type === 'fail') {
-      	ElMessage.error(res.message || '保存失败！')
-    }
-	//不管结果，重置表单，防再次打开时保留上一次的值
-	resetFields()
-}
+  const afterSubmit = props.formData.events?.afterSubmit;
+  let notReturn;
+  if (typeof afterSubmit === "function") {
+    notReturn = afterSubmit(type, res);
+  } else if (typeof props.afterSubmit === "function") {
+    notReturn = props.afterSubmit(type, res);
+    //   console.log("notReturn--123456->",props.afterSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+  //不管结果，重置表单，防再次打开时保留上一次的值
+  resetFields();
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-06 09:14:16
 @ 功能: 表单检验方法
 */
 const validate = (callback: any) => {
-	ruleForm.value.validate((valid: boolean, fields: any) => {
-		let fieldValue = fields
-		if (valid) {
-			// 校验通过，返回当前表单的值
-			fieldValue = getValue()
-		}
-		callback(valid, fieldValue)
-	})
-}
+  ruleForm.value.validate((valid: boolean, fields: any) => {
+    let fieldValue = fields;
+    if (valid) {
+      // 校验通过，返回当前表单的值
+      fieldValue = getValue();
+    }
+    callback(valid, fieldValue);
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-06 09:17:29
 @ 功能: 提供一个取值的方法
 */
 const getValue = (filter?: boolean) => {
-	if (filter) {
-		const obj: any = {}
-		for (const key in model.value) {
-			// eslint-disable-next-line no-prototype-builtins
-			if (model.value.hasOwnProperty(key)) {
-				const val = (model.value as any)[key]
-				if (!/^\s*$/.test(val)) {
-					obj[key] = val
-				}
-			}
-		}
-		return obj
-    } else {
-		// console.log("getValue--->model-value->",model.value)
-      	return model.value
+  if (filter) {
+    const obj: any = {};
+    for (const key in model.value) {
+      // eslint-disable-next-line no-prototype-builtins
+      if (model.value.hasOwnProperty(key)) {
+        const val = (model.value as any)[key];
+        if (!/^\s*$/.test(val)) {
+          obj[key] = val;
+        }
+      }
     }
-}
+    return obj;
+  } else {
+    // console.log("getValue--->model-value->",model.value)
+    return model.value;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-13 16:06:26
 @ 功能: 关闭抽屉
 */
-const closePage = () =>{
-
-}
+const closePage = () => {};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-06 13:18:58
 @ 功能: 表单组件分析
 */
-const changeKeyVal = (key:any,val:any,type:any,attribute:any) => {
-	let unitsVal = val
-	let isUpdateFlowChart = false
-	//单选，多选，下拉菜单
-	if(notAsA_BasisForJudgment.indexOf(type) === -1){
-		let isWrite = true
-		flowFactor.forEach((item:any)=>{
-			if(item.factorid == key){
-				isWrite = false
-				
-				item.type=3
-				if(type == "checkbox"){
-					item.isCheckbox = true
-					item.answers = val.map(String)
-				}else{
-					item.isCheckbox = false
-					item.oneanswer = val.toString()
-				}
-				if(notAsA_BasisForJudgment.indexOf(type) === -1){
-					isUpdateFlowChart = true
-				}
-			}
-		})
-		if(isWrite){
-			if(type == "checkbox"){
-				flowFactor.push({
-					factorid:key,
-					type:3,
-					isCheckbox:true,
-					answers:val.map(String)
-				})
-			}else{
-				flowFactor.push({
-					factorid:key,
-					type:3,
-					isCheckbox:false,
-					oneanswer:val.toString()
-				})
-			}
-			isUpdateFlowChart = true
-		}
-		// console.log("改变表单值--flowFactor--->",flowFactor)
-		
-	}
-	//时间类空间附加判断条件
-	if(timeControl.indexOf(type) > -1 || fixedValueControl.indexOf(type) > -1 || type == "input"){
-		let addNewTime = true		//判断是否新增
-		flowFactor.forEach((item:any)=>{
-			// console.log("改变表单值--flowFactor--5->",item.type)
-			if(item.type == 2){
-				addNewTime = false
-				// console.log("改变表单值--flowFactor--5====1->",item.type)
-				// console.log("改变表单值--flowFactor--5====3->",item.customFields,item.customFields.length)
-				if(item.customFields && item.customFields.length > 0){
-					// console.log("改变表单值--flowFactor--5====2->",item.customFields)
-					let sunNewAdd = true
-					item.customFields.forEach((sunItem:any)=>{
-						// console.log("改变表单值--flowFactor-4->",sunItem.wordfield , key,sunItem.wordfield == key)
-						if(sunItem.wordfield == key){
-							sunNewAdd = false
-							isUpdateFlowChart = true
-							if(timeEquation.indexOf(attribute) === -1){			//非区间性时间
-								sunItem.leftval = val.toString()
-							}else{ //区间性时间
-								if(Array.isArray(val)){
-									if(val.length >= 2){
-										sunItem.leftval =  val[0].toString()
-										sunItem.rightval = val[val.length - 1].toString()
-									}
-								}
-							}
-						}
-					})
-					if(sunNewAdd){
-						isUpdateFlowChart = true
-						if(timeEquation.indexOf(attribute) === -1){//非区间性时间
-							let customFieldInfo = {
-								wordfield: key,
-								optType: "1",
-								leftval: val.toString()
-							}
-							item.customFields.push(customFieldInfo)
-						}else{ //区间性时间
-							if(Array.isArray(val)){
-								if(val.length >= 2){
-									let customFieldInfo = {
-										wordfield: key,
-										optType: "6",
-										leftval: val[0].toString(),
-										leftoptType:"3",
-										rightoptType:"3",
-										rightval:val[val.length - 1].toString()
-									}
-									item.customFields.push(customFieldInfo)
-								}
-							}
-						}
-					}
-				}
-			}
-		})
-		
-		if(addNewTime){	//新增自定义类数据判断
-			isUpdateFlowChart = true
-			if(timeEquation.indexOf(attribute) === -1){			//非区间性时间
-				let customFieldInfo = {
-					wordfield: key,
-					optType: "1",
-					leftval: val.toString()
-				}
-				let condInfo = {
-					factorid:"customFields",
-					type:2,
-					isCheckbox:false,
-					customFields:[customFieldInfo]
-				}
-				flowFactor.push(condInfo)
-			}else{		//区间性时间
-				if(Array.isArray(val)){
-					
-					if(val.length >= 2){
-						let customFieldInfo = {
-							wordfield: key,
-							optType: "6",
-							leftval: val[0].toString(),
-							leftoptType:"3",
-							rightoptType:"3",
-							rightval:val[val.length - 1].toString()
-						}
-						let condInfo = {
-							factorid:"customFields",
-							type:2,
-							isCheckbox:false,
-							customFields:[customFieldInfo]
-						}
-						flowFactor.push(condInfo)
-					}
-				}
-			}
-			
-		}
-	}
-	//操作人
-	if(asAnApprovalActionControl.indexOf(type) > -1){
-		isUpdateFlowChart = true
-		let isWriteUs = true
-		nodelUserList.forEach((item:any)=>{
-			if(item.factorid == key){
-				isWriteUs = false
-				item.userList = val
-			}
-		})
-		if(isWriteUs){
-			nodelUserList.push({
-				factorid:key,
-				userList:val
-			})
-		}
-	}
-	// console.log("isUpdateFlowChart",isUpdateFlowChart)
-	//更新工作流图
-	if(isUpdateFlowChart && gainFlowChart.id !=0){
-		flowLoading.value = true
-		//获取工作流不进图
-		gainFlowChart.conditionList=flowFactor
-		gainFlowChart.nodelPeople=nodelUserList
-		gainFlowChart.oldFlow = flowMap
-		// console.log("获取工作流不进图--gainFlowChart--->",gainFlowChart)
-		realTimeUpdateFlow(gainFlowChart)
-			.then((data:any) =>{
-				// console.log("获取工作流不进图-new-->",data)
-				flowMap.value = data.data.flowList
-				nextStep.value = data.data.nextStep;
-				currentProgress.value  = data.data.Step;
-				nodeKey.value = data.data.nodeKey;
-				// // console.log("获取工作流不进图-1-->",flowMap.value)
-				flowLoading.value = false
-			})
-	}
-}
-defineExpose({
-    setOptions,
-    setValue,
-    getValue,
-    validate,
-    resetFields,
-	appFormSubmit,
-	closePage,
-    // getData,	//功能待定
-	// anewSubmit,
-	// saveDraftPage,
-	// saveEditFormInfo,
-	// getEditData,
-	// submitEdit
-})
+const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
+  let unitsVal = val;
+  let isUpdateFlowChart = false;
+  //单选，多选，下拉菜单
+  if (notAsA_BasisForJudgment.indexOf(type) === -1) {
+    let isWrite = true;
+    flowFactor.forEach((item: any) => {
+      if (item.factorid == key) {
+        isWrite = false;
+
+        item.type = 3;
+        if (type == "checkbox") {
+          item.isCheckbox = true;
+          item.answers = val.map(String);
+        } else {
+          item.isCheckbox = false;
+          item.oneanswer = val.toString();
+        }
+        if (notAsA_BasisForJudgment.indexOf(type) === -1) {
+          isUpdateFlowChart = true;
+        }
+      }
+    });
+    if (isWrite) {
+      if (type == "checkbox") {
+        flowFactor.push({
+          factorid: key,
+          type: 3,
+          isCheckbox: true,
+          answers: val.map(String),
+        });
+      } else {
+        flowFactor.push({
+          factorid: key,
+          type: 3,
+          isCheckbox: false,
+          oneanswer: val.toString(),
+        });
+      }
+      isUpdateFlowChart = true;
+    }
+    // console.log("改变表单值--flowFactor--->",flowFactor)
+  }
+  //时间类空间附加判断条件
+  if (
+    timeControl.indexOf(type) > -1 ||
+    fixedValueControl.indexOf(type) > -1 ||
+    type == "input"
+  ) {
+    let addNewTime = true; //判断是否新增
+    flowFactor.forEach((item: any) => {
+      // console.log("改变表单值--flowFactor--5->",item.type)
+      if (item.type == 2) {
+        addNewTime = false;
+        // console.log("改变表单值--flowFactor--5====1->",item.type)
+        // console.log("改变表单值--flowFactor--5====3->",item.customFields,item.customFields.length)
+        if (item.customFields && item.customFields.length > 0) {
+          // console.log("改变表单值--flowFactor--5====2->",item.customFields)
+          let sunNewAdd = true;
+          item.customFields.forEach((sunItem: any) => {
+            // console.log("改变表单值--flowFactor-4->",sunItem.wordfield , key,sunItem.wordfield == key)
+            if (sunItem.wordfield == key) {
+              sunNewAdd = false;
+              isUpdateFlowChart = true;
+              if (timeEquation.indexOf(attribute) === -1) {
+                //非区间性时间
+                sunItem.leftval = val.toString();
+              } else {
+                //区间性时间
+                if (Array.isArray(val)) {
+                  if (val.length >= 2) {
+                    sunItem.leftval = val[0].toString();
+                    sunItem.rightval = val[val.length - 1].toString();
+                  }
+                }
+              }
+            }
+          });
+          if (sunNewAdd) {
+            isUpdateFlowChart = true;
+            if (timeEquation.indexOf(attribute) === -1) {
+              //非区间性时间
+              let customFieldInfo = {
+                wordfield: key,
+                optType: "1",
+                leftval: val.toString(),
+              };
+              item.customFields.push(customFieldInfo);
+            } else {
+              //区间性时间
+              if (Array.isArray(val)) {
+                if (val.length >= 2) {
+                  let customFieldInfo = {
+                    wordfield: key,
+                    optType: "6",
+                    leftval: val[0].toString(),
+                    leftoptType: "3",
+                    rightoptType: "3",
+                    rightval: val[val.length - 1].toString(),
+                  };
+                  item.customFields.push(customFieldInfo);
+                }
+              }
+            }
+          }
+        }
+      }
+    });
 
+    if (addNewTime) {
+      //新增自定义类数据判断
+      isUpdateFlowChart = true;
+      if (timeEquation.indexOf(attribute) === -1) {
+        //非区间性时间
+        let customFieldInfo = {
+          wordfield: key,
+          optType: "1",
+          leftval: val.toString(),
+        };
+        let condInfo = {
+          factorid: "customFields",
+          type: 2,
+          isCheckbox: false,
+          customFields: [customFieldInfo],
+        };
+        flowFactor.push(condInfo);
+      } else {
+        //区间性时间
+        if (Array.isArray(val)) {
+          if (val.length >= 2) {
+            let customFieldInfo = {
+              wordfield: key,
+              optType: "6",
+              leftval: val[0].toString(),
+              leftoptType: "3",
+              rightoptType: "3",
+              rightval: val[val.length - 1].toString(),
+            };
+            let condInfo = {
+              factorid: "customFields",
+              type: 2,
+              isCheckbox: false,
+              customFields: [customFieldInfo],
+            };
+            flowFactor.push(condInfo);
+          }
+        }
+      }
+    }
+  }
+  //操作人
+  if (asAnApprovalActionControl.indexOf(type) > -1) {
+    isUpdateFlowChart = true;
+    let isWriteUs = true;
+    nodelUserList.forEach((item: any) => {
+      if (item.factorid == key) {
+        isWriteUs = false;
+        item.userList = val;
+      }
+    });
+    if (isWriteUs) {
+      nodelUserList.push({
+        factorid: key,
+        userList: val,
+      });
+    }
+  }
+  // console.log("isUpdateFlowChart",isUpdateFlowChart)
+  //更新工作流图
+  if (isUpdateFlowChart && gainFlowChart.id != 0) {
+    flowLoading.value = true;
+    //获取工作流不进图
+    gainFlowChart.conditionList = flowFactor;
+    gainFlowChart.nodelPeople = nodelUserList;
+    gainFlowChart.oldFlow = flowMap;
+    // console.log("获取工作流不进图--gainFlowChart--->",gainFlowChart)
+    realTimeUpdateFlow(gainFlowChart).then((data: any) => {
+      // console.log("获取工作流不进图-new-->",data)
+      flowMap.value = data.data.flowList;
+      nextStep.value = data.data.nextStep;
+      currentProgress.value = data.data.Step;
+      nodeKey.value = data.data.nodeKey;
+      // // console.log("获取工作流不进图-1-->",flowMap.value)
+      flowLoading.value = false;
+    });
+  }
+};
+defineExpose({
+  setOptions,
+  setValue,
+  getValue,
+  validate,
+  resetFields,
+  appFormSubmit,
+  closePage,
+  // getData,	//功能待定
+  // anewSubmit,
+  // saveDraftPage,
+  // saveEditFormInfo,
+  // getEditData,
+  // submitEdit
+});
 
-function optionsValue3Get2(data: any,fieldName: string){
-	
-	
-	emits('optionsValue3Get3',data,fieldName)
-	
+function optionsValue3Get2(data: any, fieldName: string) {
+  emits("optionsValue3Get3", data, fieldName);
 }
 
-const asfs: any[] = []
-const tables: any[] = []
-function getAsfs(){
-	setTimeout(()=>{
-		let dataList = ref({})
-		dataList.value = props.formData.list
-		
-		if(dataList&&Array.isArray(dataList.value)&&dataList.value.length>0){
-			for(let i = 0;i<dataList.value.length;i++){
-				if(dataList.value[i].type=="associatedForms"){
-					asfs.push(dataList.value[i])
-				}else if(dataList.value[i].type=="card"||dataList.value[i].type=="flex"||dataList.value[i].type=="div"||dataList.value[i].type=="table"){
+const asfs: any[] = [];
+const tables: any[] = [];
+function getAsfs() {
+  setTimeout(() => {
+    let dataList = ref({});
+    dataList.value = props.formData.list;
+
+    if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+      for (let i = 0; i < dataList.value.length; i++) {
+        if (dataList.value[i].type == "associatedForms") {
+          asfs.push(dataList.value[i]);
+        } else if (
+          dataList.value[i].type == "card" ||
+          dataList.value[i].type == "flex" ||
+          dataList.value[i].type == "div" ||
+          dataList.value[i].type == "table"
+        ) {
+          if (dataList.value[i].type == "table") {
+            tables.push(dataList.value[i]);
+          }
+
+          dataList.value[i].list.forEach((element: any) => {
+            if (element.type == "associatedForms") {
+              asfs.push(element);
+            }
+          });
+        } else if (dataList.value[i].type == "grid") {
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                }
+              }
+            }
+          }
+        } else if (dataList.value[i].type == "tabs") {
+          //tabs标签页有可能再嵌套一层flex或者table
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
 
-					if(dataList.value[i].type=="table"){
-						tables.push(dataList.value[i])
-					}
-					
-					dataList.value[i].list.forEach((element:any) => {
-						if(element.type=="associatedForms"){
-							asfs.push(element)
-						}
-					});
-				}else if(dataList.value[i].type=="grid"){
-					let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
-					
-					if(columns.length>0){ 
-						for(let z = 0;z<columns.length;z++){
-							for(let x = 0; x<columns[z].list.length;x++){
-								let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-								
-								if(a.type=="associatedForms"){
-									asfs.push(a)
-								}
-								
-							}
-						}
-					}
-				}else if(dataList.value[i].type=="tabs"){//tabs标签页有可能再嵌套一层flex或者table
-					let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
-					if(columns.length>0){
-						for(let z = 0;z<columns.length;z++){
-							for(let x = 0; x<columns[z].list.length;x++){
-								let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-								
-								if(a.type=="associatedForms"){
-									asfs.push(a)
-								}else if(a.type=="flex"||a.type=="table"){
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                } else if (a.type == "flex" || a.type == "table") {
+                  if (a.type == "table") {
+                    tables.push(dataList.value[i]);
+                  }
 
-									if(a.type=="table"){
-										tables.push(dataList.value[i])
-									}
+                  if (a.list.length > 0) {
+                    for (let m = 0; m < a.list.length; m++) {
+                      let q = JSON.parse(JSON.stringify(a.list[m]));
 
-									if(a.list.length>0){
-										for(let m = 0;m<a.list.length;m++){
-											let q = JSON.parse(JSON.stringify(a.list[m]))
-											
-											if(q.type=="associatedForms"){
-												asfs.push(q)
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}	
-			}
-			
-		}
-	},500)
+                      if (q.type == "associatedForms") {
+                        asfs.push(q);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }, 500);
 }
-let asfRangeDoubleCondiChangeObj = ref()
-provide('asfRangeDoubleCondiChangeObj',asfRangeDoubleCondiChangeObj)
+let asfRangeDoubleCondiChangeObj = ref();
+provide("asfRangeDoubleCondiChangeObj", asfRangeDoubleCondiChangeObj);
 
-let oldModelStr = ""
-watch(() => model.value,(newVal) => {
-	let currentChangeKey = ""
-	const newModelStr = JSON.stringify(newVal);
-	let oldModelStr1 = oldModelStr
-	if (newModelStr!== oldModelStr1&&oldModelStr1!="") {
-		let oldVal =  JSON.parse(oldModelStr1);
-		for (const key in newVal) {
-			if (JSON.stringify(newVal[key])!== JSON.stringify(oldVal[key])) {
-				currentChangeKey = key
-			}
-		}
+let oldModelStr = "";
+watch(
+  () => model.value,
+  (newVal) => {
+    let currentChangeKey = "";
+    const newModelStr = JSON.stringify(newVal);
+    let oldModelStr1 = oldModelStr;
+    if (newModelStr !== oldModelStr1 && oldModelStr1 != "") {
+      let oldVal = JSON.parse(oldModelStr1);
+      for (const key in newVal) {
+        if (JSON.stringify(newVal[key]) !== JSON.stringify(oldVal[key])) {
+          currentChangeKey = key;
+        }
+      }
     }
-	let rangeFormulaArr = []
-	if(asfs.length>0){
-		asfs.forEach((element:any) => {
-			
-			let asfName = element.name
-			
-			if(element.control.dataRangeGongShi&&element.control.dataRangeGongShi.mathsFormula&&element.control.dataRangeGongShi.mathsFormula.length>0){
-				let asfRangeDoubleCondi = element.control.dataRangeGongShi.mathsFormula
-				
-				if(currentChangeKey!=""){
-				
-					let a = asfRangeDoubleCondi.split(":")
-					let field = a[a.length-1]
-					if(currentChangeKey==field){
-						let toShowDoubleCondiValVal = model.value[currentChangeKey]
-						//console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
-						let obj = {
-							asfName:asfName,
-							toShowDoubleCondiValVal:toShowDoubleCondiValVal
-						} 
-						asfRangeDoubleCondiChangeObj.value = obj
-						
-					}
-				}
-				
-			}
-		});
-	}
-	oldModelStr = newModelStr
-},{deep: true})
+    let rangeFormulaArr = [];
+    if (asfs.length > 0) {
+      asfs.forEach((element: any) => {
+        let asfName = element.name;
 
+        if (
+          element.control.dataRangeGongShi &&
+          element.control.dataRangeGongShi.mathsFormula &&
+          element.control.dataRangeGongShi.mathsFormula.length > 0
+        ) {
+          let asfRangeDoubleCondi = element.control.dataRangeGongShi.mathsFormula;
 
+          if (currentChangeKey != "") {
+            let a = asfRangeDoubleCondi.split(":");
+            let field = a[a.length - 1];
+            if (currentChangeKey == field) {
+              let toShowDoubleCondiValVal = model.value[currentChangeKey];
+              //console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
+              let obj = {
+                asfName: asfName,
+                toShowDoubleCondiValVal: toShowDoubleCondiValVal,
+              };
+              asfRangeDoubleCondiChangeObj.value = obj;
+            }
+          }
+        }
+      });
+    }
+    oldModelStr = newModelStr;
+  },
+  { deep: true }
+);
 </script>
 <template>
-	<div class="common-layout">
-	
-		<el-container v-if="props.isWorkFlow==1">
-			<el-main class="formMainBox">
-		
-				<el-form
-					v-bind="formData.form"
-					ref="ruleForm"
-					:model="model as any"
-					:disabled="disabled || type === 3"
-					class="add-form"
-					:class="{
-						'design-form': type === 5,
-						'detail-form': type === 3 || type === 4 || type === 1
-					}"
-				>
-				
-					<!-- <FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list"  :alldata="formData"  :purview="formData.powerstr" :node-key="nodeKey" /> -->
-					<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list"  :alldata="formData"   :node-key="nodeKey" />
-					<slot></slot>
-				</el-form>
-
-			
-			</el-main>
-			<el-aside class="flowBox">
-				<el-text size="large">审批流程</el-text>
-				<FlowStep v-loading="flowLoading" v-model:flow-map="flowMap" :next-step="nextStep" :current-progress="currentProgress" :node-key="nodeKey" />
-			</el-aside>
-		</el-container>
-		<div v-else>
-
-			<el-form
-				v-bind="formData.form"
-				ref="ruleForm"
-				:model="model as any"
-				:disabled="disabled || type === 3"
-				class="add-form"
-				:class="{
-					'design-form': type === 5,
-					'detail-form': type === 3 || type === 4 || type === 1
-				}"
-			>
+  <div class="common-layout">
+    <el-container v-if="props.isWorkFlow == 1">
+      <el-main class="formMainBox">
+        <el-form
+          v-bind="formData.form"
+          v-loading="formLoading"
+          ref="ruleForm"
+          :model="model as any"
+          :disabled="disabled || type === 3"
+          class="add-form"
+          :class="{
+            'design-form': type === 5,
+            'detail-form': type === 3 || type === 4 || type === 1,
+          }"
+        >
+          <!-- <FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list"  :alldata="formData"  :purview="formData.powerstr" :node-key="nodeKey" /> -->
+          <FormGroup
+            :tableinfo="formData.form"
+            :numrun="numrun"
+            :data="formData.list"
+            :alldata="formData"
+            :node-key="nodeKey"
+          />
+          <slot></slot>
+        </el-form>
+      </el-main>
+      <el-aside class="flowBox">
+        <el-text size="large">审批流程</el-text>
+        <FlowStep
+          v-loading="flowLoading"
+          v-model:flow-map="flowMap"
+          :next-step="nextStep"
+          :current-progress="currentProgress"
+          :node-key="nodeKey"
+        />
+      </el-aside>
+    </el-container>
+    <div v-else>
+      <el-form
+        v-bind="formData.form"
+        v-loading="formLoading"
+        ref="ruleForm"
+        :model="model as any"
+        :disabled="disabled || type === 3"
+        class="add-form"
+        :class="{
+          'design-form': type === 5,
+          'detail-form': type === 3 || type === 4 || type === 1,
+        }"
+      >
+        <FormGroup
+          :tableinfo="formData.form"
+          :numrun="numrun"
+          :data="formData.list"
+          :alldata="formData"
+          @optionsValue3Get2="optionsValue3Get2"
+        />
 
-				<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list"  :alldata="formData" @optionsValue3Get2="optionsValue3Get2"/>
-				
-				<slot></slot>
-			</el-form>
-		</div>
-  	</div>
+        <slot></slot>
+      </el-form>
+    </div>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.formMainBox{
-	padding: 0;
+<style lang="scss" scoped>
+.formMainBox {
+  padding: 0;
 }
-.flowBox{
-	width: 350px;
-	border-left: 1px solid #4f4f4f;
-	padding: 0 15px;
+.flowBox {
+  width: 350px;
+  border-left: 1px solid #4f4f4f;
+  padding: 0 15px;
 }
 </style>
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index f75a530..7ae3608 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -25,6 +25,7 @@ import {
   switchUnit,
   orgUnit,
   checkboxUnit,
+  orgDeptUnit,
 } from "@/api/DesignForm/fieldUnit";
 import type { FormInstance, FormRules, ElNotification } from "element-plus";
 import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
@@ -183,6 +184,9 @@ const unitIsShow = (val: tableButton, unitName: string) => {
     case "checkbox":
       return checkboxUnit.includes(unitName);
       break;
+    case "deptOrg":
+      return orgDeptUnit.includes(unitName);
+      break;
     default:
       if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") {
         return inputUnit.includes(unitName);
@@ -1005,7 +1009,18 @@ const transformOption = (val: string | number, type?: string) => {
                   v-if="unitIsShow(item, 'org')"
                 >
                 </el-select>
+                <DeptOrgSearch
+                  v-if="unitIsShow(item, 'deptOrg')"
+                  v-model:model-value="item.value"
+                />
               </el-form-item>
+
+              <!-- <DeptOrgPage
+                v-if="item.fieldClass === 'deptOrg' && type != 4"
+                :data="data"
+                :form-props="formProps"
+                :tablekey="props.tablekey"
+              /> -->
             </div>
           </template>
           <div class="group group-btn" v-if="searchData.length">
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 158eff9..f3180a3 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -499,7 +499,7 @@ const attrList = computed(() => {
         value: config.append,
         placeholder: "文本后缀",
         path: "config.append",
-        vShow: ["input", "password"],
+        vShow: ["input", "password", "digitpage"],
       },
       // {
       //     label: '状态打开时的值',
@@ -1364,6 +1364,7 @@ const delSelectOption = (index: number, type?: string) => {
 };
 // 多选固定选项增加
 const addSelectOption = (type: any) => {
+  // console.log("多选固定选项增加", controlData.value.type);
   if (controlData.value.type === "cascader") {
     // 级联时打开弹窗口
     openAttrDialog("cascader", "级联选择器");
@@ -1377,14 +1378,43 @@ const addSelectOption = (type: any) => {
       });
     } else {
       let maxVal = 1;
+
+      // console.log("多选固定选项增加-------1---->", maxVal, controlData.value.options);
+
       if (controlData.value.options && controlData.value.options.length > 0) {
+        let optMax = 1;
         controlData.value.options.forEach((item: any) => {
-          if (item.value >= maxVal) {
-            maxVal = item.value;
+          if (item.value * 1 >= optMax) {
+            optMax = item.value;
           }
         });
-        maxVal = maxVal * 1 + 1;
+
+        // console.log("多选固定选项增加-------4---->", maxVal, optMax);
+
+        if (maxVal < optMax) {
+          maxVal = optMax * 1 + 1;
+        } else {
+          maxVal = maxVal * 1 + 1;
+        }
+
+        // let isTrue = true;
+        // controlData.value.options.forEach((item: any) => {
+        //   console.log("多选固定选项增加-------4---->", maxVal, item.value);
+        //   if (item.value == maxVal) {
+        //     maxVal = item.value;
+        //     isTrue = false;
+        //   }
+        // });
+
+        // if (isTrue) {
+        //   maxVal = maxVal * 1 + 1;
+        // }
       }
+      // console.log(
+      //   "多选固定选项增加-------3---->",
+      //   maxVal,
+      //   controlData.value.options.length
+      // );
       controlData.value.options.push({
         label: "",
         value: maxVal.toString(),
diff --git a/src/components/DesignForm/public/expand/treeSelect.vue b/src/components/DesignForm/public/expand/treeSelect.vue
new file mode 100644
index 0000000..4671cde
--- /dev/null
+++ b/src/components/DesignForm/public/expand/treeSelect.vue
@@ -0,0 +1,50 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-12-03 14:29:45
+@ 备注: 树型组件
+-->
+<script lang="ts" setup>
+import { stringToObj } from "@/utils/DesignForm/form";
+const props = withDefaults(
+  defineProps<{
+    modelValue?: string;
+    disabled?: boolean;
+    action?: string;
+    name?: string;
+    fileList?: Object;
+    control?: Object;
+    config?: Object;
+    data?: Object;
+    options?: Object;
+  }>(),
+  {}
+);
+const emits = defineEmits<{
+  (e: "update:modelValue", value: string): void;
+}>();
+const value = computed({
+  get: () => {
+    console.log("图片上传处理-112->", props.modelValue, stringToObj(props.modelValue));
+    return stringToObj(props.modelValue);
+  },
+  set: (newVal: any) => {
+    emits("update:modelValue", newVal);
+    return newVal;
+  },
+});
+const handleChange = () => {};
+const cascaderProps = {
+  label: "label",
+  value: "value",
+  children: "children",
+};
+</script>
+<template>
+  <el-tree-select
+    v-model="value"
+    :data="props.data"
+    clearable
+    :render-after-expand="false"
+  />
+</template>
+<style lang="scss" scoped></style>
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 8d60c45..34da915 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -3,336 +3,335 @@
 @ 时间: 2023-09-20 08:35:17
 @ 备注: 自定义表单通用模块
 -->
-<script lang='ts' setup>
-import '@/assets/scss/element-var.scss'
-import '@/assets/scss/index.scss'
+<script lang="ts" setup>
+import "@/assets/scss/element-var.scss";
+import "@/assets/scss/index.scss";
 // import FormGroup from './formGroup.vue'
-import FormGroup from '@/components/DesignForm/public/form/formGroup.vue'
-import WebFormGroup from '@/components/DesignForm/public/form/webformGroup.vue'
+import FormGroup from "@/components/DesignForm/public/form/formGroup.vue";
+import WebFormGroup from "@/components/DesignForm/public/form/webformGroup.vue";
 
-import { FormData,FormList,FormDataStyle } from '@/api/DesignForm/types'
-import { getRequest } from '@/api/DesignForm'
-import request from '@/utils/request';
-import { useRoute, useRouter } from 'vue-router'
+import { FormData, FormList, FormDataStyle } from "@/api/DesignForm/types";
+import { getRequest } from "@/api/DesignForm";
+import request from "@/utils/request";
+import { useRoute, useRouter } from "vue-router";
 import {
-    constGetControlByName,
-    constSetFormOptions,
-    constFormBtnEvent,
-    constControlChange,
-    constFormProps,
-    appendOrRemoveStyle
-} from '@/api/DesignForm/utils'
-import formatResult from '@/utils/DesignForm/formatResult'
-import formChangeValue from '@/utils/DesignForm/formChangeValue'
-import { jsonParseStringify } from '@/utils/DesignForm'
+  constGetControlByName,
+  constSetFormOptions,
+  constFormBtnEvent,
+  constControlChange,
+  constFormProps,
+  appendOrRemoveStyle,
+} from "@/api/DesignForm/utils";
+import formatResult from "@/utils/DesignForm/formatResult";
+import formChangeValue from "@/utils/DesignForm/formChangeValue";
+import { jsonParseStringify } from "@/utils/DesignForm";
 //通用提交
-import { currencyFormApiSubmit } from '@/api/taskapi/management'
+import { currencyFormApiSubmit } from "@/api/taskapi/management";
 
 const props = withDefaults(
-	defineProps<{
-		formData: FormData
-		type?: number // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
-		numrun?: number	//1：获取；非1：不变
-		disabled?: boolean // 禁用表单提交
-		requestUrl?: string // 编辑数据请求url
-		beforeRequest?: Function // 请求编辑数据前参数处理方法，可对请求参数处理
-		afterResponse?: Function | string // 请求数据加载完成后数据处理方法，可对返回数据处理
-		addUrl?: string // 表单数据新增提交保存url
-		editUrl?: string // 表单数据修改保存提交url
-		beforeSubmit?: Function | string // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
-		afterSubmit?: Function // 表单提交后，默认提示提交结果，可return false阻止提示
-		closeAppSubmit?: Function	//关闭拉窗
-		changeKeyVal?: Function //监听表单值该表
-		anewSubmit?: Function	//重新提交表单
-		saveDraftPage?: Function	//保存草稿
-		saveEditFormInfo?: Function //保存草稿  只改表单不操作流程
-		sendDraftSubmit?: Function //草稿提交审批
-		submitEdit?: Function //提交修改数据申请
-		value?: { [key: string]: any } // 表单初始值，同setValue
-		options?: { [key: string]: any } // 表单组件选项，同setOptions
-		dict?: object // 固定匹配的字典
-		isSearch?: boolean // 列表里作为筛选使用
-		isWorkFlow?: number //
-		flowkey?: string //
-		groupid?: string //
-		signCode?: string //
-		versionId?: string //
-		mastesformjson?: string //
-		isWeb: boolean //
-    }>(),
-    {
-		type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
-		numrun:2,
-		formData: () => {
-			return {
-				list: [],
-				form: {},
-				config: {
-					style:''
-				},
-				styles:{
-					divStyle:{},
-					labelStyle:{},
-					inputStyle:{}
-				}
-			}
-		},
-		dict: () => {
-			return {}
-		},
-		isSearch: false,
-		issave:{
-			type:Boolean,
-			default:true
-		},
-		key:1,
-		isWorkFlow:2,
-		flowkey:"",
-		groupid:"",
-		signCode:"",
-		mastesformjson:"",
-    }
-)
+  defineProps<{
+    formData: FormData;
+    type?: number; // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun?: number; //1：获取；非1：不变
+    disabled?: boolean; // 禁用表单提交
+    requestUrl?: string; // 编辑数据请求url
+    beforeRequest?: Function; // 请求编辑数据前参数处理方法，可对请求参数处理
+    afterResponse?: Function | string; // 请求数据加载完成后数据处理方法，可对返回数据处理
+    addUrl?: string; // 表单数据新增提交保存url
+    editUrl?: string; // 表单数据修改保存提交url
+    beforeSubmit?: Function | string; // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
+    afterSubmit?: Function; // 表单提交后，默认提示提交结果，可return false阻止提示
+    closeAppSubmit?: Function; //关闭拉窗
+    changeKeyVal?: Function; //监听表单值该表
+    anewSubmit?: Function; //重新提交表单
+    saveDraftPage?: Function; //保存草稿
+    saveEditFormInfo?: Function; //保存草稿  只改表单不操作流程
+    sendDraftSubmit?: Function; //草稿提交审批
+    submitEdit?: Function; //提交修改数据申请
+    value?: { [key: string]: any }; // 表单初始值，同setValue
+    options?: { [key: string]: any }; // 表单组件选项，同setOptions
+    dict?: object; // 固定匹配的字典
+    isSearch?: boolean; // 列表里作为筛选使用
+    isWorkFlow?: number; //
+    flowkey?: string; //
+    groupid?: string; //
+    signCode?: string; //
+    versionId?: string; //
+    mastesformjson?: string; //
+    isWeb: boolean; //
+  }>(),
+  {
+    type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun: 2,
+    formData: () => {
+      return {
+        list: [],
+        form: {},
+        config: {
+          style: "",
+        },
+        styles: {
+          divStyle: {},
+          labelStyle: {},
+          inputStyle: {},
+        },
+      };
+    },
+    dict: () => {
+      return {};
+    },
+    isSearch: false,
+    issave: {
+      type: Boolean,
+      default: true,
+    },
+    key: 1,
+    isWorkFlow: 2,
+    flowkey: "",
+    groupid: "",
+    signCode: "",
+    mastesformjson: "",
+  }
+);
 const emits = defineEmits<{
-	(e: 'btnClick', type: string): void
-	(e: 'change', val: any): void // 表单组件值发生变化时
-	(e: 'update:issave', type: boolean): void
-	(e: 'refresh'): void
-	(e: 'optionsValue3Get3', val: any,fieldName: string): void 
-}>()
-const route = useRoute()
-const router = useRouter()
-const loading = ref(false)
-let timer = 0
-let eventName = ''
-let getValueEvent = ''
+  (e: "btnClick", type: string): void;
+  (e: "change", val: any): void; // 表单组件值发生变化时
+  (e: "update:issave", type: boolean): void;
+  (e: "refresh"): void;
+  (e: "optionsValue3Get3", val: any, fieldName: string): void;
+}>();
+const route = useRoute();
+const router = useRouter();
+const loading = ref(false);
+let timer = 0;
+let eventName = "";
+let getValueEvent = "";
 // 注册window事件
 const setWindowEvent = (bool?: boolean) => {
-	// console.log("注册window事件",props,props.formData)
-    if (props.formData.list.length > 0) {
-		const formName = props.formData.form?.name
-		if (!formName) {
-			// 导出.vue时，name可以没有
-			return
-		}
-		eventName = `get${formName}ControlByName`
-		getValueEvent = `get${formName}ValueByName`
-		if (formName && (!window[eventName as any] || !bool)) {
-			// 根据name获取当前数据项
-			// @ts-ignore
-			window[eventName] = (name: string) => {
-				return getNameForEach(props.formData.list, name)
-			}
-			// 根据name获取当前项的值
-			// @ts-ignore
-			window[getValueEvent] = (name: string) => {
-				return model.value[name]
-			}
-		}
+  // console.log("注册window事件",props,props.formData)
+  if (props.formData.list.length > 0) {
+    const formName = props.formData.form?.name;
+    if (!formName) {
+      // 导出.vue时，name可以没有
+      return;
     }
-}
+    eventName = `get${formName}ControlByName`;
+    getValueEvent = `get${formName}ValueByName`;
+    if (formName && (!window[eventName as any] || !bool)) {
+      // 根据name获取当前数据项
+      // @ts-ignore
+      window[eventName] = (name: string) => {
+        return getNameForEach(props.formData.list, name);
+      };
+      // 根据name获取当前项的值
+      // @ts-ignore
+      window[getValueEvent] = (name: string) => {
+        return model.value[name];
+      };
+    }
+  }
+};
 watch(
-	() => props.formData,
-    () => { 
-		emits('update:issave', false)
-    },
-    { deep: true }
-)
+  () => props.formData,
+  () => {
+    emits("update:issave", false);
+  },
+  { deep: true }
+);
 watch(
-    () => props.formData.config,
-    () => {
-		if (timer < 2) {
-			setWindowEvent() // 简单判断下，这里不是每次都更新
-		}
-		timer++
-		appendRemoveStyle(true) // 更新样式
-    },
-    { deep: true }
-)
-setWindowEvent()
+  () => props.formData.config,
+  () => {
+    if (timer < 2) {
+      setWindowEvent(); // 简单判断下，这里不是每次都更新
+    }
+    timer++;
+    appendRemoveStyle(true); // 更新样式
+  },
+  { deep: true }
+);
+setWindowEvent();
 // 设置全局事件结束
-const resultDict = ref({})
+const resultDict = ref({});
 // 处理表单值开始
-const model = ref<any>({})
+const model = ref<any>({});
 // 获取表单初始model值
 const getInitModel = () => {
-	const obj = {}
-    forEachGetFormModel(props.formData.list, obj)
-	// console.log("obj===>",obj)
-	// console.log("obj===>",props.formData.list)
-    model.value = obj
-}
+  const obj = {};
+  forEachGetFormModel(props.formData.list, obj);
+  // console.log("obj===>",obj)
+  // console.log("obj===>",props.formData.list)
+  model.value = obj;
+};
 watch(
-    () => props.formData.list,
-    () => {
-		// formData从接口获取时
-		getInitModel()
-    }
-)
+  () => props.formData.list,
+  () => {
+    // formData从接口获取时
+    getInitModel();
+  }
+);
 // 从表单数据里提取表单所需的model
 const forEachGetFormModel = (list: FormList[], obj: any) => {
-    list.forEach((item: any) => {
-		if (['table', 'flex'].includes(item.type)) {
-			obj[item.name] = jsonParseStringify(item.tableData)
-		} else if (['grid', 'tabs'].includes(item.type)) {
-			item.columns.forEach((col: any) => {
-				forEachGetFormModel(col.list, obj)
-			})
-		} else if (['card', 'div'].includes(item.type)) {
-			forEachGetFormModel(item.list, obj)
-		}else {
-			const excludeType = ['title', 'divider', 'txt', 'button']
-			if (excludeType.indexOf(item.type) === -1) {
-				obj[item.name] = jsonParseStringify(item.control.modelValue)
-				if(['switch'].includes(item.type)){
-					model.value[item.name] = jsonParseStringify(item.control.inactiveValue)
-					// console.log(model.value)
-				}
-			}
-		}
-    })
-	showOrHide("onMounted")
-}
+  list.forEach((item: any) => {
+    if (["table", "flex"].includes(item.type)) {
+      obj[item.name] = jsonParseStringify(item.tableData);
+    } else if (["grid", "tabs"].includes(item.type)) {
+      item.columns.forEach((col: any) => {
+        forEachGetFormModel(col.list, obj);
+      });
+    } else if (["card", "div"].includes(item.type)) {
+      forEachGetFormModel(item.list, obj);
+    } else {
+      const excludeType = ["title", "divider", "txt", "button"];
+      if (excludeType.indexOf(item.type) === -1) {
+        obj[item.name] = jsonParseStringify(item.control.modelValue);
+        if (["switch"].includes(item.type)) {
+          model.value[item.name] = jsonParseStringify(item.control.inactiveValue);
+          // console.log(model.value)
+        }
+      }
+    }
+  });
+  showOrHide("onMounted");
+};
 
 function arrayEqual(a: string[], b: any[]) {
-	//alert("开始比较")
-    //先将数组排序
-	let a_ = JSON.parse(JSON.stringify(a));
-	for(let i = 0;i<a_.length;i++){
-		a_[i] = a_[i]+""
-	}
-	//console.log(a_)
-	//console.log(b)
-    a_ = a_.sort();
-    b = b.sort();
-    //判断数组长度是否相等，若不相等返回false
-    if (a_.length != b.length) 
-    return false;
-    //逐个比较数组元素
-    for (var i = 0; i < a_.length; ++i) {
-        if (a_[i] !== b[i]) 
-        return false;
-    }
-    return true;
+  //alert("开始比较")
+  //先将数组排序
+  let a_ = JSON.parse(JSON.stringify(a));
+  for (let i = 0; i < a_.length; i++) {
+    a_[i] = a_[i] + "";
+  }
+  //console.log(a_)
+  //console.log(b)
+  a_ = a_.sort();
+  b = b.sort();
+  //判断数组长度是否相等，若不相等返回false
+  if (a_.length != b.length) return false;
+  //逐个比较数组元素
+  for (var i = 0; i < a_.length; ++i) {
+    if (a_[i] !== b[i]) return false;
+  }
+  return true;
 }
 
-
-
 interface hideFieldConditionArritem {
-	toShow:string
-	conditions: any[]
+  toShow: string;
+  conditions: any[];
 }
 
-const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: string | any[],defaultHideFields: any[]) => {
-	
-
-	nextTick(() => {
-		//console.log(model.value)
-		/* console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
+const recursionToGetFinallyHideFields = (
+  hideFieldArr: any[],
+  radioSelectArr3: string | any[],
+  defaultHideFields: any[]
+) => {
+  nextTick(() => {
+    //console.log(model.value)
+    /* console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
 		console.log(radioSelectArr3)
 		console.log("当前表单的值-------------------")
 		console.log(model.value)
 		console.log("默认隐藏的字段-----------------")
 		console.log(defaultHideFields) */
-		let modelKeyArr = [];//所有字段
-		for(let i= 0;i<props.formData.list.length;i++){
-			modelKeyArr.push(props.formData.list[i].name+"")
-		}
-		modelKeyArr = newModelKeyArr
-
-		//console.log(modelKeyArr)
-		/* console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
-		console.log(modelKeyArr) */
-
-		//console.log("当前表单的值-------------------")
-		//console.log(model.value)
-
-		
-
-		//当前处于显示状态的默认隐藏的字段
-		let nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
-		//当前所有处于显示状态的字段
-		let nowShowingFieldArr = modelKeyArr.filter(a => !hideFieldArr.includes(a))
-
-
-
-
-
+    let modelKeyArr = []; //所有字段
+    for (let i = 0; i < props.formData.list.length; i++) {
+      modelKeyArr.push(props.formData.list[i].name + "");
+    }
+    modelKeyArr = newModelKeyArr;
 
+    //console.log(modelKeyArr)
+    /* console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
+		console.log(modelKeyArr) */
 
-	//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
-	const hideFieldConditionArr:hideFieldConditionArritem[] = []
-	//保存应多选条件造成的应隐藏的字段
-	let hideFieldsFromCheckbox: string[] = []
-	for(let i = 0;i < hideFieldArr.length;i++){
-		hideFieldConditionArr.push({
-			toShow:hideFieldArr[i],
-			conditions:[],
-		})
-	}
-	//console.log(hideFieldConditionArr)
-	//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
-	for(let i = 0;i < radioSelectArr3.length;i++){
-		for(let j = 0;j < radioSelectArr3[i].toShowFieldKey.length;j++){
-			for(let n = 0;n < hideFieldConditionArr.length;n++){
-				/* console.log(i)
+    //console.log("当前表单的值-------------------")
+    //console.log(model.value)
+
+    //当前处于显示状态的默认隐藏的字段
+    let nowShowingDefaultHideFieldArr = defaultHideFields.filter(
+      (a) => !hideFieldArr.includes(a)
+    );
+    //当前所有处于显示状态的字段
+    let nowShowingFieldArr = modelKeyArr.filter((a) => !hideFieldArr.includes(a));
+
+    //以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
+    const hideFieldConditionArr: hideFieldConditionArritem[] = [];
+    //保存应多选条件造成的应隐藏的字段
+    let hideFieldsFromCheckbox: string[] = [];
+    for (let i = 0; i < hideFieldArr.length; i++) {
+      hideFieldConditionArr.push({
+        toShow: hideFieldArr[i],
+        conditions: [],
+      });
+    }
+    //console.log(hideFieldConditionArr)
+    //遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
+    for (let i = 0; i < radioSelectArr3.length; i++) {
+      for (let j = 0; j < radioSelectArr3[i].toShowFieldKey.length; j++) {
+        for (let n = 0; n < hideFieldConditionArr.length; n++) {
+          /* console.log(i)
 				console.log(j)
 				console.log(n) */
-				if(radioSelectArr3[i].toShowFieldKey[j]==hideFieldConditionArr[n].toShow){
-					if(Array.isArray(radioSelectArr3[i].conditionFieldValue)){
-						let valStr = "";
-						for(let x = 0;x<radioSelectArr3[i].conditionFieldValue.length;x++){
-							valStr = valStr+radioSelectArr3[i].conditionFieldValue[x]+","
-						}
-						hideFieldConditionArr[n].conditions.push({
-							conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
-							condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
-								conditionField:radioSelectArr3[i].conditionFieldKey,
-								conditionFieldValue:valStr
-							}]
-						})
-					}else{
-						hideFieldConditionArr[n].conditions.push({
-							conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
-							condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
-								conditionField:radioSelectArr3[i].conditionFieldKey,
-								conditionFieldValue:radioSelectArr3[i].conditionFieldValue//
-							}]
-						})
-					}
-				}
-			}
-		}
-	}
-	//console.log(hideFieldConditionArr);
-	//要显示的和其满足显示条件的个数.
-	//let showfieldsCountX = [];
-	for(let i = 0;i<hideFieldConditionArr.length;i++){
-		let x = 0//满足显示条件的次数
-		let toshow = hideFieldConditionArr[i].toShow
-		let conditions = hideFieldConditionArr[i].conditions
-		//console.log(conditions)
-		for(let j = 0;j<conditions.length;j++){
-				let conditionField = conditions[j].condition[0].conditionField
-				let conditionFieldValue = conditions[j].condition[0].conditionFieldValue
-				//console.log(conditionField)
-				if(conditionFieldValue.includes(",")){//来自多选
-					let conditionFieldValueArr = conditionFieldValue.split(",")
-					conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
-					/* console.log(conditionFieldValueArr)
+          if (radioSelectArr3[i].toShowFieldKey[j] == hideFieldConditionArr[n].toShow) {
+            if (Array.isArray(radioSelectArr3[i].conditionFieldValue)) {
+              let valStr = "";
+              for (let x = 0; x < radioSelectArr3[i].conditionFieldValue.length; x++) {
+                valStr = valStr + radioSelectArr3[i].conditionFieldValue[x] + ",";
+              }
+              hideFieldConditionArr[n].conditions.push({
+                conditionFrom: "radioOrSelect", //本条件来自于单选或者下拉
+                condition: [
+                  {
+                    //条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+                    conditionField: radioSelectArr3[i].conditionFieldKey,
+                    conditionFieldValue: valStr,
+                  },
+                ],
+              });
+            } else {
+              hideFieldConditionArr[n].conditions.push({
+                conditionFrom: "radioOrSelect", //本条件来自于单选或者下拉
+                condition: [
+                  {
+                    //条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+                    conditionField: radioSelectArr3[i].conditionFieldKey,
+                    conditionFieldValue: radioSelectArr3[i].conditionFieldValue, //
+                  },
+                ],
+              });
+            }
+          }
+        }
+      }
+    }
+    //console.log(hideFieldConditionArr);
+    //要显示的和其满足显示条件的个数.
+    //let showfieldsCountX = [];
+    for (let i = 0; i < hideFieldConditionArr.length; i++) {
+      let x = 0; //满足显示条件的次数
+      let toshow = hideFieldConditionArr[i].toShow;
+      let conditions = hideFieldConditionArr[i].conditions;
+      //console.log(conditions)
+      for (let j = 0; j < conditions.length; j++) {
+        let conditionField = conditions[j].condition[0].conditionField;
+        let conditionFieldValue = conditions[j].condition[0].conditionFieldValue;
+        //console.log(conditionField)
+        if (conditionFieldValue.includes(",")) {
+          //来自多选
+          let conditionFieldValueArr = conditionFieldValue.split(",");
+          conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
+          /* console.log(conditionFieldValueArr)
 					console.log(conditionFieldValue) */
-					for(let n = 0; n< modelKeyArr.length;n++){
-						if(modelKeyArr[n]==conditionField){
-							//let count_1 = 0;
-							let trueValue = model.value[modelKeyArr[n]]
-							if(trueValue.length>0&&arrayEqual(trueValue,conditionFieldValueArr)){
-								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
-								//alert("多选条件成功触发")
-								/* console.log(conditionField)
+          for (let n = 0; n < modelKeyArr.length; n++) {
+            if (modelKeyArr[n] == conditionField) {
+              //let count_1 = 0;
+              let trueValue = model.value[modelKeyArr[n]];
+              if (trueValue.length > 0 && arrayEqual(trueValue, conditionFieldValueArr)) {
+                //此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+                //alert("多选条件成功触发")
+                /* console.log(conditionField)
 								console.log(toshow) */
-								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
-								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
-								/* for(let a = 0;a<hideFieldConditionArr.length;a++){
+                let flag = false; //其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+                //如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+                /* for(let a = 0;a<hideFieldConditionArr.length;a++){
 									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
 										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
 											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
@@ -344,34 +343,35 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 										}
 									}
 								} */
-								if(flag==false){
-									x++
-									hideFieldsFromCheckbox.push(toshow)
-									//console.log(hideFieldArr)
-									/* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
+                if (flag == false) {
+                  x++;
+                  hideFieldsFromCheckbox.push(toshow);
+                  //console.log(hideFieldArr)
+                  /* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
 										hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
 										//emits('refresh')
 									} */
-								}
-							}
-						}
-					}
-				}else{//来自单选下拉
-					//console.log(modelKeyArr)
-					for(let n = 0; n< modelKeyArr.length;n++){
-						if(modelKeyArr[n]==conditionField){
-							//let count_1 = 0;
-							let trueValue = model.value[modelKeyArr[n]]
-							//console.log(modelKeyArr[n])
-							/* console.log("conditionField====="+conditionField)
+                }
+              }
+            }
+          }
+        } else {
+          //来自单选下拉
+          //console.log(modelKeyArr)
+          for (let n = 0; n < modelKeyArr.length; n++) {
+            if (modelKeyArr[n] == conditionField) {
+              //let count_1 = 0;
+              let trueValue = model.value[modelKeyArr[n]];
+              //console.log(modelKeyArr[n])
+              /* console.log("conditionField====="+conditionField)
 							console.log("trueValue====="+trueValue)
 							console.log("conditionFieldValue-----"+conditionFieldValue) */
-							
-							if(trueValue==conditionFieldValue){
-								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
-								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
-								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
-								/* for(let a = 0;a<hideFieldConditionArr.length;a++){
+
+              if (trueValue == conditionFieldValue) {
+                //此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+                let flag = false; //其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+                //如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+                /* for(let a = 0;a<hideFieldConditionArr.length;a++){
 									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
 										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
 											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
@@ -383,236 +383,227 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 										}
 									}
 								} */
-								if(flag==false){
-									x++
-								}
-							}
-						}
-					}
-				}
-		}
-		//console.log(x,hideFieldArr,toshow)
-		if(x>0){
-			hideFieldArr = hideFieldArr.filter((item: string) => item!=toshow)
-		}
-		//console.log(x,hideFieldArr)
-	}
-	//将隐藏的字段值重置
-	for(let i = 0; i< hideFieldArr.length;i++){
-		//console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
-		if(typeof model.value[hideFieldArr[i]] === "string" || typeof model.value[hideFieldArr[i]] === "number"){
-			model.value[hideFieldArr[i]] = ""
-		}else if( model.value[hideFieldArr[i]] instanceof Array){
-			model.value[hideFieldArr[i]] = []
-		}else if(typeof model.value[hideFieldArr[i]] == "boolean"){
-			
-			model.value[hideFieldArr[i]] = false
-		}
-	}
-	//默认隐藏的字段中目前被显示出来的
-	nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
-	/* console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
+                if (flag == false) {
+                  x++;
+                }
+              }
+            }
+          }
+        }
+      }
+      //console.log(x,hideFieldArr,toshow)
+      if (x > 0) {
+        hideFieldArr = hideFieldArr.filter((item: string) => item != toshow);
+      }
+      //console.log(x,hideFieldArr)
+    }
+    //将隐藏的字段值重置
+    for (let i = 0; i < hideFieldArr.length; i++) {
+      //console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
+      if (
+        typeof model.value[hideFieldArr[i]] === "string" ||
+        typeof model.value[hideFieldArr[i]] === "number"
+      ) {
+        model.value[hideFieldArr[i]] = "";
+      } else if (model.value[hideFieldArr[i]] instanceof Array) {
+        model.value[hideFieldArr[i]] = [];
+      } else if (typeof model.value[hideFieldArr[i]] == "boolean") {
+        model.value[hideFieldArr[i]] = false;
+      }
+    }
+    //默认隐藏的字段中目前被显示出来的
+    nowShowingDefaultHideFieldArr = defaultHideFields.filter(
+      (a) => !hideFieldArr.includes(a)
+    );
+    /* console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
 	console.log(nowShowingDefaultHideFieldArr) */
-	/* for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
+    /* for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
 		//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
 		if()
 	} */
 
+    //console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
 
+    //编辑表单页不隐藏任何字段。
+    if (formProps.value.type != 5) {
+      //console.log(hideFieldArr)
+      props.formData.config.hideField?.push(...hideFieldArr); //实际造成隐藏效果
+    }
+  });
 
+  return hideFieldArr;
+};
+let asfRangeDoubleCondiChangeObj = ref();
+provide("asfRangeDoubleCondiChangeObj", asfRangeDoubleCondiChangeObj);
 
-
-	
-	//console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
-
-		
-//编辑表单页不隐藏任何字段。
-if(formProps.value.type!=5){
-	//console.log(hideFieldArr)
-	props.formData.config.hideField?.push(...hideFieldArr)//实际造成隐藏效果
-
-	
-	
-	
-}
-
-});
-
-
-
-
-	return hideFieldArr
-}
-let asfRangeDoubleCondiChangeObj = ref()
-provide('asfRangeDoubleCondiChangeObj',asfRangeDoubleCondiChangeObj)
-
-let oldModelStr = ""
-watch(() => model.value,(newVal) => {
-	let currentChangeKey = ""
-	const newModelStr = JSON.stringify(newVal);
-	let oldModelStr1 = oldModelStr
-	if (newModelStr!== oldModelStr1&&oldModelStr1!="") {
-		let oldVal =  JSON.parse(oldModelStr1);
-		for (const key in newVal) {
-			if (JSON.stringify(newVal[key])!== JSON.stringify(oldVal[key])) {
-				currentChangeKey = key
-			}
-		}
+let oldModelStr = "";
+watch(
+  () => model.value,
+  (newVal) => {
+    let currentChangeKey = "";
+    const newModelStr = JSON.stringify(newVal);
+    let oldModelStr1 = oldModelStr;
+    if (newModelStr !== oldModelStr1 && oldModelStr1 != "") {
+      let oldVal = JSON.parse(oldModelStr1);
+      for (const key in newVal) {
+        if (JSON.stringify(newVal[key]) !== JSON.stringify(oldVal[key])) {
+          currentChangeKey = key;
+        }
+      }
     }
-	let rangeFormulaArr = []
-	if(asfs.length>0){
-		asfs.forEach((element:any) => {
-			
-			let asfName = element.name
-			
-			if(element.control.dataRangeGongShi&&element.control.dataRangeGongShi.mathsFormula&&element.control.dataRangeGongShi.mathsFormula.length>0){
-				let asfRangeDoubleCondi = element.control.dataRangeGongShi.mathsFormula
-				
-				if(currentChangeKey!=""){
-				
-					let a = asfRangeDoubleCondi.split(":")
-					let field = a[a.length-1]
-					if(currentChangeKey==field){
-						let toShowDoubleCondiValVal = model.value[currentChangeKey]
-						//console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
-						let obj = {
-							asfName:asfName,
-							toShowDoubleCondiValVal:toShowDoubleCondiValVal
-						} 
-						asfRangeDoubleCondiChangeObj.value = obj
-						
-					}
-				}
-				
-			}
-		});
-	}
-	oldModelStr = newModelStr
-},{deep: true})
-
+    let rangeFormulaArr = [];
+    if (asfs.length > 0) {
+      asfs.forEach((element: any) => {
+        let asfName = element.name;
+
+        if (
+          element.control.dataRangeGongShi &&
+          element.control.dataRangeGongShi.mathsFormula &&
+          element.control.dataRangeGongShi.mathsFormula.length > 0
+        ) {
+          let asfRangeDoubleCondi = element.control.dataRangeGongShi.mathsFormula;
+
+          if (currentChangeKey != "") {
+            let a = asfRangeDoubleCondi.split(":");
+            let field = a[a.length - 1];
+            if (currentChangeKey == field) {
+              let toShowDoubleCondiValVal = model.value[currentChangeKey];
+              //console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
+              let obj = {
+                asfName: asfName,
+                toShowDoubleCondiValVal: toShowDoubleCondiValVal,
+              };
+              asfRangeDoubleCondiChangeObj.value = obj;
+            }
+          }
+        }
+      });
+    }
+    oldModelStr = newModelStr;
+  },
+  { deep: true }
+);
 
 // 表单组件值改变事件 tProp为子表格相关
 provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
-
-	 /* console.log("表单组件值改变事件----------1--------->",key)
+  /* console.log("表单组件值改变事件----------1--------->",key)
 	 console.log("表单组件值改变事件----------2--------->",value)
 	 console.log("表单组件值改变事件----------3--------->",data)
 	 console.log("表单组件值改变事件----------4--------->",tProp)
 	 console.log("表单组件值改变事件----------5--------->",type)
 	 console.log("表单组件值改变事件----------6--------->",attribute)
 	 console.log("表单组件值改变事件----------11--------->",model.value) */
-	let fieldVal =  {}
-	for(let i in model.value){
-		if(i == key){
-			fieldVal[i] = typeof value=="number"?value.toString():value;
-		}else{
-			fieldVal[i] = typeof model.value[i]=="number"?model.value[i].toString():model.value[i];
-		}
-		// console.log("监听表单--constControlChange----------1--------->",i,model.value[i])
-	}
-	// console.log("监听表单--fieldVal----------2--------->",fieldVal)
-	// let fieldVal =  {}
-	// validate((valid: boolean, fields: any) => {
-	// 	console.log("监听表单--constControlChange----------1--------->",fields)
-	// 	for(let i in fields){
-	// 		fieldVal[i]=fields[i].toString()
-
-	// 		console.log("监听表单--constControlChange----------2--------->",fields)
-	// 	}
-	// 	//判断是否进行计算
-		if(type == "digitpage"){
-
-			let oldFormConfig = props.formData.config
-			let newFormConfig = props.formData.config.groupKey
-			let odlHideField = props.formData.config.hideField
-			delete  props.formData.config.groupKey
-			console.log( props.formData)
-			delete  props.formData.config.hideField
-			let sendInfo = {
-				"fieldKey":key,
-				"mathsFornula":props.formData.config,
-				"keyVal":fieldVal
-			}
-			// console.log("sendInfoe-2->",props.formData,props.formData)
-			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
-				.then((data:any)=>{
-					// console.log("结果-->",data)
-					let formatRes: any = data.data
-					// 比较适用通用表单，保存在服务端
-					const afterResponse = props.formData.events?.afterResponse
-					
-					if (typeof afterResponse === 'string' && afterResponse) {
-						formatRes = formatResult(result, afterResponse)
-					} else if (typeof afterResponse === 'function') {
-						formatRes = afterResponse(result) ?? result
-					}
-					// 比较适用于导出vue文件
-					if (typeof props.afterResponse === 'string' && props.afterResponse) {
-						formatRes = formatResult(result, props.afterResponse)
-					} else if (typeof props.afterResponse === 'function') {
-						formatRes = props.afterResponse(result) ?? result
-					}
-					if (formatRes === false) {
-						return
-					}
-					// console.log("停止数据请求--->",formatRes)
-					setValue(formatRes.result || formatRes)
-					nextTick(() => {
-						// 将dict保存，可用于从接口中设置表单组件options。
-						if (formatRes.dict && Object.keys(formatRes.dict).length) {
-							resultDict.value = formatRes.dict
-						}
-						props.formData.config.groupKey = newFormConfig
-						props.formData.config.hideField = odlHideField
-						console.log( props.formData)
-					})
-				})
-				.finally(()=>{
-					props.formData.config.groupKey = newFormConfig
-					props.formData.config.hideField = odlHideField
-					console.log( props.formData)
-				})
-		}
-	// })
-	
-	showOrHide(data)
-
-	if (typeof props.changeKeyVal === 'function') {
-		props.changeKeyVal(key, value,type,attribute)
-	}
-    if (key) {
-		if (!tProp) {
-			// 表格和弹性布局不是这里更新，只触change
-			model.value[key] = value
-		}
-		// 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
-		if (props.formData.events?.change) {
-			model.value = props.formData.events.change(key, model.value)
-		}
-		const onFormChange = props.formData.events?.change
-		if (onFormChange) {
-			if (typeof onFormChange === 'function') {
-				model.value = onFormChange(key, model.value)
-			} else {
-				model.value = formChangeValue(key, model.value, onFormChange)
-			}
-		}
-		// 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
-		emits('change', { key, value, model: model.value, data, tProp })
+  let fieldVal = {};
+  for (let i in model.value) {
+    if (i == key) {
+      fieldVal[i] = typeof value == "number" ? value.toString() : value;
+    } else {
+      fieldVal[i] =
+        typeof model.value[i] == "number" ? model.value[i].toString() : model.value[i];
+    }
+    // console.log("监听表单--constControlChange----------1--------->",i,model.value[i])
+  }
+  // console.log("监听表单--fieldVal----------2--------->",fieldVal)
+  // let fieldVal =  {}
+  // validate((valid: boolean, fields: any) => {
+  // 	console.log("监听表单--constControlChange----------1--------->",fields)
+  // 	for(let i in fields){
+  // 		fieldVal[i]=fields[i].toString()
+
+  // 		console.log("监听表单--constControlChange----------2--------->",fields)
+  // 	}
+  // 	//判断是否进行计算
+  if (type == "digitpage") {
+    let oldFormConfig = props.formData.config;
+    let newFormConfig = props.formData.config.groupKey;
+    let odlHideField = props.formData.config.hideField;
+    delete props.formData.config.groupKey;
+    console.log(props.formData);
+    delete props.formData.config.hideField;
+    let sendInfo = {
+      fieldKey: key,
+      mathsFornula: props.formData.config,
+      keyVal: fieldVal,
+    };
+    // console.log("sendInfoe-2->",props.formData,props.formData)
+    currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations", sendInfo)
+      .then((data: any) => {
+        // console.log("结果-->",data)
+        let formatRes: any = data.data;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        // console.log("停止数据请求--->",formatRes)
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+          props.formData.config.groupKey = newFormConfig;
+          props.formData.config.hideField = odlHideField;
+          console.log(props.formData);
+        });
+      })
+      .finally(() => {
+        props.formData.config.groupKey = newFormConfig;
+        props.formData.config.hideField = odlHideField;
+        console.log(props.formData);
+      });
+  }
+  // })
+
+  showOrHide(data);
+
+  if (typeof props.changeKeyVal === "function") {
+    props.changeKeyVal(key, value, type, attribute);
+  }
+  if (key) {
+    if (!tProp) {
+      // 表格和弹性布局不是这里更新，只触change
+      model.value[key] = value;
+    }
+    // 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
+    if (props.formData.events?.change) {
+      model.value = props.formData.events.change(key, model.value);
+    }
+    const onFormChange = props.formData.events?.change;
+    if (onFormChange) {
+      if (typeof onFormChange === "function") {
+        model.value = onFormChange(key, model.value);
+      } else {
+        model.value = formChangeValue(key, model.value, onFormChange);
+      }
     }
+    // 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
+    emits("change", { key, value, model: model.value, data, tProp });
+  }
 
-		
-	/* 
+  /* 
 		
 	*/
-})
-let mustBeHidden: any = []
-
-let newModelKeyArr: string[] = []
-function showOrHide (data:any){
-	//console.log(data)
-	
-	/* 
+});
+let mustBeHidden: any = [];
+
+let newModelKeyArr: string[] = [];
+function showOrHide(data: any) {
+  //console.log(data)
+
+  /* 
 		企管部有当前用户,
 		当前用户是什么权限角色.
 		某表单某字段值大于等于小于不等于某个值
@@ -623,1533 +614,1552 @@ function showOrHide (data:any){
 		接口3:本表单(关联关联表单的表单)的某字段的当前值大于等于小于不等于指定的值???也许不需要接口呢?
 
 	*/
-	
-	//关联表单隐藏条件判定 start
-	for(let i = 0; i < props.formData.list.length; i++){
-		if(props.formData.list[i].type=="associatedForms"&&formProps.value.type!=5){
-			//console.log(props.formData.list[i].name)
-			let asfHideCondition = props.formData.list[i].control.hideGongShi.mathsFormula
-			const leftOperatorsAndRight = splitString(asfHideCondition)
-			
-			if(leftOperatorsAndRight){
-				
-				
-				let leftArr = leftOperatorsAndRight.left.split(":")
-				//console.log(leftArr)
-				if(data=="onMounted"||(leftArr[0]=="formField"&&leftArr.length==3)){
-					if(data=="onMounted"||(data!="kong"&&data.name==leftArr[2])){//关联表单隐藏相关的值发生了变化
-						
-						if(leftOperatorsAndRight.operator=="包含"){
-					
-							if(leftOperatorsAndRight.right=="当前用户"){
-								
-								if(leftOperatorsAndRight.left.startsWith("orgOrPerson")){
-									//接口2
-									
-									queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {   
-										if(data==true){
-											props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											mustBeHidden.push(props.formData.list[i].name)
-										}
-									});
-									
-								}else if(leftOperatorsAndRight.left.startsWith("roleid")){
-									//接口1
-									queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {   
-										if(data==true){
-											//alert(data)
-											props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											mustBeHidden.push(props.formData.list[i].name)
-										}
-									});
-								}
-							}
-						}else if(leftOperatorsAndRight.operator=="不包含"){
-							
-							if(leftOperatorsAndRight.right=="当前用户"){
-								
-								if(leftOperatorsAndRight.left.startsWith("orgOrPerson")){
-									
-									//接口2
-									queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {   
-										if(data==false){
-											props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											mustBeHidden.push(props.formData.list[i].name)
-										}
-									});
-								}else if(leftOperatorsAndRight.left.startsWith("roleid")){
-									//接口1
-									queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {   
-										if(data==false){
-											//alert(data)
-											props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											mustBeHidden.push(props.formData.list[i].name)
-										}
-									});
-								}
-							}
-						}else{
-							//console.log(leftOperatorsAndRight)
-							if(leftOperatorsAndRight.right=="当前用户"){
-								
-								if(leftOperatorsAndRight.operator=="=="){
-									//接口2
-									queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {   
-										if(data==true){
-											props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											mustBeHidden.push(props.formData.list[i].name)
-										}
-									});
-								}else if(leftOperatorsAndRight.operator=="!="){
-									//接口2
-									queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {   
-										if(data==true){
-											props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											mustBeHidden.push(props.formData.list[i].name)
-										}
-									});
-								}
-							}else{
-								//接口3
-								//console.log(leftOperatorsAndRight)
-								//console.log(data)
-								if(data.name==leftArr[2]){
-									console.log("ghasdhasdfhhsadhasd")
-									console.log(props.formData.list[i].name)
-									nextTick(()=>{
-										console.log(model.value[leftArr[2]])
-										if(leftOperatorsAndRight.operator == "=="){
-											if(model.value[leftArr[2]]==leftOperatorsAndRight.right){
-												props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											}else{
-												props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name)
-											}
-										}else if(leftOperatorsAndRight.operator == "!="){
-											if(model.value[leftArr[2]]!=leftOperatorsAndRight.right){
-												props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											}else{
-												props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name)
-											}
-										}else if(leftOperatorsAndRight.operator == ">="){
-											if(model.value[leftArr[2]]>=leftOperatorsAndRight.right){
-												props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											}else{
-												props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name)
-											}
-										}else if(leftOperatorsAndRight.operator == ">"){
-											if(model.value[leftArr[2]]>leftOperatorsAndRight.right){
-												props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											}else{
-												props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name)
-											}
-										}else if(leftOperatorsAndRight.operator == "<"){
-											if(model.value[leftArr[2]]<leftOperatorsAndRight.right){
-												props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											}else{
-												props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name)
-											}
-										}else if(leftOperatorsAndRight.operator == "<="){
-											if(model.value[leftArr[2]]<=leftOperatorsAndRight.right){
-												props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name)
-											}else{
-												props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name)
-											}
-										}
-									})
-									
-									
-								}
-								
-							}
-						}
-					}
-				}
-				
-					
-				
-				
-				
-			}
-		}
-	}
-		
-	//关联表单隐藏条件判定 end
-	
 
+  //关联表单隐藏条件判定 start
+  for (let i = 0; i < props.formData.list.length; i++) {
+    if (props.formData.list[i].type == "associatedForms" && formProps.value.type != 5) {
+      //console.log(props.formData.list[i].name)
+      let asfHideCondition = props.formData.list[i].control.hideGongShi.mathsFormula;
+      const leftOperatorsAndRight = splitString(asfHideCondition);
+
+      if (leftOperatorsAndRight) {
+        let leftArr = leftOperatorsAndRight.left.split(":");
+        //console.log(leftArr)
+        if (data == "onMounted" || (leftArr[0] == "formField" && leftArr.length == 3)) {
+          if (data == "onMounted" || (data != "kong" && data.name == leftArr[2])) {
+            //关联表单隐藏相关的值发生了变化
+
+            if (leftOperatorsAndRight.operator == "包含") {
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.left.startsWith("orgOrPerson")) {
+                  //接口2
+
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.left.startsWith("roleid")) {
+                  //接口1
+                  queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      //alert(data)
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              }
+            } else if (leftOperatorsAndRight.operator == "不包含") {
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.left.startsWith("orgOrPerson")) {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == false) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.left.startsWith("roleid")) {
+                  //接口1
+                  queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == false) {
+                      //alert(data)
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              }
+            } else {
+              //console.log(leftOperatorsAndRight)
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.operator == "==") {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.operator == "!=") {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      props.formData.config.hideField = addStringIfNotExists(
+                        props.formData.config.hideField,
+                        props.formData.list[i].name
+                      );
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              } else {
+                //接口3
+                //console.log(leftOperatorsAndRight)
+                //console.log(data)
+                if (data.name == leftArr[2]) {
+                  console.log("ghasdhasdfhhsadhasd");
+                  console.log(props.formData.list[i].name);
+                  nextTick(() => {
+                    console.log(model.value[leftArr[2]]);
+                    if (leftOperatorsAndRight.operator == "==") {
+                      if (model.value[leftArr[2]] == leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == "!=") {
+                      if (model.value[leftArr[2]] != leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == ">=") {
+                      if (model.value[leftArr[2]] >= leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == ">") {
+                      if (model.value[leftArr[2]] > leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == "<") {
+                      if (model.value[leftArr[2]] < leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    } else if (leftOperatorsAndRight.operator == "<=") {
+                      if (model.value[leftArr[2]] <= leftOperatorsAndRight.right) {
+                        props.formData.config.hideField = addStringIfNotExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      } else {
+                        props.formData.config.hideField = removeStringIfExists(
+                          props.formData.config.hideField,
+                          props.formData.list[i].name
+                        );
+                      }
+                    }
+                  });
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //关联表单隐藏条件判定 end
 
-	//liwenxuan 关联选项设置效果实现 start
-	 /* console.log("监听表单-1-constControlChange-->",props.formData)
+  //liwenxuan 关联选项设置效果实现 start
+  /* console.log("监听表单-1-constControlChange-->",props.formData)
 	 console.log("监听表单-2-constControlChange-->",key)
 	 console.log("监听表单-3-constControlChange-->", value)
 	 console.log("监听表单-4-constControlChange-->",data)
 	 console.log("监听表单-5-constControlChange-->",type)
 	 console.log("监听表单-6-constControlChange-->",attribute) */
-	
-
-
-
-	//得到当前表单各选项的值
-	//props.formData.config.hideField.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
-	
-	
-	
-	
-
-
-	//得到所有配置对象，包括radio,checkbox,select,switch
-	const radioSelectShowConfigArr = []
-	const checkboxShowConfigArr = []
-	const switchShowConfigArr = []
-	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr2。----用于获取所有出现在配置中的字段。
-	const radioSelectArr2:any[] = []
-
-	//20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan start 
-	//console.log(props.formData.list)			newModelKeyArr
-	for(let i = 0;i<props.formData.list.length;i++){
-		if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"||props.formData.list[i].type=="checkbox"||props.formData.list[i].type=="switch"){
-			props.formData.config.hideField = [];
-			if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"){
-				radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz)
-			}else if(props.formData.list[i].type=="checkbox"){
-				checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox)
-			}else if(props.formData.list[i].type=="switch"){
-				switchShowConfigArr.push(props.formData.list[i].control.glxxszSwitch)
-			}
-		}else if(props.formData.list[i].type=="card"||props.formData.list[i].type=="flex"||props.formData.list[i].type=="div"||props.formData.list[i].type=="table"){
-			props.formData.config.hideField = [];
-			let a = JSON.parse(JSON.stringify(props.formData.list[i].list));
-			for(let w = 0;w<a.length;w++){
-				if(a[w].type=="radio"||a[w].type=="select"){
-					//console.log(a[w])
-					radioSelectShowConfigArr.push(a[w].control.glxxsz)
-				}else if(a[w].type=="checkbox"){
-					checkboxShowConfigArr.push(a[w].control.glxxszForCheckBox)
-				}else if(a[w].type=="switch"){
-					switchShowConfigArr.push(a[w].control.glxxszSwitch)
-				}
-				newModelKeyArr.push(a[w].name)
-				
-			}
-		}else if(props.formData.list[i].type=="grid"){
-			props.formData.config.hideField = [];
-			let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
-			if(columns.length>0){
-				for(let z = 0;z<columns.length;z++){
-					for(let x = 0; x<columns[z].list.length;x++){
-						let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-						if(a.type=="radio"||a.type=="select"){
-							radioSelectShowConfigArr.push(a.control.glxxsz)
-						}else if(a.type=="checkbox"){
-							checkboxShowConfigArr.push(a.control.glxxszForCheckBox)
-						}else if(a.type=="switch"){
-							switchShowConfigArr.push(a.control.glxxszSwitch)
-						}
-						newModelKeyArr.push(a.name)
-						
-					}
-				}
-			}
-		}else if(props.formData.list[i].type=="tabs"){//tabs标签页有可能再嵌套一层flex或者table
-			props.formData.config.hideField = [];
-			let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
-			if(columns.length>0){
-				for(let z = 0;z<columns.length;z++){
-					for(let x = 0; x<columns[z].list.length;x++){
-						let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-						if(a.type=="radio"||a.type=="select"){
-							radioSelectShowConfigArr.push(a.control.glxxsz)
-						}else if(a.type=="checkbox"){
-							checkboxShowConfigArr.push(a.control.glxxszForCheckBox)
-						}else if(a.type=="switch"){
-							switchShowConfigArr.push(a.control.glxxszSwitch)
-						}else if(a.type=="flex"||a.type=="table"){
-							if(a.list.length>0){
-								for(let m = 0;m<a.list.length;m++){
-									let q = JSON.parse(JSON.stringify(a.list[m]))
-									//console.log(q)
-									if(q.type=="radio"||q.type=="select"){
-										radioSelectShowConfigArr.push(q.control.glxxsz)
-									}else if(q.type=="checkbox"){
-										checkboxShowConfigArr.push(q.control.glxxszForCheckBox)
-									}else if(q.type=="switch"){
-										switchShowConfigArr.push(q.control.glxxszSwitch)
-									}
-									newModelKeyArr.push(q.name)
-									
-								}
-							}
-						}
-						newModelKeyArr.push(a.name)
-						
-					}
-				}
-			}
-		}
-		newModelKeyArr.push(props.formData.list[i].name)
-		
-		
-		
-	}
-	newModelKeyArr = Array.from(new Set(newModelKeyArr));
-	//20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan end
-	//console.log(radioSelectShowConfigArr)
-	//数组深拷贝
-	const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
-	const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
-	const switchShowConfigArr2 = JSON.parse(JSON.stringify(switchShowConfigArr));
-	/* console.log(radioSelectShowConfigArr2)
+
+  //得到当前表单各选项的值
+  //props.formData.config.hideField.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+
+  //得到所有配置对象，包括radio,checkbox,select,switch
+  const radioSelectShowConfigArr = [];
+  const checkboxShowConfigArr = [];
+  const switchShowConfigArr = [];
+  //以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr2。----用于获取所有出现在配置中的字段。
+  const radioSelectArr2: any[] = [];
+
+  //20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan start
+  //console.log(props.formData.list)			newModelKeyArr
+  for (let i = 0; i < props.formData.list.length; i++) {
+    if (
+      props.formData.list[i].type == "radio" ||
+      props.formData.list[i].type == "select" ||
+      props.formData.list[i].type == "checkbox" ||
+      props.formData.list[i].type == "switch"
+    ) {
+      props.formData.config.hideField = [];
+      if (
+        props.formData.list[i].type == "radio" ||
+        props.formData.list[i].type == "select"
+      ) {
+        radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz);
+      } else if (props.formData.list[i].type == "checkbox") {
+        checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox);
+      } else if (props.formData.list[i].type == "switch") {
+        switchShowConfigArr.push(props.formData.list[i].control.glxxszSwitch);
+      }
+    } else if (
+      props.formData.list[i].type == "card" ||
+      props.formData.list[i].type == "flex" ||
+      props.formData.list[i].type == "div" ||
+      props.formData.list[i].type == "table"
+    ) {
+      props.formData.config.hideField = [];
+      let a = JSON.parse(JSON.stringify(props.formData.list[i].list));
+      for (let w = 0; w < a.length; w++) {
+        if (a[w].type == "radio" || a[w].type == "select") {
+          //console.log(a[w])
+          radioSelectShowConfigArr.push(a[w].control.glxxsz);
+        } else if (a[w].type == "checkbox") {
+          checkboxShowConfigArr.push(a[w].control.glxxszForCheckBox);
+        } else if (a[w].type == "switch") {
+          switchShowConfigArr.push(a[w].control.glxxszSwitch);
+        }
+        newModelKeyArr.push(a[w].name);
+      }
+    } else if (props.formData.list[i].type == "grid") {
+      props.formData.config.hideField = [];
+      let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
+      if (columns.length > 0) {
+        for (let z = 0; z < columns.length; z++) {
+          for (let x = 0; x < columns[z].list.length; x++) {
+            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+            if (a.type == "radio" || a.type == "select") {
+              radioSelectShowConfigArr.push(a.control.glxxsz);
+            } else if (a.type == "checkbox") {
+              checkboxShowConfigArr.push(a.control.glxxszForCheckBox);
+            } else if (a.type == "switch") {
+              switchShowConfigArr.push(a.control.glxxszSwitch);
+            }
+            newModelKeyArr.push(a.name);
+          }
+        }
+      }
+    } else if (props.formData.list[i].type == "tabs") {
+      //tabs标签页有可能再嵌套一层flex或者table
+      props.formData.config.hideField = [];
+      let columns = JSON.parse(JSON.stringify(props.formData.list[i].columns));
+      if (columns.length > 0) {
+        for (let z = 0; z < columns.length; z++) {
+          for (let x = 0; x < columns[z].list.length; x++) {
+            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+            if (a.type == "radio" || a.type == "select") {
+              radioSelectShowConfigArr.push(a.control.glxxsz);
+            } else if (a.type == "checkbox") {
+              checkboxShowConfigArr.push(a.control.glxxszForCheckBox);
+            } else if (a.type == "switch") {
+              switchShowConfigArr.push(a.control.glxxszSwitch);
+            } else if (a.type == "flex" || a.type == "table") {
+              if (a.list.length > 0) {
+                for (let m = 0; m < a.list.length; m++) {
+                  let q = JSON.parse(JSON.stringify(a.list[m]));
+                  //console.log(q)
+                  if (q.type == "radio" || q.type == "select") {
+                    radioSelectShowConfigArr.push(q.control.glxxsz);
+                  } else if (q.type == "checkbox") {
+                    checkboxShowConfigArr.push(q.control.glxxszForCheckBox);
+                  } else if (q.type == "switch") {
+                    switchShowConfigArr.push(q.control.glxxszSwitch);
+                  }
+                  newModelKeyArr.push(q.name);
+                }
+              }
+            }
+            newModelKeyArr.push(a.name);
+          }
+        }
+      }
+    }
+    newModelKeyArr.push(props.formData.list[i].name);
+  }
+  newModelKeyArr = Array.from(new Set(newModelKeyArr));
+  //20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan end
+  //console.log(radioSelectShowConfigArr)
+  //数组深拷贝
+  const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
+  const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
+  const switchShowConfigArr2 = JSON.parse(JSON.stringify(switchShowConfigArr));
+  /* console.log(radioSelectShowConfigArr2)
 	console.log(checkboxShowConfigArr2) */
-	//console.log("fodijafkjlsdhoidnfoidshojhfeknsidjfoiewhofnosdifhjeonoidufeinkdsaofhe")
-	//console.log(switchShowConfigArr2)
-
-	if(radioSelectShowConfigArr2.length>0){
-		for(let i = 0;i<radioSelectShowConfigArr2.length;i++){
-			if( radioSelectShowConfigArr2[i].length>0){
-				for(let j = 0;j<radioSelectShowConfigArr2[i].length;j++){
-					//数组深拷贝
-					const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
-					const optionValueJArr = jArr.optionValue
-					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
-						for(let n = 0;n<jArr.showFields.length;n++){
-							let fieldKeyArr = jArr.showFields[n].split(":")
-							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-							radioSelectArr2.push({
-								//conditionFieldKey:jArr.conditionField,
-								//conditionFieldValue:optionValueJArr,
-								toShowFieldKey:fieldKeyStr,
-							})
-						}
-					}
-				}
-			}
-		}
-	}
-
-	//将出现在多选配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
-	if(checkboxShowConfigArr2.length>0){
-		for(let i = 0;i<checkboxShowConfigArr2.length;i++){
-			//console.log(i)
-			if(checkboxShowConfigArr2[i].length>0){
-				for(let j = 0;j<checkboxShowConfigArr2[i].length;j++){
-					//console.log(j)
-					//console.log(checkboxShowConfigArr2[i][j].showFields)
-					if(checkboxShowConfigArr2[i][j].showFields.length>0){
-						for(let n = 0; n<checkboxShowConfigArr2[i][j].showFields.length;n++){
-							let fieldKeyArr = checkboxShowConfigArr2[i][j].showFields[n].split(":")
-							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-							//console.log(fieldKeyStr)
-							radioSelectArr2.push({
-								toShowFieldKey:fieldKeyStr,
-							})
-						}
-					}
-					
-				}
-			}
-		}
-	} 
-	
-	//将出现在开关配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
-	if(switchShowConfigArr2.length>0){
-		for(let i = 0;i<switchShowConfigArr2.length;i++){
-			if(switchShowConfigArr2[i].length>0){
-				for(let j = 0; j<switchShowConfigArr2[i].length;j++){
-					if(switchShowConfigArr2[i][j].showFields.length>0){
-						for(let n = 0; n<switchShowConfigArr2[i][j].showFields.length;n++){
-							//console.log("99999999999999999999------"+switchShowConfigArr2[i][j].showFields[n])
-							let fieldKeyArr = switchShowConfigArr2[i][j].showFields[n].split(":")
-							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-							//console.log(fieldKeyStr)
-							radioSelectArr2.push({
-								toShowFieldKey:fieldKeyStr,
-							})
-						}
-					}
-				}
-			}
-		}
-	}
-	//console.log("radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2=======")
-	//console.log(radioSelectArr2)
-	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
-	const radioSelectArr3:any[] = []
-	
-	if(radioSelectShowConfigArr2.length>0){
-		for(let i = 0;i<radioSelectShowConfigArr2.length;i++){
-			if( radioSelectShowConfigArr2[i].length>0){
-				for(let j = 0;j<radioSelectShowConfigArr2[i].length;j++){
-					//数组深拷贝
-					const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
-					const optionValueJArr = jArr.optionValue
-					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
-						if(jArr.showFields.length>1){
-							let arr1 = []
-							for(let n = 0;n<jArr.showFields.length;n++){
-								let fieldKeyArr = jArr.showFields[n].split(":")
-								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-								arr1.push(fieldKeyStr)
-							}
-							radioSelectArr3.push({
-								conditionFieldKey:jArr.conditionField,
-								conditionFieldValue:optionValueJArr,
-								toShowFieldKey:arr1,
-							})
-						}else{//等于1
-							for(let n = 0;n<jArr.showFields.length;n++){
-								let fieldKeyArr = jArr.showFields[n].split(":")
-								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-								radioSelectArr3.push({
-									conditionFieldKey:jArr.conditionField,
-									conditionFieldValue:optionValueJArr,
-									toShowFieldKey:[fieldKeyStr],
-								})
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-	//console.log(radioSelectArr3)
-	//将多选配置也放入radioSelectArr3
-	if(checkboxShowConfigArr2.length>0){
-		for(let i = 0;i<checkboxShowConfigArr2.length;i++){
-			if( checkboxShowConfigArr2[i].length>0){
-				for(let j = 0;j<checkboxShowConfigArr2[i].length;j++){
-					//数组深拷贝
-					const jArr = JSON.parse(JSON.stringify(checkboxShowConfigArr2[i][j]));
-					const optionValueJArr = jArr.selectedOptions
-					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
-						if(jArr.showFields.length>1){
-							let arr1 = []
-							for(let n = 0;n<jArr.showFields.length;n++){
-								let fieldKeyArr = jArr.showFields[n].split(":")
-								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-								arr1.push(fieldKeyStr)
-							}
-							radioSelectArr3.push({
-								conditionFieldKey:jArr.conditionField,
-								conditionFieldValue:optionValueJArr,
-								toShowFieldKey:arr1,
-							})
-						}else{//等于1
-							for(let n = 0;n<jArr.showFields.length;n++){
-								let fieldKeyArr = jArr.showFields[n].split(":")
-								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-								radioSelectArr3.push({
-									conditionFieldKey:jArr.conditionField,
-									conditionFieldValue:optionValueJArr,
-									toShowFieldKey:[fieldKeyStr],
-								})
-							}
-						}
-						
-					}
-				}
-			}
-		}
-	}
-	
-	//将开关配置也放入radioSelectArr3
-	if(switchShowConfigArr2.length>0){
-		for(let i = 0;i<switchShowConfigArr2.length;i++){
-			if(switchShowConfigArr2[i].length>0){
-				for(let j = 0;j<switchShowConfigArr2[i].length;j++){
-					//数组深拷贝
-					const jArr = JSON.parse(JSON.stringify(switchShowConfigArr2[i][j]));
-					//console.log("111111111111111111111-----------"+JSON.stringify(switchShowConfigArr2[i][j]))
-					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
-						const optionValueJArr = typeof(jArr.openValue)=="undefined"?jArr.offValue:jArr.openValue
-						let arr1 = []
-						for(let n = 0;n<jArr.showFields.length;n++){
-							let fieldKeyArr = jArr.showFields[n].split(":")
-							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-							//console.log(fieldKeyStr)
-							arr1.push(fieldKeyStr)
-						}
-						radioSelectArr3.push({
-								conditionFieldKey:jArr.conditionField,
-								conditionFieldValue:optionValueJArr,
-								toShowFieldKey:arr1,
-						})
-					}
-				}
-			}
-		}
-	}
-	//console.log(radioSelectArr3)
-	//暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
-	let hideFieldArr: any[] = [];
-	
-	//但凡配置条件的字段先放入隐藏数组中
-	for(let i = 0;i< radioSelectArr2.length;i++){
-		hideFieldArr.push(radioSelectArr2[i].toShowFieldKey)
-	} 
-	hideFieldArr = Array.from(new Set(hideFieldArr))
-	const defaultHideFields: any[] = JSON.parse(JSON.stringify(hideFieldArr))
-
-	for(let i = 0;i<defaultHideFields.length;i++){
-		hideFieldArr = recursionToGetFinallyHideFields(hideFieldArr,radioSelectArr3,defaultHideFields)
-	}
-	hideFieldArr = recursionToGetFinallyHideFields(hideFieldArr,radioSelectArr3,defaultHideFields)
-
-	props.formData.config.hideField?.push(...mustBeHidden)
-	
-
-	
-		
-		
-	
-	//console.log(props.formData.config.hideField)
-	
-	
-	
-	 //props.formData.config?.hideField?.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
-	//console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
+  //console.log("fodijafkjlsdhoidnfoidshojhfeknsidjfoiewhofnosdifhjeonoidufeinkdsaofhe")
+  //console.log(switchShowConfigArr2)
+
+  if (radioSelectShowConfigArr2.length > 0) {
+    for (let i = 0; i < radioSelectShowConfigArr2.length; i++) {
+      if (radioSelectShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < radioSelectShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.optionValue;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            for (let n = 0; n < jArr.showFields.length; n++) {
+              let fieldKeyArr = jArr.showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              radioSelectArr2.push({
+                //conditionFieldKey:jArr.conditionField,
+                //conditionFieldValue:optionValueJArr,
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将出现在多选配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+  if (checkboxShowConfigArr2.length > 0) {
+    for (let i = 0; i < checkboxShowConfigArr2.length; i++) {
+      //console.log(i)
+      if (checkboxShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < checkboxShowConfigArr2[i].length; j++) {
+          //console.log(j)
+          //console.log(checkboxShowConfigArr2[i][j].showFields)
+          if (checkboxShowConfigArr2[i][j].showFields.length > 0) {
+            for (let n = 0; n < checkboxShowConfigArr2[i][j].showFields.length; n++) {
+              let fieldKeyArr = checkboxShowConfigArr2[i][j].showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              radioSelectArr2.push({
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将出现在开关配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+  if (switchShowConfigArr2.length > 0) {
+    for (let i = 0; i < switchShowConfigArr2.length; i++) {
+      if (switchShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < switchShowConfigArr2[i].length; j++) {
+          if (switchShowConfigArr2[i][j].showFields.length > 0) {
+            for (let n = 0; n < switchShowConfigArr2[i][j].showFields.length; n++) {
+              //console.log("99999999999999999999------"+switchShowConfigArr2[i][j].showFields[n])
+              let fieldKeyArr = switchShowConfigArr2[i][j].showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              radioSelectArr2.push({
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+  //console.log("radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2=======")
+  //console.log(radioSelectArr2)
+  //以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
+  const radioSelectArr3: any[] = [];
+
+  if (radioSelectShowConfigArr2.length > 0) {
+    for (let i = 0; i < radioSelectShowConfigArr2.length; i++) {
+      if (radioSelectShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < radioSelectShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.optionValue;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            if (jArr.showFields.length > 1) {
+              let arr1 = [];
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                arr1.push(fieldKeyStr);
+              }
+              radioSelectArr3.push({
+                conditionFieldKey: jArr.conditionField,
+                conditionFieldValue: optionValueJArr,
+                toShowFieldKey: arr1,
+              });
+            } else {
+              //等于1
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                radioSelectArr3.push({
+                  conditionFieldKey: jArr.conditionField,
+                  conditionFieldValue: optionValueJArr,
+                  toShowFieldKey: [fieldKeyStr],
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  //console.log(radioSelectArr3)
+  //将多选配置也放入radioSelectArr3
+  if (checkboxShowConfigArr2.length > 0) {
+    for (let i = 0; i < checkboxShowConfigArr2.length; i++) {
+      if (checkboxShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < checkboxShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(checkboxShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.selectedOptions;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            if (jArr.showFields.length > 1) {
+              let arr1 = [];
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                arr1.push(fieldKeyStr);
+              }
+              radioSelectArr3.push({
+                conditionFieldKey: jArr.conditionField,
+                conditionFieldValue: optionValueJArr,
+                toShowFieldKey: arr1,
+              });
+            } else {
+              //等于1
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                radioSelectArr3.push({
+                  conditionFieldKey: jArr.conditionField,
+                  conditionFieldValue: optionValueJArr,
+                  toShowFieldKey: [fieldKeyStr],
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将开关配置也放入radioSelectArr3
+  if (switchShowConfigArr2.length > 0) {
+    for (let i = 0; i < switchShowConfigArr2.length; i++) {
+      if (switchShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < switchShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(switchShowConfigArr2[i][j]));
+          //console.log("111111111111111111111-----------"+JSON.stringify(switchShowConfigArr2[i][j]))
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            const optionValueJArr =
+              typeof jArr.openValue == "undefined" ? jArr.offValue : jArr.openValue;
+            let arr1 = [];
+            for (let n = 0; n < jArr.showFields.length; n++) {
+              let fieldKeyArr = jArr.showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              arr1.push(fieldKeyStr);
+            }
+            radioSelectArr3.push({
+              conditionFieldKey: jArr.conditionField,
+              conditionFieldValue: optionValueJArr,
+              toShowFieldKey: arr1,
+            });
+          }
+        }
+      }
+    }
+  }
+  //console.log(radioSelectArr3)
+  //暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
+  let hideFieldArr: any[] = [];
+
+  //但凡配置条件的字段先放入隐藏数组中
+  for (let i = 0; i < radioSelectArr2.length; i++) {
+    hideFieldArr.push(radioSelectArr2[i].toShowFieldKey);
+  }
+  hideFieldArr = Array.from(new Set(hideFieldArr));
+  const defaultHideFields: any[] = JSON.parse(JSON.stringify(hideFieldArr));
+
+  for (let i = 0; i < defaultHideFields.length; i++) {
+    hideFieldArr = recursionToGetFinallyHideFields(
+      hideFieldArr,
+      radioSelectArr3,
+      defaultHideFields
+    );
+  }
+  hideFieldArr = recursionToGetFinallyHideFields(
+    hideFieldArr,
+    radioSelectArr3,
+    defaultHideFields
+  );
+
+  props.formData.config.hideField?.push(...mustBeHidden);
+
+  //console.log(props.formData.config.hideField)
+
+  //props.formData.config?.hideField?.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+  //console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
 }
 
-
-
-
 function addStringIfNotExists(arr: string[], str: string) {
-	if (!arr.includes(str)) {
-		arr.push(str);
-	}
-	return arr;
+  if (!arr.includes(str)) {
+    arr.push(str);
+  }
+  return arr;
 }
 
-
 function removeStringIfExists(arr: string[], str: string) {
-	let newArr = [];
-	for(let item of arr) {
-		if(item!== str) {
-			newArr.push(item);
-		}
-	}
-	return newArr;
+  let newArr = [];
+  for (let item of arr) {
+    if (item !== str) {
+      newArr.push(item);
+    }
+  }
+  return newArr;
 }
 
 function queryIfOrgOrPerson(obj: { left: string; operator: string; right: string }) {
-	
-	return request({ 
-		url: '/javasys/lowCode/AssociatedForms/queryIfOrgOrPerson',
-		method: 'post',
-		data: obj,
-	});
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/queryIfOrgOrPerson",
+    method: "post",
+    data: obj,
+  });
 }
 
 function queryHideRoleCondition(obj: { left: string; operator: string; right: string }) {
-	
-	return request({ 
-		url: '/javasys/lowCode/AssociatedForms/queryHideRoleCondition',
-		method: 'post',
-		data: obj,
-	});
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/queryHideRoleCondition",
+    method: "post",
+    data: obj,
+  });
 }
 
-function splitString(str:string) {
-	const operators = ['==', '>', '>=', '<', '<=', '!=', '不包含' ,'包含'];
-	for (let operator of operators) {
-		if (str.includes(operator)) {
-			let index = str.indexOf(operator);
-			let left = str.slice(0, index).trim();
-			let right = str.slice(index + operator.length).trim();
-			return { left,operator, right };
-		}
-	}
+function splitString(str: string) {
+  const operators = ["==", ">", ">=", "<", "<=", "!=", "不包含", "包含"];
+  for (let operator of operators) {
+    if (str.includes(operator)) {
+      let index = str.indexOf(operator);
+      let left = str.slice(0, index).trim();
+      let right = str.slice(index + operator.length).trim();
+      return { left, operator, right };
+    }
+  }
 }
 
 const dictForm = computed(() => {
-    const storage = window.localStorage.getItem('akFormDict')
-    let storageDict = {}
-    if (storage) {
-      	storageDict = JSON.parse(storage)
-    }
-    // 全局的、当前表单配置的以及接口返回的
-    return Object.assign({}, storageDict, props.dict, resultDict.value)
-})
+  const storage = window.localStorage.getItem("akFormDict");
+  let storageDict = {};
+  if (storage) {
+    storageDict = JSON.parse(storage);
+  }
+  // 全局的、当前表单配置的以及接口返回的
+  return Object.assign({}, storageDict, props.dict, resultDict.value);
+});
 // 表单参数
 const formProps = computed(() => {
-    return {
-		model: model.value,
-		type: props.type,
-		hideField: props.formData.config?.hideField as [],
-		showColon: props.formData.form.showColon,
-		dict: dictForm.value
-    }
-})
-
-
-
+  return {
+    model: model.value,
+    type: props.type,
+    hideField: props.formData.config?.hideField as [],
+    showColon: props.formData.form.showColon,
+    dict: dictForm.value,
+  };
+});
 
-provide(constFormProps, formProps)
+provide(constFormProps, formProps);
 
 // 提供一个方法，用于根据name从formData.list里查找数据
 const getNameForEach = (data: any, name: string) => {
-    let temp = {}
-    for (const key in data) {
-		const dataKey = data[key]
-		if (dataKey.name === name) {
-			return dataKey
-		}
-		if (['grid', 'tabs'].includes(dataKey.type)) {
-			dataKey.columns.forEach((co: any) => {
-				temp = getNameForEach(co.list, name)
-			})
-		}
-		if (['card', 'div'].includes(dataKey.type)) {
-			temp = getNameForEach(dataKey.list, name)
-		}
+  let temp = {};
+  for (const key in data) {
+    const dataKey = data[key];
+    if (dataKey.name === name) {
+      return dataKey;
     }
-    return temp
-}
+    if (["grid", "tabs"].includes(dataKey.type)) {
+      dataKey.columns.forEach((co: any) => {
+        temp = getNameForEach(co.list, name);
+      });
+    }
+    if (["card", "div"].includes(dataKey.type)) {
+      temp = getNameForEach(dataKey.list, name);
+    }
+  }
+  return temp;
+};
 const getControlByName = (name: string) => {
-    return getNameForEach(props.formData.list, name)
-}
-provide(constGetControlByName, getControlByName)
+  return getNameForEach(props.formData.list, name);
+};
+provide(constGetControlByName, getControlByName);
 // 表单检验方法
-const ruleForm = ref()
+const ruleForm = ref();
 const validate = (callback: any) => {
-    ruleForm.value.validate((valid: boolean, fields: any) => {
-
-		// console.log("ruleForm.value--->filter-->",ruleForm.value)
-		// console.log("getValue--->fields-->",fields)
-		// console.log("getValue--->valid-->",valid)
-
-		let fieldValue = fields
-		if (valid) {
-			// 校验通过，返回当前表单的值
-			fieldValue = getValue()
-		}
-		callback(valid, fieldValue)
-    })
-}
+  ruleForm.value.validate((valid: boolean, fields: any) => {
+    // console.log("ruleForm.value--->filter-->",ruleForm.value)
+    // console.log("getValue--->fields-->",fields)
+    // console.log("getValue--->valid-->",valid)
+
+    let fieldValue = fields;
+    if (valid) {
+      // 校验通过，返回当前表单的值
+      fieldValue = getValue();
+    }
+    callback(valid, fieldValue);
+  });
+};
 // 提供一个取值的方法
 const getValue = (filter?: boolean) => {
-	// console.log("getValue--->filter-->",filter)
-	// console.log("getValue--->model-->",model)
-    if (filter) {
-		const obj: any = {}
-		for (const key in model.value) {
-			// eslint-disable-next-line no-prototype-builtins
-			if (model.value.hasOwnProperty(key)) {
-				const val = (model.value as any)[key]
-				if (!/^\s*$/.test(val)) {
-					obj[key] = val
-				}
-			}
-		}
-		return obj
-    } else {
-		// console.log("getValue--->model-value->",model.value)
-      	return model.value
+  // console.log("getValue--->filter-->",filter)
+  // console.log("getValue--->model-->",model)
+  if (filter) {
+    const obj: any = {};
+    for (const key in model.value) {
+      // eslint-disable-next-line no-prototype-builtins
+      if (model.value.hasOwnProperty(key)) {
+        const val = (model.value as any)[key];
+        if (!/^\s*$/.test(val)) {
+          obj[key] = val;
+        }
+      }
     }
-}
+    return obj;
+  } else {
+    // console.log("getValue--->model-value->",model.value)
+    return model.value;
+  }
+};
 // 对表单设置初始值
 const setValue = (obj: { [key: string]: any }, filter?: boolean) => {
-    // 分两种，false时将obj所有值合并到model，当obj有某些值不存于表单中，也会合并到model，当提交表单也会提交此值
-    // true则过滤没用的值，即存在当前表单的才合并
-    if (filter) {
-		for (const key in obj) {
-			if (model.value[key] !== undefined) {
-				model.value[key] = obj[key]
-			}
-		}
-    } else {
-      	model.value = Object.assign({}, model.value, jsonParseStringify(obj)) // 防止列表直接使用set方法对弹窗表单编辑，当重置表单时当前行数据被清空
+  // 分两种，false时将obj所有值合并到model，当obj有某些值不存于表单中，也会合并到model，当提交表单也会提交此值
+  // true则过滤没用的值，即存在当前表单的才合并
+  if (filter) {
+    for (const key in obj) {
+      if (model.value[key] !== undefined) {
+        model.value[key] = obj[key];
+      }
     }
-}
+  } else {
+    model.value = Object.assign({}, model.value, jsonParseStringify(obj)); // 防止列表直接使用set方法对弹窗表单编辑，当重置表单时当前行数据被清空
+  }
+};
 // 对表单选择项快速设置
-const setFormOptions = ref({})
-provide(constSetFormOptions, setFormOptions)
+const setFormOptions = ref({});
+provide(constSetFormOptions, setFormOptions);
 const setOptions = (obj: { [key: string]: string[] }) => {
-    setFormOptions.value = obj
-}
+  setFormOptions.value = obj;
+};
 // 追加移除style样式
 const appendRemoveStyle = (type?: boolean) => {
-    try {
-		const {
-			config:{ style }
-		} = props.formData
-		appendOrRemoveStyle('formStyle', style || '', type)
-    } catch (e) {
-      /* empty */
-    }
-}
+  try {
+    const {
+      config: { style },
+    } = props.formData;
+    appendOrRemoveStyle("formStyle", style || "", type);
+  } catch (e) {
+    /* empty */
+  }
+};
 
 // 按钮组件事件
 provide(constFormBtnEvent, (obj: any) => {
-	console.log("点击的哪个按钮----》",obj.key);
-    emits('btnClick', obj.key)
-    if ([3, 4, 5].includes(props.type)) {
-      	return ElMessage.error('当前模式不能提交表单')
-    }
-    switch (obj.key) {
-		case 'submit':
-			submit() // 提交
-			break
-		case 'reset':
-			resetFields() // 重置
-			break
-		case 'cancel': // 取消返回，
-			// router.go(-1) //这个刷新后可能会失败
-			let notReturn
-			if (typeof props.closeAppSubmit === 'function') {
-				notReturn = props.closeAppSubmit()
-			}
-			break
-		case 'saveDraft':	//保存草稿
-			saveDraft() // 保存草稿
-			// console.log("保存草稿--------->saveDraft")
-			break
-		case "saveEditDraft": //保存草稿		只保存表单不操作流程
-			saveEditDraft()
-			// console.log("保存草稿--------->saveEditDraft")
-			break
-		case 'afreshSubmit':	//重新提交流程
-			afreshSubmit() // 提交
-			break
-		case 'draftSubmit':	//草稿提交审批
-			draftSubmit()
-			break
-		case 'submitEdit': //申请修改
-			submitEditButton()
-			break
-		default:
-			break
-    }
-})
+  console.log("点击的哪个按钮----》", obj.key);
+  emits("btnClick", obj.key);
+  if ([3, 4, 5].includes(props.type)) {
+    return ElMessage.error("当前模式不能提交表单");
+  }
+  switch (obj.key) {
+    case "submit":
+      submit(); // 提交
+      break;
+    case "reset":
+      resetFields(); // 重置
+      break;
+    case "cancel": // 取消返回，
+      // router.go(-1) //这个刷新后可能会失败
+      let notReturn;
+      if (typeof props.closeAppSubmit === "function") {
+        notReturn = props.closeAppSubmit();
+      }
+      break;
+    case "saveDraft": //保存草稿
+      saveDraft(); // 保存草稿
+      // console.log("保存草稿--------->saveDraft")
+      break;
+    case "saveEditDraft": //保存草稿		只保存表单不操作流程
+      saveEditDraft();
+      // console.log("保存草稿--------->saveEditDraft")
+      break;
+    case "afreshSubmit": //重新提交流程
+      afreshSubmit(); // 提交
+      break;
+    case "draftSubmit": //草稿提交审批
+      draftSubmit();
+      break;
+    case "submitEdit": //申请修改
+      submitEditButton();
+      break;
+    default:
+      break;
+  }
+});
 //修改流程表单数据回显
 const getEditData = (params = {}) => {
-	let requestUrl ="/systemapi/task_flow/gainEditFormFlowInfo"
-	loading.value = true
-    const newParams: any = params
-    // 同时可使用props或是events里的事件，根据使用使用其中一种即可
-    let newParams2
-    const beforeRequest = props.formData.events?.beforeRequest
-    if (typeof beforeRequest === 'function') {
-      	newParams2 = beforeRequest(newParams, route)
-    }
-    if (typeof props.beforeRequest === 'function') {
-      	newParams2 = props.beforeRequest(newParams, route)
-    }
-    if (newParams2 === false) {
-		// 停止数据请求
-		return
-    }
-	currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
-		.then((res: any) => {
-			loading.value = false
-			const result = res.data.masterDataInfo
-			result.formKey = newParams.id
-			result.formId = newParams.version
-			
-			if (result) {
-				let formatRes: any = result
-				// 比较适用通用表单，保存在服务端
-				const afterResponse = props.formData.events?.afterResponse
-				
-				if (typeof afterResponse === 'string' && afterResponse) {
-					formatRes = formatResult(result, afterResponse)
-				} else if (typeof afterResponse === 'function') {
-					formatRes = afterResponse(result) ?? result
-				}
-				// 比较适用于导出vue文件
-				if (typeof props.afterResponse === 'string' && props.afterResponse) {
-					formatRes = formatResult(result, props.afterResponse)
-				} else if (typeof props.afterResponse === 'function') {
-					formatRes = props.afterResponse(result) ?? result
-				}
-				if (formatRes === false) {
-					return
-				}
-				// console.log("停止数据请求--->",formatRes)
-				setValue(formatRes.result || formatRes)
-				nextTick(() => {
-					// 将dict保存，可用于从接口中设置表单组件options。
-					if (formatRes.dict && Object.keys(formatRes.dict).length) {
-						resultDict.value = formatRes.dict
-					}
-				})
-			}
-			return res.data
-		})
-		.catch(res => {
-			loading.value = false
-			return ElMessage.error(res.message)
-		})
-}
+  let requestUrl = "/systemapi/task_flow/gainEditFormFlowInfo";
+  loading.value = true;
+  const newParams: any = params;
+  // 同时可使用props或是events里的事件，根据使用使用其中一种即可
+  let newParams2;
+  const beforeRequest = props.formData.events?.beforeRequest;
+  if (typeof beforeRequest === "function") {
+    newParams2 = beforeRequest(newParams, route);
+  }
+  if (typeof props.beforeRequest === "function") {
+    newParams2 = props.beforeRequest(newParams, route);
+  }
+  if (newParams2 === false) {
+    // 停止数据请求
+    return;
+  }
+  currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
+    .then((res: any) => {
+      loading.value = false;
+      const result = res.data.masterDataInfo;
+      result.formKey = newParams.id;
+      result.formId = newParams.version;
+
+      if (result) {
+        let formatRes: any = result;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        // console.log("停止数据请求--->",formatRes)
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+        });
+      }
+      return res.data;
+    })
+    .catch((res) => {
+      loading.value = false;
+      return ElMessage.error(res.message);
+    });
+};
 
 // 获取表单数据，编辑时，外部调用
 const getData = (params = {}) => {
-    let requestUrl = props.formData.config?.requestUrl || props.requestUrl
-    if (props.type === 5 || !requestUrl || props.isSearch) {
-		console.error('执行了获取数据方法，但配置有误！')
-		return
-    }
-	switch(requestUrl){
-		case "getFormContent":
-			requestUrl ="/systemapi/task_management/look_customer_formdata"
-			break;
-		case "saveFormContent":
-			// requestUrl ="/systemapi/task_management/customer_form_adddata"
-			requestUrl ="/systemapi/task_management/add_form_data"
-			break;
-		case "editFormContent":
-			// requestUrl ="/systemapi/task_management/newcust_form_editdata"
-			requestUrl ="/systemapi/task_management/add_customer_form"
-			break;
-		default:
-	}
-	
-    loading.value = true
-    const newParams: any = params
-    // 同时可使用props或是events里的事件，根据使用使用其中一种即可
-    let newParams2
-    const beforeRequest = props.formData.events?.beforeRequest
-    if (typeof beforeRequest === 'function') {
-      	newParams2 = beforeRequest(newParams, route)
-    }
-    if (typeof props.beforeRequest === 'function') {
-      	newParams2 = props.beforeRequest(newParams, route)
-    }
-    if (newParams2 === false) {
-		// 停止数据请求
-		return
-    }
-	currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
-		.then((res: any) => {
-			loading.value = false
-			const result = res.data
-			result.formKey = newParams.id
-			result.formId = newParams.version
-			// console.log("停止数据请求--->",newParams)
-			if (result) {
-				let formatRes: any = result
-				// 比较适用通用表单，保存在服务端
-				const afterResponse = props.formData.events?.afterResponse
-				if (typeof afterResponse === 'string' && afterResponse) {
-					formatRes = formatResult(result, afterResponse)
-				} else if (typeof afterResponse === 'function') {
-					formatRes = afterResponse(result) ?? result
-				}
-				// 比较适用于导出vue文件
-				if (typeof props.afterResponse === 'string' && props.afterResponse) {
-					formatRes = formatResult(result, props.afterResponse)
-				} else if (typeof props.afterResponse === 'function') {
-					formatRes = props.afterResponse(result) ?? result
-				}
-				if (formatRes === false) {
-					return
-				}
-				setValue(formatRes.result || formatRes)
-				nextTick(() => {
-					// 将dict保存，可用于从接口中设置表单组件options。
-					if (formatRes.dict && Object.keys(formatRes.dict).length) {
-						resultDict.value = formatRes.dict
-					}
-				})
-			}
-		})
-		.catch(res => {
-			loading.value = false
-			return ElMessage.error(res.message)
-		})
-	// console.log("res------执行了获取数据方法，但配置有误----->", requestUrl,newParams2,newParams)
-
-    
-}
+  let requestUrl = props.formData.config?.requestUrl || props.requestUrl;
+  if (props.type === 5 || !requestUrl || props.isSearch) {
+    console.error("执行了获取数据方法，但配置有误！");
+    return;
+  }
+  switch (requestUrl) {
+    case "getFormContent":
+      requestUrl = "/systemapi/task_management/look_customer_formdata";
+      break;
+    case "saveFormContent":
+      // requestUrl ="/systemapi/task_management/customer_form_adddata"
+      requestUrl = "/systemapi/task_management/add_form_data";
+      break;
+    case "editFormContent":
+      // requestUrl ="/systemapi/task_management/newcust_form_editdata"
+      requestUrl = "/systemapi/task_management/add_customer_form";
+      break;
+    default:
+  }
+
+  loading.value = true;
+  const newParams: any = params;
+  // 同时可使用props或是events里的事件，根据使用使用其中一种即可
+  let newParams2;
+  const beforeRequest = props.formData.events?.beforeRequest;
+  if (typeof beforeRequest === "function") {
+    newParams2 = beforeRequest(newParams, route);
+  }
+  if (typeof props.beforeRequest === "function") {
+    newParams2 = props.beforeRequest(newParams, route);
+  }
+  if (newParams2 === false) {
+    // 停止数据请求
+    return;
+  }
+  currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
+    .then((res: any) => {
+      loading.value = false;
+      const result = res.data;
+      result.formKey = newParams.id;
+      result.formId = newParams.version;
+      // console.log("停止数据请求--->",newParams)
+      if (result) {
+        let formatRes: any = result;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+        });
+      }
+    })
+    .catch((res) => {
+      loading.value = false;
+      return ElMessage.error(res.message);
+    });
+  // console.log("res------执行了获取数据方法，但配置有误----->", requestUrl,newParams2,newParams)
+};
 //新增、查看、保存数据
 const submit = (params = {}) => {
-    let addUrl = props.formData.config?.addUrl || props.addUrl
-    let editUrl = props.formData.config?.editUrl || props.editUrl
-    let apiUrl = props.type === 1 ? addUrl : editUrl
-
-	console.log("新增、查看、保存数据",apiUrl,props.type,props.addUrl,props.editUrl)
-    if (props.isSearch || !apiUrl || loading.value) {
-		if (!props.isSearch && !apiUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		// 列表里作为筛选时，不提交表单
-		return
+  let addUrl = props.formData.config?.addUrl || props.addUrl;
+  let editUrl = props.formData.config?.editUrl || props.editUrl;
+  let apiUrl = props.type === 1 ? addUrl : editUrl;
+
+  console.log("新增、查看、保存数据", apiUrl, props.type, props.addUrl, props.editUrl);
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	switch(apiUrl){
-		case "getFormContent":
-			 apiUrl ="/systemapi/task_management/look_customer_formdata"
-			break;
-		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_customer_form"
-			break;
-		case "editFormContent":
-			 apiUrl ="/systemapi/task_management/editCustomerTable"
-			break;
-		case "addData":
-			 apiUrl ="/systemapi/task_management/createAppTask"
-			break;
-		default:
-	}
-    validate((valid: boolean, fields: any) => {
-		
-		if (valid) {
-			
-			const formatParams = Object.assign({}, fields, params)
-			// console.log("params--->",params)
-			// console.log("fields--->",fields)
-			// console.log("formatParams-Object-->",formatParams)
-
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			// console.log("beforeSubmit--->",beforeSubmit)
-			// console.log("props.beforeSubmit--->",props.beforeSubmit)
-			// console.log("props.beforeSubmit--->",props.beforeSubmit)
-			formatParams.versionId=props.versionId
-			formatParams.appKey=props.groupid
-			formatParams.status=2
-			// loading.value = true
-			console.log("apiUrl--->",apiUrl)
-			console.log("submitParams--->",submitParams)
-			console.log("formatParams--->",formatParams)
-
-			// debugger
-			// 提交保存表单
-			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
-				.then((res: any) => {
-					// console.log("formatParams--111->",res)
-						afterSubmit('success', res)
-					})
-					.catch(res => {
-						afterSubmit('fail', res)
-					})
-			// getRequest(apiUrl, submitParams ?? formatParams)
-			// 	.then((res: any) => {
-			// 		afterSubmit('success', res)
-			// 	})
-			// 	.catch(res => {
-			// 		afterSubmit('fail', res)
-			// 	})
-		} else {
-			// 没通过校验
-			afterSubmit('validate', fields)
-		}
-    })
-}
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  switch (apiUrl) {
+    case "getFormContent":
+      apiUrl = "/systemapi/task_management/look_customer_formdata";
+      break;
+    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_customer_form";
+      break;
+    case "editFormContent":
+      apiUrl = "/systemapi/task_management/editCustomerTable";
+      break;
+    case "addData":
+      apiUrl = "/systemapi/task_management/createAppTask";
+      break;
+    default:
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      // console.log("params--->",params)
+      // console.log("fields--->",fields)
+      // console.log("formatParams-Object-->",formatParams)
+
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // console.log("beforeSubmit--->",beforeSubmit)
+      // console.log("props.beforeSubmit--->",props.beforeSubmit)
+      // console.log("props.beforeSubmit--->",props.beforeSubmit)
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 2;
+      // loading.value = true
+      console.log("apiUrl--->", apiUrl);
+      console.log("submitParams--->", submitParams);
+      console.log("formatParams--->", formatParams);
+
+      // debugger
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          // console.log("formatParams--111->",res)
+          afterSubmit("success", res);
+        })
+        .catch((res) => {
+          afterSubmit("fail", res);
+        });
+      // getRequest(apiUrl, submitParams ?? formatParams)
+      // 	.then((res: any) => {
+      // 		afterSubmit('success', res)
+      // 	})
+      // 	.catch(res => {
+      // 		afterSubmit('fail', res)
+      // 	})
+    } else {
+      // 没通过校验
+      afterSubmit("validate", fields);
+    }
+  });
+};
 // 不管成功失败，有事件时都需要执行回调
 const afterSubmit = (type: string, res: any) => {
-    const afterSubmit = props.formData.events?.afterSubmit
-    let notReturn
-    if (typeof afterSubmit === 'function') {
-      	notReturn = afterSubmit(type, res)
-    } else if (typeof props.afterSubmit === 'function') {
-      	notReturn = props.afterSubmit(type, res)
-		//   console.log("notReturn--123456->",props.afterSubmit)
-    }
-	// console.log("notReturn--->",notReturn)
-	// console.log("afterSubmit--->",afterSubmit)
-	// console.log("typeof afterSubmit--->",typeof afterSubmit)
-	// console.log("type--->",type)
-	// console.log("res--->",res)
-	// console.log("props.formData.events--->",props.formData.events)
-	// console.log("props.formData.events?.afterSubmit--->",props.formData.events?.afterSubmit)
-
-    loading.value = false
-    // 不管结果，重置表单，防再次打开时保留上一次的值
-    // resetFields()
-    if (notReturn === false) {
-		// 有返回false时则不提示
-		return
-    }
-    if (type === 'success') {
-      	ElMessage.success(res.msg || '保存成功！')
-    } else if (type === 'fail') {
-      	ElMessage.error(res.message || '保存失败！')
-    }
-}
+  const afterSubmit = props.formData.events?.afterSubmit;
+  let notReturn;
+  if (typeof afterSubmit === "function") {
+    notReturn = afterSubmit(type, res);
+  } else if (typeof props.afterSubmit === "function") {
+    notReturn = props.afterSubmit(type, res);
+    //   console.log("notReturn--123456->",props.afterSubmit)
+  }
+  // console.log("notReturn--->",notReturn)
+  // console.log("afterSubmit--->",afterSubmit)
+  // console.log("typeof afterSubmit--->",typeof afterSubmit)
+  // console.log("type--->",type)
+  // console.log("res--->",res)
+  // console.log("props.formData.events--->",props.formData.events)
+  // console.log("props.formData.events?.afterSubmit--->",props.formData.events?.afterSubmit)
+
+  loading.value = false;
+  // 不管结果，重置表单，防再次打开时保留上一次的值
+  // resetFields()
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
 // 表单初始值
 watch(
-    () => props.value,
-    (v: any) => {
-      	v && setValue(v)
-    },
-    {
-      	immediate: true
-    }
-)
+  () => props.value,
+  (v: any) => {
+    v && setValue(v);
+  },
+  {
+    immediate: true,
+  }
+);
 // 表单options
 watch(
-    () => props.options,
-    (v: any) => {
-      	v && setOptions(v)
-    }
-)
+  () => props.options,
+  (v: any) => {
+    v && setOptions(v);
+  }
+);
 // ------------------------数据处理结束------------------------
-const asfs: any[] = []
-const tables: any[] = []
-function getAsfs(){
-	setTimeout(()=>{
-		let dataList = ref({})
-		dataList.value = props.formData.list
-		
-		if(dataList&&Array.isArray(dataList.value)&&dataList.value.length>0){
-			for(let i = 0;i<dataList.value.length;i++){
-				if(dataList.value[i].type=="associatedForms"){
-					asfs.push(dataList.value[i])
-				}else if(dataList.value[i].type=="card"||dataList.value[i].type=="flex"||dataList.value[i].type=="div"||dataList.value[i].type=="table"){
-
-					if(dataList.value[i].type=="table"){
-						tables.push(dataList.value[i])
-					}
-					
-					dataList.value[i].list.forEach((element:any) => {
-						if(element.type=="associatedForms"){
-							asfs.push(element)
-						}
-					});
-				}else if(dataList.value[i].type=="grid"){
-					let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
-					
-					if(columns.length>0){ 
-						for(let z = 0;z<columns.length;z++){
-							for(let x = 0; x<columns[z].list.length;x++){
-								let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-								
-								if(a.type=="associatedForms"){
-									asfs.push(a)
-								}
-								
-							}
-						}
-					}
-				}else if(dataList.value[i].type=="tabs"){//tabs标签页有可能再嵌套一层flex或者table
-					let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
-					if(columns.length>0){
-						for(let z = 0;z<columns.length;z++){
-							for(let x = 0; x<columns[z].list.length;x++){
-								let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-								
-								if(a.type=="associatedForms"){
-									asfs.push(a)
-								}else if(a.type=="flex"||a.type=="table"){
-
-									if(a.type=="table"){
-										tables.push(dataList.value[i])
-									}
-
-									if(a.list.length>0){
-										for(let m = 0;m<a.list.length;m++){
-											let q = JSON.parse(JSON.stringify(a.list[m]))
-											
-											if(q.type=="associatedForms"){
-												asfs.push(q)
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}	
-			}
-			
-		}
-	},500)
+const asfs: any[] = [];
+const tables: any[] = [];
+function getAsfs() {
+  setTimeout(() => {
+    let dataList = ref({});
+    dataList.value = props.formData.list;
+
+    if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+      for (let i = 0; i < dataList.value.length; i++) {
+        if (dataList.value[i].type == "associatedForms") {
+          asfs.push(dataList.value[i]);
+        } else if (
+          dataList.value[i].type == "card" ||
+          dataList.value[i].type == "flex" ||
+          dataList.value[i].type == "div" ||
+          dataList.value[i].type == "table"
+        ) {
+          if (dataList.value[i].type == "table") {
+            tables.push(dataList.value[i]);
+          }
+
+          dataList.value[i].list.forEach((element: any) => {
+            if (element.type == "associatedForms") {
+              asfs.push(element);
+            }
+          });
+        } else if (dataList.value[i].type == "grid") {
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                }
+              }
+            }
+          }
+        } else if (dataList.value[i].type == "tabs") {
+          //tabs标签页有可能再嵌套一层flex或者table
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                } else if (a.type == "flex" || a.type == "table") {
+                  if (a.type == "table") {
+                    tables.push(dataList.value[i]);
+                  }
+
+                  if (a.list.length > 0) {
+                    for (let m = 0; m < a.list.length; m++) {
+                      let q = JSON.parse(JSON.stringify(a.list[m]));
+
+                      if (q.type == "associatedForms") {
+                        asfs.push(q);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }, 500);
 }
 
-
-
 // 重置表单方法
 const resetFields = () => {
-    ruleForm.value.resetFields()
-    // setValue(Object.assign(model.value, obj || {})) // 这才能清空组件显示的值
-}
+  ruleForm.value.resetFields();
+  // setValue(Object.assign(model.value, obj || {})) // 这才能清空组件显示的值
+};
 onMounted(() => {
-	// console.log("数据处理结束--->",props.formData)
-    getInitModel()
-    nextTick(() => {
-      	appendRemoveStyle(true)
-    })
-	showOrHide("kong")
-	getAsfs()
-})
+  // console.log("数据处理结束--->",props.formData)
+  getInitModel();
+  nextTick(() => {
+    appendRemoveStyle(true);
+  });
+  showOrHide("kong");
+  getAsfs();
+});
 onUnmounted(() => {
-    if (eventName) {
-		// @ts-ignore
-		window[eventName] = ''
-    }
-    appendRemoveStyle()
-})
+  if (eventName) {
+    // @ts-ignore
+    window[eventName] = "";
+  }
+  appendRemoveStyle();
+});
 
 //重洗提交表单流程
 const afreshSubmit = (params = {}) => {
-	// let apiUrl = "/systemapi/task_management/newcust_form_editdata"
-	let apiUrl ="/systemapi/task_management/editCustomerTable"
-	if (props.isSearch || !apiUrl || loading.value) {
-		if (!props.isSearch && !apiUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		// 列表里作为筛选时，不提交表单
-		return
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			// 提交保存表单
-			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
-				.then((res: any) => {
-						anewSubmit('success', res)
-					})
-					.catch(res => {
-						anewSubmit('fail', res)
-					})
-		}else {
-			// 没通过校验
-			anewSubmit('validate', fields)
-		}
-	})
-}
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          anewSubmit("success", res);
+        })
+        .catch((res) => {
+          anewSubmit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      anewSubmit("validate", fields);
+    }
+  });
+};
 
 const anewSubmit = (type: string, res: any) => {
-	const anewSubmit = props.formData.events?.anewSubmit
-	let notReturn
-    if (typeof anewSubmit === 'function') {
-      	notReturn = anewSubmit(type, res)
-		//   console.log("notReturn-1-123456->",props.anewSubmit)
-    } else if (typeof props.anewSubmit === 'function') {
-      	notReturn = props.anewSubmit(type, res)
-		//   console.log("notReturn--123456->",props.anewSubmit)
-    }
-	loading.value = false
-	if (notReturn === false) {
-		// 有返回false时则不提示
-		return
-    }
-    if (type === 'success') {
-      	ElMessage.success(res.msg || '保存成功！')
-    } else if (type === 'fail') {
-      	ElMessage.error(res.message || '保存失败！')
-    }
-}
+  const anewSubmit = props.formData.events?.anewSubmit;
+  let notReturn;
+  if (typeof anewSubmit === "function") {
+    notReturn = anewSubmit(type, res);
+    //   console.log("notReturn-1-123456->",props.anewSubmit)
+  } else if (typeof props.anewSubmit === "function") {
+    notReturn = props.anewSubmit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
 
 //保存草稿
 const saveDraft = (params = {}) => {
-	// 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(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		// 列表里作为筛选时，不提交表单
-		return
-    }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			formatParams.versionId=props.versionId
-			formatParams.appKey=props.groupid
-			formatParams.status=1
-			if(formatParams.formId){
-				if(formatParams.formId == ""){
-					formatParams.formId = props.versionId
-				}
-			}else{
-				formatParams.formId = props.versionId
-			}
-			console.log("提交保存草稿！",params)
-			// 提交保存表单
-			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
-				.then((res: any) => {
-						saveDraftPage('success', res)
-					})
-					.catch(res => {
-						saveDraftPage('fail', res)
-					})
-		}else {
-			// 没通过校验
-			saveDraftPage('validate', fields)
-		}
-	})
-}
-const saveDraftPage = (type: string, res: any) => {
-	const saveDraftPage = props.formData.events?.saveDraftPage
-	let notReturn
-    if (typeof saveDraftPage === 'function') {
-      	notReturn = saveDraftPage(type, res)
-		//   console.log("notReturn-1-123456->",props.anewSubmit)
-    } else if (typeof props.saveDraftPage === 'function') {
-      	notReturn = props.saveDraftPage(type, res)
-		//   console.log("notReturn--123456->",props.anewSubmit)
-    }
-	loading.value = false
-	if (notReturn === false) {
-		// 有返回false时则不提示
-		return
+  // 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(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-    if (type === 'success') {
-      	ElMessage.success(res.msg || '保存成功！')
-    } else if (type === 'fail') {
-      	ElMessage.error(res.message || '保存失败！')
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 1;
+      if (formatParams.formId) {
+        if (formatParams.formId == "") {
+          formatParams.formId = props.versionId;
+        }
+      } else {
+        formatParams.formId = props.versionId;
+      }
+      console.log("提交保存草稿！", params);
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          saveDraftPage("success", res);
+        })
+        .catch((res) => {
+          saveDraftPage("fail", res);
+        });
+    } else {
+      // 没通过校验
+      saveDraftPage("validate", fields);
     }
-}
+  });
+};
+const saveDraftPage = (type: string, res: any) => {
+  const saveDraftPage = props.formData.events?.saveDraftPage;
+  let notReturn;
+  if (typeof saveDraftPage === "function") {
+    notReturn = saveDraftPage(type, res);
+    //   console.log("notReturn-1-123456->",props.anewSubmit)
+  } else if (typeof props.saveDraftPage === "function") {
+    notReturn = props.saveDraftPage(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
 //保存草稿  只保存表单，不操作流程
 const saveEditDraft = (params = {}) => {
-	// let apiUrl = "/systemapi/task_management/newcust_form_editdata"
-	// let apiUrl ="/systemapi/task_management/add_customer_form"
-	let apiUrl ="/systemapi/task_management/editCustomerTable"
-	if (props.isSearch || !apiUrl || loading.value) {
-		if (!props.isSearch && !apiUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		// 列表里作为筛选时，不提交表单
-		return
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  // let apiUrl ="/systemapi/task_management/add_customer_form"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			// 提交保存表单
-			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
-				.then((res: any) => {
-						saveEditFormInfo('success', res)
-					})
-					.catch(res => {
-						saveEditFormInfo('fail', res)
-					})
-		}else {
-			// 没通过校验
-			saveEditFormInfo('validate', fields)
-		}
-	})
-}
-const saveEditFormInfo = (type: string, res: any) => {
-	const saveEditFormInfo = props.formData.events?.saveEditFormInfo
-	let notReturn
-    if (typeof saveEditFormInfo === 'function') {
-      	notReturn = saveEditFormInfo(type, res)
-		//   console.log("notReturn-1-123456->",props.saveEditFormInfo)
-    } else if (typeof props.saveEditFormInfo === 'function') {
-      	notReturn = props.saveEditFormInfo(type, res)
-		//   console.log("notReturn--123456->",props.anewSubmit)
-    }
-	loading.value = false
-	if (notReturn === false) {
-		// 有返回false时则不提示
-		return
-    }
-    if (type === 'success') {
-      	ElMessage.success(res.msg || '保存成功！')
-    } else if (type === 'fail') {
-      	ElMessage.error(res.message || '保存失败！')
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          saveEditFormInfo("success", res);
+        })
+        .catch((res) => {
+          saveEditFormInfo("fail", res);
+        });
+    } else {
+      // 没通过校验
+      saveEditFormInfo("validate", fields);
     }
-}
+  });
+};
+const saveEditFormInfo = (type: string, res: any) => {
+  const saveEditFormInfo = props.formData.events?.saveEditFormInfo;
+  let notReturn;
+  if (typeof saveEditFormInfo === "function") {
+    notReturn = saveEditFormInfo(type, res);
+    //   console.log("notReturn-1-123456->",props.saveEditFormInfo)
+  } else if (typeof props.saveEditFormInfo === "function") {
+    notReturn = props.saveEditFormInfo(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
 /**
  * 草稿提交审批
  */
 const draftSubmit = (params = {}) => {
-	// let apiUrl = "/systemapi/task_management/newcust_form_editdata"
-	let apiUrl ="/systemapi/task_management/editCustomerTable"
-	if (props.isSearch || !apiUrl || loading.value) {
-		if (!props.isSearch && !apiUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		// 列表里作为筛选时，不提交表单
-		return
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			// 提交保存表单
-			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
-				.then((res: any) => {
-						sendDraftSubmit('success', res)
-					})
-					.catch(res => {
-						sendDraftSubmit('fail', res)
-					})
-		}else {
-			// 没通过校验
-			sendDraftSubmit('validate', fields)
-		}
-	})
-}
-
-const sendDraftSubmit  = (type: string, res: any) => {
-	const sendDraftSubmit = props.formData.events?.sendDraftSubmit
-	let notReturn
-    if (typeof sendDraftSubmit === 'function') {
-      	notReturn = sendDraftSubmit(type, res)
-		//   console.log("notReturn-1-123456->",props.sendDraftSubmit)
-    } else if (typeof props.sendDraftSubmit === 'function') {
-      	notReturn = props.sendDraftSubmit(type, res)
-		//   console.log("notReturn--123456->",props.anewSubmit)
-    }
-	loading.value = false
-	if (notReturn === false) {
-		// 有返回false时则不提示
-		return
-    }
-    if (type === 'success') {
-      	ElMessage.success(res.msg || '提交成功！')
-    } else if (type === 'fail') {
-      	ElMessage.error(res.message || '提交失败！')
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          sendDraftSubmit("success", res);
+        })
+        .catch((res) => {
+          sendDraftSubmit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      sendDraftSubmit("validate", fields);
     }
-}
+  });
+};
+
+const sendDraftSubmit = (type: string, res: any) => {
+  const sendDraftSubmit = props.formData.events?.sendDraftSubmit;
+  let notReturn;
+  if (typeof sendDraftSubmit === "function") {
+    notReturn = sendDraftSubmit(type, res);
+    //   console.log("notReturn-1-123456->",props.sendDraftSubmit)
+  } else if (typeof props.sendDraftSubmit === "function") {
+    notReturn = props.sendDraftSubmit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "提交成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "提交失败！");
+  }
+};
 /**
  * 申请修改
  */
- const submitEditButton = (params = {}) => {
-	// let apiUrl = "/systemapi/task_flow/editFormLogData"
-	let apiUrl = "/systemapi/task_management/applyForTableFormData"
-	if (props.isSearch || !apiUrl || loading.value) {
-		if (!props.isSearch && !apiUrl) {
-			console.error(
-				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
-			)
-		}
-		// 列表里作为筛选时，不提交表单
-		return
+const submitEditButton = (params = {}) => {
+  // let apiUrl = "/systemapi/task_flow/editFormLogData"
+  let apiUrl = "/systemapi/task_management/applyForTableFormData";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
     }
-	validate((valid: boolean, fields: any) => {
-		if (valid) {
-			const formatParams = Object.assign({}, fields, params)
-			let submitParams
-			const beforeSubmit = props.formData.events?.beforeSubmit
-			if (beforeSubmit) {
-				if (typeof beforeSubmit === 'function') {
-					submitParams = beforeSubmit(formatParams, route)
-				} else {
-					submitParams = formatResult(formatParams, beforeSubmit)
-				}
-			}
-			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
-				submitParams = formatResult(formatParams, props.beforeSubmit)
-			} else if (typeof props.beforeSubmit === 'function') {
-				submitParams = props.beforeSubmit(formatParams, route)
-			}
-			if (submitParams === false) {
-				return
-			}
-			// console.log("提交修改数据",apiUrl,submitParams,formatParams)
-			// 提交保存表单
-			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
-				.then((res: any) => {
-						submitEdit('success', res)
-					})
-					.catch(res => {
-						submitEdit('fail', res)
-					})
-		}else {
-			// 没通过校验
-			submitEdit('validate', fields)
-		}
-	})
-}
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // console.log("提交修改数据",apiUrl,submitParams,formatParams)
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          submitEdit("success", res);
+        })
+        .catch((res) => {
+          submitEdit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      submitEdit("validate", fields);
+    }
+  });
+};
 //提交修改数据
 const submitEdit = (type: string, res: any) => {
-	const submitEdit = props.formData.events?.submitEdit
-	let notReturn
-    if (typeof submitEdit === 'function') {
-      	notReturn = submitEdit(type, res)
-		//   console.log("notReturn-1-123456->",props.submitEdit)
-    } else if (typeof props.submitEdit === 'function') {
-      	notReturn = props.submitEdit(type, res)
-		//   console.log("notReturn--123456->",props.anewSubmit)
-    }
-	loading.value = false
-	if (notReturn === false) {
-		// 有返回false时则不提示
-		return
-    }
-	if (type === 'success') {
-      	ElMessage.success(res.msg || '提交成功！')
-    } else if (type === 'fail') {
-      	ElMessage.error(res.message || '提交失败！')
-    }
-}
-
-function optionsValue3Get2(data: any,fieldName: string){
-	//console.log("form.vue","optionsValue3Get2")
-	emits('optionsValue3Get3',data,fieldName)
+  const submitEdit = props.formData.events?.submitEdit;
+  let notReturn;
+  if (typeof submitEdit === "function") {
+    notReturn = submitEdit(type, res);
+    //   console.log("notReturn-1-123456->",props.submitEdit)
+  } else if (typeof props.submitEdit === "function") {
+    notReturn = props.submitEdit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "提交成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "提交失败！");
+  }
+};
+
+function optionsValue3Get2(data: any, fieldName: string) {
+  //console.log("form.vue","optionsValue3Get2")
+  emits("optionsValue3Get3", data, fieldName);
 }
 
 defineExpose({
-    setOptions,
-    setValue,
-    getValue,
-    validate,
-    resetFields,
-    getData,
-    submit,
-	anewSubmit,
-	saveDraftPage,
-	saveEditFormInfo,
-	getEditData,
-	submitEdit
-})
+  setOptions,
+  setValue,
+  getValue,
+  validate,
+  resetFields,
+  getData,
+  submit,
+  anewSubmit,
+  saveDraftPage,
+  saveEditFormInfo,
+  getEditData,
+  submitEdit,
+});
 
 const webPage = computed({
-	get: () => {
-		// console.log("value-get",props.modelValue)
-		// userlist.value = props.modelValue
-		return props.isWeb
-		// return false
-	},
-	set: (newVal: any) => {
-		return newVal
-	}
-})
+  get: () => {
+    // console.log("value-get",props.modelValue)
+    // userlist.value = props.modelValue
+    return props.isWeb;
+    // return false
+  },
+  set: (newVal: any) => {
+    return newVal;
+  },
+});
 </script>
 <template>
-	<div v-if="webPage" class="webBox">
-		<el-form
-			v-bind="formData.form"
-			ref="ruleForm"
-			:model="model as any"
-			:disabled="disabled || type === 3"
-			class="add-form"
-			:class="{
-				'design-form': type === 5,
-				'detail-form': type === 3 || type === 4 || type === 1
-			}"
-		>
-
-			<WebFormGroup :tableinfo="formData.form" :is-web="webPage" :numrun="numrun" :data="formData.list" :alldata="formData" @optionsValue3Get2="optionsValue3Get2"/>
-			
-			<slot></slot>
-	  	</el-form>
-	</div>
-	<div v-else v-loading="loading" class="pcBox">
-		
-		<el-form
-			v-bind="formData.form"
-			ref="ruleForm"
-			:model="model as any"
-			:disabled="disabled || type === 3"
-			class="add-form"
-			:class="{
-				'design-form': type === 5,
-				'detail-form': type === 3 || type === 4 || type === 1
-			}"
-		>
-
-			<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" :alldata="formData" @optionsValue3Get2="optionsValue3Get2"/>
-			
-			<slot></slot>
-	  	</el-form>
-		
-	</div>
+  <div v-if="webPage" class="webBox">
+    <el-form
+      v-bind="formData.form"
+      ref="ruleForm"
+      :model="model as any"
+      :disabled="disabled || type === 3"
+      class="add-form"
+      :class="{
+        'design-form': type === 5,
+        'detail-form': type === 3 || type === 4 || type === 1,
+      }"
+    >
+      <WebFormGroup
+        :tableinfo="formData.form"
+        :is-web="webPage"
+        :numrun="numrun"
+        :data="formData.list"
+        :alldata="formData"
+        @optionsValue3Get2="optionsValue3Get2"
+      />
+
+      <slot></slot>
+    </el-form>
+  </div>
+  <div v-else v-loading="loading" class="pcBox">
+    <el-form
+      v-bind="formData.form"
+      ref="ruleForm"
+      :model="model as any"
+      :disabled="disabled || type === 3"
+      class="add-form"
+      :class="{
+        'design-form': type === 5,
+        'detail-form': type === 3 || type === 4 || type === 1,
+      }"
+    >
+      <FormGroup
+        :tableinfo="formData.form"
+        :numrun="numrun"
+        :data="formData.list"
+        :alldata="formData"
+        @optionsValue3Get2="optionsValue3Get2"
+      />
+
+      <slot></slot>
+    </el-form>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.webBox{
-	background: #FFFFFF;
-	margin: 0px auto 0 auto;
-	max-width: 380px;
-	border: 1px dashed #999;
-	height: calc(100vh - 105px);
-    overflow-y: auto;
-    overflow-x: hidden;
-    position: relative;
+<style lang="scss" scoped>
+.webBox {
+  background: #ffffff;
+  margin: 0px auto 0 auto;
+  max-width: 380px;
+  border: 1px dashed #999;
+  height: calc(100vh - 105px);
+  overflow-y: auto;
+  overflow-x: hidden;
+  position: relative;
 }
-.pcBox{
-	background: #FFFFFF;
-	border: 1px dashed #999;
-    height: calc(100vh - 105px);
-    overflow-y: auto;
-    overflow-x: hidden;
-    position: relative;
+.pcBox {
+  background: #ffffff;
+  border: 1px dashed #999;
+  height: calc(100vh - 105px);
+  overflow-y: auto;
+  overflow-x: hidden;
+  position: relative;
 }
 </style>
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 9193320..190bc53 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -34,6 +34,7 @@ import OrgCitys from "@/components/DesignForm/public/expand/orgCitys.vue";
 import DatePickerPage from "@/components/DesignForm/public/expand/datePicker.vue";
 import CascaderPage from "@/components/DesignForm/public/expand/cascader.vue";
 import AssociatedForms from "@/widget/associatedforms/index.vue";
+import TreeSelectPage from "@/components/DesignForm/public/expand/treeSelect.vue";
 
 import AKSelect from "./select.vue";
 import { uploadUrl, getRequest } from "@/api/DesignForm";
@@ -211,6 +212,10 @@ const currentComponent = computed(() => {
   if (props.data.type === "cascader") {
     return markRaw(CascaderPage);
   }
+  if (props.data.type === "treeSelect") {
+    return markRaw(TreeSelectPage);
+  }
+
   if (props.data.type === "switch") {
     if (typeof props.data.control.activeValue === "number") {
       props.data.control.activeValue = props.data.control.activeValue.toString();
@@ -222,7 +227,7 @@ const currentComponent = computed(() => {
   // if (props.data.type === 'timePicker') {
   // 	props.data.control.valueFormat="timestamp"
   // }
-  // console.log("自定义组件",props.data)
+  console.log("自定义组件", props.data.tye);
   return `el-${props.data.type}`;
 });
 // 控制编辑模式下是否可用
@@ -941,7 +946,9 @@ const judjeCascader = (val: any[], options: any[]) => {
   if (val && val.length < 0) return "";
   let valAry = stringToObj(val);
   console.log("获取级联选择值", stringToObj(val), val.length, options);
-  if (!Array.isArray(valAry)) return "";
+  if (!Array.isArray(valAry)) {
+    return diGuiJilian(val, options);
+  }
   let title = "";
   valAry.forEach((item: any) => {
     // console.log("item", item);
@@ -991,7 +998,13 @@ const diGuiJilian = (val: any, options: any[]) => {
     v-if="judgeIsShow(data.name) && data.type === 'baidumap' && type != 4"
     :data="data"
   />
-
+  <!--所属部门-->
+  <DeptOrgPage
+    v-if="judgeIsShow(data.name) && data.type === 'deptOrg' && type != 4"
+    :data="data"
+    :form-props="formProps"
+    :tablekey="props.tablekey"
+  />
   <!--拥有者-->
   <OwnerPage
     v-else-if="judgeIsShow(data.name) && data.type === 'owner'"
@@ -1077,7 +1090,8 @@ const diGuiJilian = (val: any, options: any[]) => {
       data.type != 'lowcodeCarsusel' &&
       data.type != 'signaturemap' &&
       data.type != 'signaturemap' &&
-      data.type != 'urllink'
+      data.type != 'urllink' &&
+      data.type != 'deptOrg'
     "
     :disabled="judgeIsDisabled(data.name)"
     :prop="tProp || data.name"
@@ -1117,6 +1131,9 @@ const diGuiJilian = (val: any, options: any[]) => {
       <div class="form-value" v-else-if="data.type == 'cascader'">
         {{ judjeCascader(value, data.options) }}
       </div>
+      <div class="form-value" v-else-if="data.type == 'treeSelect'">
+        {{ judjeCascader(value, data.control.data) }}
+      </div>
       <div class="form-value" v-else-if="data.type == 'colorPicker'">
         <div :style="'width:20px; height:20px; background-color:' + value + ';'"></div>
       </div>
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 32a75f9..d42b723 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -25,6 +25,7 @@ import {
   switchUnit,
   orgUnit,
   checkboxUnit,
+  orgDeptUnit,
 } from "@/api/DesignForm/fieldUnit";
 import type { FormInstance, FormRules, ElNotification } from "element-plus";
 import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
@@ -179,6 +180,9 @@ const unitIsShow = (val: tableButton, unitName: string) => {
     case "checkbox":
       return checkboxUnit.includes(unitName);
       break;
+    case "deptOrg":
+      return orgDeptUnit.includes(unitName);
+      break;
     default:
       if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") {
         return inputUnit.includes(unitName);
@@ -989,6 +993,10 @@ const diGuiJilian = (val: any, options: any[]) => {
                   v-if="unitIsShow(item, 'org')"
                 >
                 </el-select>
+                <DeptOrgSearch
+                  v-if="unitIsShow(item, 'deptOrg')"
+                  v-model:model-value="item.value"
+                />
               </el-form-item>
             </div>
           </template>
diff --git a/src/widget/index.ts b/src/widget/index.ts
index e8747f0..e8bcec8 100644
--- a/src/widget/index.ts
+++ b/src/widget/index.ts
@@ -22,6 +22,7 @@ import FounderTime from './systemunit/founderTime.vue'
 import EditTime from './systemunit/editTime.vue'
 import OwnerPage from './systemunit/ownerPage.vue'
 import DeptOrgPage from './systemunit/deptOrgPage.vue'
+import DeptOrgSearch from './systemunit/deptOrgSearch.vue'
 import Editor from "@/components/WangEditor/index.vue";
 
 // import { QuillEditor } from '@vueup/vue-quill'
@@ -49,6 +50,7 @@ export default (app: any)	=> {
 	app.component('EditTime',EditTime)		//创建时间主键
 	app.component('OwnerPage',OwnerPage)		//选择拥有者 
 	app.component('DeptOrgPage',DeptOrgPage)		//所属部门
+	app.component('DeptOrgSearch',DeptOrgSearch)		//所属部门
 
 	app.component('Editor', Editor)		//Editor富文本
 }
diff --git a/src/widget/systemunit/deptOrgSearch.vue b/src/widget/systemunit/deptOrgSearch.vue
new file mode 100644
index 0000000..80e17da
--- /dev/null
+++ b/src/widget/systemunit/deptOrgSearch.vue
@@ -0,0 +1,101 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-12-05 09:26:54
+@ 备注: 搜索用部门
+-->
+<script lang="ts" setup>
+import { orgAndPeople } from "@/api/displayboardapi/types";
+import { getPeopleKey, getUserCont } from "@/api/hr/people/index";
+import { govthree } from "@/api/opk/opk/api";
+
+const props = withDefaults(
+  defineProps<{
+    modelValue: any; // 子表和弹性布局时时有传
+  }>(),
+  {}
+);
+const emits = defineEmits(["update:modelValue"]);
+const orgList = ref<orgAndPeople[]>();
+const orgLoading = ref(false);
+const orgTree = {
+  label: "name",
+  children: "child",
+};
+
+const value = computed({
+  get() {
+    console.log("行政组织-1--》", props.modelValue);
+    if (
+      props.modelValue != "" &&
+      props.modelValue != undefined &&
+      props.modelValue != null
+    ) {
+      return props.modelValue * 1;
+    } else {
+      return props.modelValue;
+    }
+  },
+  set(newVal: any) {
+    emits("update:modelValue", newVal);
+    // updateModel(newVal)
+    return newVal;
+  },
+});
+
+onMounted(() => {
+  orgLoading.value = true;
+  getUserCont()
+    .then((data: any) => {
+      let orgId = data.data.organization * 1;
+      let companyId = data.data.company * 1;
+      if (companyId == null || companyId == "" || companyId == "0" || companyId == 0) {
+        companyId = 309;
+      }
+      if (orgId == null || orgId == "" || orgId == "0" || orgId == 0) {
+        orgId = "";
+      }
+      nextTick(() => {
+        govthree({ id: companyId, all: 1 })
+          .then(({ data }) => {
+            orgList.value = data;
+            if (
+              Number.isNaN(value.value) ||
+              isNaN(value.value) ||
+              value.value == null ||
+              value.value == "" ||
+              value.value == "0" ||
+              value.value == 0 ||
+              value.value == undefined
+            ) {
+              nextTick(() => {
+                value.value = orgId;
+                console.log("行政组织---》", orgId, value.value);
+              });
+            }
+          })
+          .finally(() => {
+            orgLoading.value = false;
+          });
+      });
+    })
+    .finally(() => {
+      orgLoading.value = false;
+    });
+});
+</script>
+<template>
+  <el-tree-select
+    v-loading="orgLoading"
+    element-loading-text="Loading..."
+    v-model="value"
+    :data="orgList"
+    :props="orgTree"
+    :render-after-expand="false"
+    :filterable="true"
+    node-key="id"
+    clearable
+    check-strictly
+    style="width: 140px"
+  />
+</template>
+<style lang="scss" scoped></style>