From 84e60da2b07146323ebb87ae3f5596eae36b95ea Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 12 Nov 2024 08:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=90=E8=A1=A8=E5=AF=B9?=
 =?UTF-8?q?=E5=8D=95=E9=80=89,=E5=A4=9A=E9=80=89,=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=BA=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/childTable.vue     |  15 +-
 .../DesignForm/public/form/form.vue           |   1 +
 .../DesignForm/public/form/formGroup.vue      |  16 ++-
 .../DesignForm/public/form/formItem.vue       |   5 +-
 .../DesignForm/tableListPage/formPageCont.vue | 136 ++++++++++++++++--
 .../DesignForm/tableListPage/index.vue        |  14 +-
 .../appPage/appPageForm/openAppFormPage.vue   | 116 +++++++++++++--
 .../appPage/appPageForm/pageForm.vue          |   5 +-
 .../sysworkflow/lowcodepage/pageDesignes.vue  |   5 +-
 .../lowcodepage/pageFlow/appTableFlow.vue     | 102 ++++++++++++-
 .../lowcodepage/pageFlow/tableFlow.vue        |  31 +++-
 .../lowcodepage/runApp/runAppForm.vue         |   1 +
 .../associatedforms/associatedForms.vue       |  46 +++---
 13 files changed, 433 insertions(+), 60 deletions(-)

diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index ccae241..522549e 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -183,14 +183,24 @@ const timeToString = (timeVal:any,types:int) => {
 	return timeStr
 }
 let associatedFormsIndexTablekey = 0
-const emits = defineEmits<{
+/* const emits = defineEmits<{
 	(e: 'asfValueChanged', val: any): void
-}>()
+	
+}>() */
+let emits = defineEmits(['optionsValue3GetTable','asfValueChanged']);
 
 function asfValueChanged(val:any){
 	//console.log("childTable-asfValueChanged",val)
 	emits("asfValueChanged",val)
 }
+
+function optionsValue3Get1(data: any,fieldName: string){
+	fieldName = "childTable---"+props.data.name+"---"+fieldName
+	/* console.log("childTable---optionsValue3Get1")
+	console.log(props.data.name) */
+	emits('optionsValue3GetTable',data,fieldName)
+}
+
 </script>
 <template>
 	
@@ -235,6 +245,7 @@ function asfValueChanged(val:any){
 						:row-index="scope.$index"
 						:data="item"
 						@asf-value-changed="asfValueChanged"
+						@optionsValue3Get1="optionsValue3Get1"
 						/>
 					</div>
 				</template>
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index ca74799..56dc831 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -1947,6 +1947,7 @@ const submitEdit = (type: string, res: any) => {
 }
 
 function optionsValue3Get2(data: any,fieldName: string){
+	//console.log("form.vue","optionsValue3Get2")
 	emits('optionsValue3Get3',data,fieldName)
 }
 
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index fa44caa..fe6e216 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -493,7 +493,7 @@ function asfValueChanged(val:any){
 
 	}
 
-	if(val.fillFieldsChild.length>0){
+	if(val.fillFieldsChild&&val.fillFieldsChild.length>0){
 		/* console.log(val.asfFormId)
 		console.log(val.masterOnField) */
 		let fillFieldsChild = JSON.parse(val.fillFieldsChild);
@@ -745,10 +745,20 @@ const getFormItemLableStyle = (ele: any) => {
 }
 
 function optionsValue3Get1(data: any,fieldName: string){
+	//console.log("formGroup---optionsValue3Get1")
 	emits('optionsValue3Get2',data,fieldName)
 }
-/* 
 
+
+
+function optionsValue3GetTable(data: any,fieldName: string){
+	/* console.log("formGroup---optionsValue3GetTable")
+	console.log(data)
+	console.log(fieldName) */
+	emits('optionsValue3Get2',data,fieldName)
+}
+/* 
+	
 */
 </script>
 <template>
@@ -832,7 +842,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 						<form-group :data="element.list" data-type="not-table" />
 					</div>
 					
-					<child-table v-else :data="element" @asf-value-changed="asfValueChanged"/>
+					<child-table v-else :data="element" @asf-value-changed="asfValueChanged" @optionsValue3GetTable = "optionsValue3GetTable"/>
 				</template>
 				<!--格栅布局-->
 				<template v-else-if="element.type === 'grid'">
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 2eee30c..54508b8 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -350,10 +350,11 @@ const getAxiosOptions = debounce((data?: any) => {
 			*/
 			//console.log("formItem---291",props.data.control.optionsValue3Field)
 			if(props.data.control.optionsValue3Field && props.data.control.optionsValue3Field != "" && props.data.control.optionsValue3Field != null && props.data.control.optionsValue3Field != "undefined"){
+				//console.log(111)
 				getFieldRecord(props.data.control.optionsValue3Field).then(({ data }) => {
 					
 					let fieldName = props.data.name
-					
+					//console.log(data,fieldName)
 					emits('optionsValue3Get1',data,fieldName)
 					
 				})
@@ -366,7 +367,7 @@ const getAxiosOptions = debounce((data?: any) => {
 watch(
     () => props.data.control.optionsValue3Field,
     (val:any) => {
-		console.log("监听--optionsValue3Field-》",val)
+		//console.log("监听--optionsValue3Field-》",val)
 		getAxiosOptions() 
     }
 )
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index 04337ed..b0d8656 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -8,7 +8,7 @@ import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton,editLoo
 import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
 import { gainTaskFormInfo,generateFlow,gainEditDataLog,draftsInitiateApproval,afreshRunWorkflow } from '@/api/taskapi/management'
 import { Close } from '@element-plus/icons-vue'
-import { judgeSubmitCancel,startRunFlow } from '@/api/DesignForm/requestapi'
+import { judgeSubmitCancel,startRunFlow,getFieldRecord } from '@/api/DesignForm/requestapi'
 import { submitButtonEs } from '@/api/DesignForm/tableButton'
 import {
   constFormBtnEvent,
@@ -16,6 +16,8 @@ import {
 } from '@/api/DesignForm/utils'
 
 import RunFlowStep from '@/views/taskplatform/taskmanagement/runFlowStep.vue'
+import { customerFormVersionCont } from "@/api/taskapi/types";
+import { stringify } from "uuid";
 
 
 const props = defineProps({
@@ -43,7 +45,7 @@ const props = defineProps({
 	}
 });
 const formEl = ref<any>();
-const emits = defineEmits(["update:isShow","getPageData"]);
+const emits = defineEmits(["update:isShow","getPageData","optionsValue4Get4"]);
 const formLoading = ref(false);
 const flowAry = ref<any[]>(); //流程列表
 const currentProgress  = ref<number>(1);  //当前步进值
@@ -58,6 +60,9 @@ const openOfClose =  computed({
 	}
 });
 const formProps = inject(constFormProps, {}) as any
+
+let getFieldRecordPromises: any[] = []
+let objMastesform: any
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 14:09:24
@@ -68,6 +73,107 @@ watch(()=>props.isShow,(val:bool)=>{
 	if(val){
 		formLoading.value = true;
 		getCustomrrFormInfo();
+		Promise.all(gainTaskFormInfoPromise).then(() => {
+			//console.log(gainTaskFormInfoData)
+			if(gainTaskFormInfoData.structure&&gainTaskFormInfoData.tableData){
+
+				
+
+
+				objMastesform = stringToObj(gainTaskFormInfoData.structure.mastesform)
+				for (const element of objMastesform.list) {
+					if(element.type == "table"){
+						//console.log(element);
+						for (const item of element.list){
+							
+							if(item.options){
+								if(item.type=="radio"||item.type=="select"||item.type=="checkbox"){
+									console.log(item.config.optionsType);
+									if(item.config.optionsType==3){
+										let paramx:string = ""+item.control.optionsValue3Field
+										getFieldRecordPromises.push(getFieldRecord(paramx).then(({ data }) => {
+											//console.log(data)
+											item.options = data
+										}));
+									}
+								}
+								
+							}
+						}
+					}
+				}
+
+
+				Promise.all(getFieldRecordPromises).then(()=>{
+					//console.log(objMastesform)
+					
+					formState.formData = objMastesform
+					//console.log(formState.formData)
+					let stringObjMastesform = JSON.stringify(objMastesform);
+					//console.log(stringObjMastesform)
+					//console.log(gainTaskFormInfoData.structure.mastesformjson)
+					
+					formState.dict = string2json(gainTaskFormInfoData.structure.dict)
+
+
+
+
+					if(props.tablePageClass != 4){
+						judgeSubmitCancel({"name":stringObjMastesform})
+							.then((data:any) =>{
+								if(data.code == 0){
+									if (data.data == 3 || data.data == 4){
+										// formState.formData.list.push(submitButtonEs)
+										if(props.operState == 2){
+												formState.formData.list.push(afreshSubmitButton)
+										}else if(props.operState == 3){
+												formState.formData.list.push(editFormCont)
+										}else if(props.operState == 4){
+												formState.formData.list.push(draftSubmitButton)
+										}else if(props.operState == 5){
+											formState.formData.list.push(submitButtonEs)
+										}
+									}
+								}
+							})
+					}
+					nextTick(()=>{
+						// console.log("获取自定义表单内容-1111-->",data.tableData)
+						formEl.value.setValue(gainTaskFormInfoData.tableData)
+					}) 
+
+
+
+					
+				})
+				.finally(()=>{
+					formLoading.value = false;
+					//alert(props.pageInfo.masters_key)
+					gainEditDataLog({id:props.pageInfo.masters_key})
+					.then(({data})=>{
+						// console.log("获取修改记录-1111-->",data)
+						pageLog.value = data
+					});
+				});
+
+
+
+	
+
+
+
+
+
+
+
+
+
+			}
+		});
+
+
+
+		
 	}
 })
 /**
@@ -92,15 +198,19 @@ const formState = reactive({
     loading: true
 })
 const pageLog = ref<any[]>([])
+let gainTaskFormInfoData: customerFormVersionCont
+let gainTaskFormInfoPromise: any[] = []
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 14:33:15
 @ 功能: 获取自定义表单内容
 */
 const getCustomrrFormInfo = () => {
-	gainTaskFormInfo({id:props.pageInfo.masters_key})
+	gainTaskFormInfoPromise.push(gainTaskFormInfo({id:props.pageInfo.masters_key})
 		.then(({data})=>{
-			// console.log("获取自定义表单内容",data,data.structure)
+			gainTaskFormInfoData = data
+			/* // console.log("获取自定义表单内容",data,data.structure)
 			formState.formData = stringToObj(data.structure.mastesform)
 			// console.log("获取自定义表单内容--->",formState)
 			formState.dict = string2json(data.structure.dict)
@@ -129,17 +239,17 @@ const getCustomrrFormInfo = () => {
 			nextTick(()=>{
 				// console.log("获取自定义表单内容-1111-->",data.tableData)
 				formEl.value.setValue(data.tableData)
-			})
+			}) */
 		})
 		.finally(()=>{
-			formLoading.value = false;
+			/* formLoading.value = false;
 			//alert(props.pageInfo.masters_key)
 			gainEditDataLog({id:props.pageInfo.masters_key})
 			.then(({data})=>{
 				// console.log("获取修改记录-1111-->",data)
 				pageLog.value = data
-			});
-		})
+			}); */
+		}));
 }
 /**
 @ 作者: 秦东
@@ -239,8 +349,17 @@ const jsuanKuandu = () => {
 	}
 	
 }
+
+
+function optionsValue3Get3(data:any,fieldName:any){
+	//console.log("formPageCont","optionsValue3Get3")
+	emits('optionsValue4Get4',data,fieldName)
+}
+
+
 </script>
 <template>
+	
 	<el-drawer
 		v-model="openOfClose"
 		title="查看表单内容"
@@ -336,6 +455,7 @@ const jsuanKuandu = () => {
 				:save-edit-form-info="saveEditFormInfo"
 				:send-draft-submit= "sendDraftSubmit"
 				:submit-edit="submitEdit"
+				@optionsValue3Get3 = "optionsValue3Get3"
 			/>
 			<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
 			<el-timeline style="width: 100%">
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index da5c9dd..151c3c6 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -90,6 +90,7 @@ const props = withDefaults(
 const emits = defineEmits<{
     (e: 'selectionChange', row: any): void
     (e: 'btnClick', btn: any, row?: any): void // 列表上面及表格列表里添加删除按钮事件
+	(e: 'optionsValue5Get5', data: any, fieldName: any): void
 }>()
 const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
 const idList = ref<string[]>([])
@@ -851,10 +852,16 @@ const transformOption = (val: string | number, type?: string) => {
     
     return formatNumber(val)
  }
+
+
+ function optionsValue4Get4(data:any,fieldName:any){
+	//console.log("tableListPage/index","optionsValue4Get4")
+	emits('optionsValue5Get5',data,fieldName)
+}
+
 </script>
 <template>
 	<div ref="container" v-loading="state.loading" class="table-list-comm">
-	
 		<el-row class="rowBox">
 			<el-col :span="24">
 				<el-form  v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
@@ -1301,8 +1308,9 @@ const transformOption = (val: string | number, type?: string) => {
 			
 			</el-col>
 		</el-row>
-		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
-		<FormPageCont v-model:is-show="asflookPageInfoIsShow" :drawer-with="drawerWith" :page-info="currentAsfTableDataList[0]" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
+		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" @optionsValue4Get4="optionsValue4Get4"/>
+		
+		<FormPageCont v-model:is-show="asflookPageInfoIsShow" :drawer-with="drawerWith" :page-info="currentAsfTableDataList[0]" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" @optionsValue4Get4="optionsValue4Get4"/>
 		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="props.versionid" :versiontitle="props.versiontitle" :drawerwith="drawerWith" @searchquery="getListData" />
 
 
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index 36155da..dbac92e 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -232,7 +232,44 @@ const gainAppFormPageInit = () =>{
 			if(data.data.pageList){
 				let stateData = string2json(data.data.appForm.listjson)
 				let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
+				//console.log(data.data.appForm.mastesform)
+				//let mastesform = string2json(data.data.appForm.mastesform)
+				//console.log(mastesform)
+				/* console.log(holeControlAndConfigStateData)*/
+				//console.log(data.data.appForm.mastesformjson) 
+				/*console.log(stateData) */
+
+
+				//在这里完善子表中的单选下拉多选为系统表单字段时的options	start
+				//console.log(holeControlAndConfigStateData.list)
+				for (const element of holeControlAndConfigStateData.list) {
+					
+					if(element.type == "table"){
+						//console.log(element);
+						for (const item of element.list){
+							
+							if(item.options){
+								if(item.type=="radio"||item.type=="select"||item.type=="checkbox"){
+									//console.log(item);
+									let paramx:string = ""+item.control.optionsValue3Field
+									getFieldRecord(paramx).then(({ data }) => {
+										//console.log(data)
+										item.options = data
+									})
+								}
+								
+							}
+						}
+					}
+				}
+				data.data.appForm.mastesformjson = JSON.stringify(holeControlAndConfigStateData);
+				//console.log(data.data.appForm.mastesformjson)
 				
+				//data.data.appForm.mastesformjson = 
+				//在这里完善子表中的单选下拉多选为系统表单字段时的options	end
+
+
+
 				if(stateData.tableData.columns && stateData.tableData.columns.length>0){
 					for(let i = 0;i<stateData.tableData.columns.length;i++){
 						for(let u = 0;u<holeControlAndConfigStateData.list.length;u++){
@@ -242,7 +279,7 @@ const gainAppFormPageInit = () =>{
 							}
 							
 						}
-						
+						//console.log(stateData.tableData.columns[i])
 						if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
 							//console.log(stateData.tableData.columns[i])
 							let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
@@ -265,6 +302,7 @@ const gainAppFormPageInit = () =>{
 							
 							
 							if(paramx && paramx != "" && paramx != null && paramx != "undefined"){
+								//console.log(paramx)
 								getFieldRecord(paramx).then(({ data }) => {
 									stateData.tableData.columns[i].options = data
 									if(stateData.searchData.length>0){
@@ -328,6 +366,7 @@ const gainAppFormPageInit = () =>{
 				stateForm.formId =data.data.appForm.cfid.toString()
 				stateForm.versionId =data.data.appForm.id.toString()
 				stateForm.formData = stringToObj(data.data.appForm.mastesform)
+				console.log(stateForm.formData)
 				stateForm.dict = string2json(data.data.appForm.dict)
 				stateForm.formData.powerstr = string2json(data.data.appForm.powerstr)
 			}
@@ -342,20 +381,80 @@ const gainAppFormPageInit = () =>{
 }
 
 function optionsValue3Get3(data: any,fieldName: string){
-	
-	for(let i = 0; i < stateForm.formData.list.length; i++){
-		if(stateForm.formData.list[i].name==fieldName){
-			stateForm.formData.list[i].options = []
-			for(let j = 0;j<data.length;j++){
-				stateForm.formData.list[i].options.push(data[j])
+
+	//console.log("openAppFormPage","optionsValue3Get3")
+
+
+	/* if(fieldName.startsWith("childTable---")){
+		let tableAndFieldNameArr = fieldName.split("---")
+		for(let i = 0; i < stateForm.formData.list.length; i++){
+			if(stateForm.formData.list[i].name==tableAndFieldNameArr[1]){
+				for(let u = 0; u < stateForm.formData.list[i].list.length; u++){
+					if(stateForm.formData.list[i].list[u].name==tableAndFieldNameArr[2]){
+						stateForm.formData.list[i].list[u].options = []
+						for(let j = 0;j<data.length;j++){
+							stateForm.formData.list[i].list[u].options.push(data[j])
+						}
+					}
+				}
 			}
 		}
-	}
+	}else{ */
+
+
+
+
+		for(let i = 0; i < stateForm.formData.list.length; i++){
+			if(stateForm.formData.list[i].name==fieldName){
+				stateForm.formData.list[i].options = []
+				for(let j = 0;j<data.length;j++){
+					stateForm.formData.list[i].options.push(data[j])
+				}
+			}
+		}
+	//}
 }
 
 defineExpose({
 	gainAppFormPageInit
 })
+
+
+/* function optionsValue5Get5(data:any,fieldName:any){
+	//console.log("openAppFormPage","optionsValue5Get5")
+
+	//console.log(fieldName)
+	//console.log(stateForm)
+	if(fieldName.startsWith("childTable---")){
+		let tableAndFieldNameArr = fieldName.split("---")
+		for(let i = 0; i < stateForm.formData.list.length; i++){
+			if(stateForm.formData.list[i].name==tableAndFieldNameArr[1]){
+				for(let u = 0; u < stateForm.formData.list[i].list.length; u++){
+					if(stateForm.formData.list[i].list[u].name==tableAndFieldNameArr[2]){
+						console.log(stateForm.formData.list[i].list[u])
+						stateForm.formData.list[i].list[u].options = []
+						for(let j = 0;j<data.length;j++){
+							stateForm.formData.list[i].list[u].options.push(data[j])
+						}
+					}
+				}
+			}
+		}
+	}else{
+		for(let i = 0; i < stateForm.formData.list.length; i++){
+			if(stateForm.formData.list[i].name==fieldName){
+				stateForm.formData.list[i].options = []
+				for(let j = 0;j<data.length;j++){
+					stateForm.formData.list[i].options.push(data[j])
+				}
+			}
+		}
+	}
+
+	
+} */
+
+
 </script>
 <template>
 	<div>
@@ -384,6 +483,7 @@ defineExpose({
 							:versiontitle="versionTitle"
 							v-model:look-page-is-show="lookPageIsShow"
 							:viewPage="stateList.view"
+							@optionsValue5Get5="optionsValue5Get5"
 						/>
 						<ak-form
 							v-if="activePage==2"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index edb867f..58a8480 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -559,9 +559,10 @@ const formNameChanged = (param1: any)=>{
 //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
 
 function optionsValue3Get3(data: any,fieldName: string){
-	/* console.log(state.value.formData.list)
+	console.log("pageForm","optionsValue3Get3")
+	console.log(state.value.formData.list)
 	console.log(data)
-	console.log(fieldName) */
+	console.log(fieldName)
 	for(let i = 0; i < state.value.formData.list.length; i++){
 		
 		if(state.value.formData.list[i].name==fieldName){
diff --git a/src/views/sysworkflow/lowcodepage/pageDesignes.vue b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
index a6bf8cb..2d52306 100644
--- a/src/views/sysworkflow/lowcodepage/pageDesignes.vue
+++ b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
@@ -624,9 +624,10 @@ function refreshFunc(){
 }
 
 function optionsValue3Get3(data: any,fieldName: string){
-/* 	console.log(state.value.formData.list)
+	console.log("pageDesignes","optionsValue3Get3")
+	console.log(state.value.formData.list)
 	console.log(data)
-	console.log(fieldName) */
+	console.log(fieldName)
 	
 	for(let i = 0; i < state.value.formData.list.length; i++){
 		if(state.value.formData.list[i].name==fieldName){
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
index d36782d..e0f5f09 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
@@ -7,7 +7,7 @@
 import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types'
 import { haveCustomerFormVersion,generateFlow,echoTableFormPage,realTimeUpdateFlow } from '@/api/taskapi/management'
 import { string2json,stringToObj } from '@/utils/DesignForm/form'
-import { judgeSubmitCancel,startRunFlow,gainAppPageInfo } from '@/api/DesignForm/requestapi'
+import { judgeSubmitCancel,startRunFlow,gainAppPageInfo,getFieldRecord } from '@/api/DesignForm/requestapi'
 import { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const'
 import { appPageDataInit,appWorkFlow } from "@/api/date/type"
 
@@ -449,6 +449,12 @@ const mastesformjson = ref("")	//
 const isFlow = ref(2)
 const versionId = ref<string>("")	//表单版本号
 const versionTitle = ref<string>("")	//表单名称
+
+let gainAppPageInfoPromise: any[] = []
+let gainAppPageInfoData:any = {}
+let getFieldRecordPromise: any[] = []
+let objMastesform: any
+//let getFieldRecordData:any = {}
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-03 09:00:10
@@ -458,10 +464,11 @@ const initLoadData = () => {
 	// console.log("initLoadData",props.pickAppMenu.type,props.pickAppMenu.type != 1)
 	if(props.pickAppMenu.type != 1){
 		// appFormTitle.value = props.pickAppMenu.label
-		gainAppPageInfo({id:props.pickAppMenu.id})
+		gainAppPageInfoPromise.push(gainAppPageInfo({id:props.pickAppMenu.id})
 		.then((data)=>{
-			// console.log("获取初始化表单数据",data)
-			appInitData.value = data.data
+			console.log("获取初始化表单数据",data)
+			gainAppPageInfoData = data
+			/* appInitData.value = data.data
 			// console.log("获取初始化表单数据---!",appInitData.value)
 			mastesformjson.value = data.data.appForm.mastesformjson
 			isFlow.value = data.data.appForm.flowIsOpen
@@ -488,14 +495,97 @@ const initLoadData = () => {
 							}
 						}
 					})
-			}
+			} */
 			
-		})
+		}));
+
+		Promise.all(gainAppPageInfoPromise).then(()=>{
+
+
+
+			
+
+			objMastesform = stringToObj(gainAppPageInfoData.data.appForm.mastesform)
+			//console.log(objMastesform)
+
+
+			for (const element of objMastesform.list) {
+				if(element.type == "table"){
+					//console.log(element);
+					for (const item of element.list){
+						
+						if(item.options){
+							if(item.type=="radio"||item.type=="select"||item.type=="checkbox"){
+								console.log(item.config.optionsType);
+								if(item.config.optionsType==3){
+									let paramx:string = ""+item.control.optionsValue3Field
+									getFieldRecordPromise.push(getFieldRecord(paramx).then(({ data }) => {
+										//console.log(data)
+										item.options = data
+									}));
+								}
+							}
+							
+						}
+					}
+				}
+			}
+
+
+
+			Promise.all(getFieldRecordPromise).then(()=>{
+				console.log(gainAppPageInfoData)
+				let objMastesformStr =  JSON.stringify(objMastesform);
+				gainAppPageInfoData.data.appForm.mastesform = objMastesform
+				gainAppPageInfoData.data.appForm.mastesformjson = objMastesformStr
+
+
+				appInitData.value = gainAppPageInfoData.data
+				// console.log("获取初始化表单数据---!",appInitData.value)
+				mastesformjson.value = gainAppPageInfoData.data.appForm.mastesformjson
+				isFlow.value = gainAppPageInfoData.data.appForm.flowIsOpen
+				
+				versionId.value = gainAppPageInfoData.data.appForm.id.toString()
+				versionTitle.value = gainAppPageInfoData.data.appForm.name
+				
+				if(gainAppPageInfoData.data.page){
+					// console.log("data.data.mastesform", data.data)
+					stateForm.id=gainAppPageInfoData.data.appForm.version.toString()
+					stateForm.formId =gainAppPageInfoData.data.appForm.cfid.toString()
+					stateForm.versionId =gainAppPageInfoData.data.appForm.id.toString()
+					stateForm.formData = objMastesform
+					stateForm.formData.config.hideField = []//暂时的修复方法:接口返回的config中没有hideField属性,手动添加
+					stateForm.dict = string2json(gainAppPageInfoData.data.appForm.dict)
+					stateForm.formData.powerstr = string2json(gainAppPageInfoData.data.appForm.powerstr)
+					// console.log("data.data.mastesform", stateForm.formData)
+					
+					judgeSubmitCancel({"name":gainAppPageInfoData.data.appForm.mastesformjson})
+						.then((datajud:any) =>{
+							if(datajud.code == 0){
+								if (datajud.data == 3 || datajud.data == 4){
+									stateForm.formData.list.push(submitButton)
+								}
+							}
+						})
+				}
+			});
+
+
+
+		});
+
+
+
+		
+		
 	}
 	
 }
 
 function optionsValue3Get3(data: any,fieldName: string){
+	/* console.log(data)
+	console.log(fileName)
+	console.log("appTableFlow","optionsValue3Get3") */
 	for(let i = 0; i < stateForm.formData.list.length; i++){
 		if(stateForm.formData.list[i].name==fieldName){
 			stateForm.formData.list[i].options = []
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
index ead8e29..89fc9ab 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
@@ -419,14 +419,35 @@ const saveDraftPage = (type: string,val?:any) => {
 }
 
 function optionsValue3Get3(data: any,fieldName: string){
-	for(let i = 0; i < state.formData.list.length; i++){
-		if(state.formData.list[i].name==fieldName){
-			state.formData.list[i].options = []
-			for(let j = 0;j<data.length;j++){
-				state.formData.list[i].options.push(data[j])
+	//console.log("tableFlow","optionsValue3Get3")
+	
+
+	if(fieldName.startsWith("childTable---")){
+		let tableAndFieldNameArr = fieldName.split("---")
+		for(let i = 0; i < state.formData.list.length; i++){
+			if(state.formData.list[i].name==tableAndFieldNameArr[1]){
+				for(let u = 0; u < state.formData.list[i].list.length; u++){
+					if(state.formData.list[i].list[u].name==tableAndFieldNameArr[2]){
+						state.formData.list[i].list[u].options = []
+						for(let j = 0;j<data.length;j++){
+							state.formData.list[i].list[u].options.push(data[j])
+						}
+					}
+				}
+			}
+		}
+	}else{
+		for(let i = 0; i < state.formData.list.length; i++){
+			if(state.formData.list[i].name==fieldName){
+				state.formData.list[i].options = []
+				for(let j = 0;j<data.length;j++){
+					state.formData.list[i].options.push(data[j])
+				}
 			}
 		}
 	}
+
+	
 }
 
 </script>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index abdb379..8b29bc8 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -325,6 +325,7 @@ watch(
 );
 
 function optionsValue3Get3(data: any, fieldName: string) {
+  console.log("runAppForm","optionsValue3Get3")
   for (let i = 0; i < stateForm.formData.list.length; i++) {
     if (stateForm.formData.list[i].name == fieldName) {
       stateForm.formData.list[i].options = [];
diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index 3d13e69..d9cc65d 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -140,30 +140,38 @@ function getAsfDataTitles() {
   
   //console.log(props.data.control.fillRoles)
   //let fillRoles = JSON.parse(JSON.stringify(props.data.control.fillRoles))
-  for(let i= 0;i<props.data.control.fillRoles.master.length;i++){
-    if(props.data.control.fillRoles.master[i].leftValue!=""&&props.data.control.fillRoles.master[i].rightValue!=""){
-      fillFieldsMaster = fillFieldsMaster+props.data.control.fillRoles.master[i].id+"_"+props.data.control.fillRoles.master[i].leftValue+"_"+props.data.control.fillRoles.master[i].rightValue+";"
+  if(props.data.control.fillRoles&&props.data.control.fillRoles.master&&props.data.control.fillRoles.master.length>0){
+    for(let i= 0;i<props.data.control.fillRoles.master.length;i++){
+      if(props.data.control.fillRoles.master[i].leftValue!=""&&props.data.control.fillRoles.master[i].rightValue!=""){
+        fillFieldsMaster = fillFieldsMaster+props.data.control.fillRoles.master[i].id+"_"+props.data.control.fillRoles.master[i].leftValue+"_"+props.data.control.fillRoles.master[i].rightValue+";"
+      }
     }
   }
-  fillFieldsChild = JSON.parse(JSON.stringify(props.data.control.fillRoles.child))
-  fillFieldsChild = fillFieldsChild.filter((item:any)=>{
-    //console.log(item)
-    return item.asfChildTableKey!=""
-  })
-  //console.log(fillFieldsChild)
-  for(let i= 0;i<fillFieldsChild.length;i++){
-    if(fillFieldsChild[i].asfChildTableKey!=""){
-      if(fillFieldsChild[i].childRoles.length>0){
-        fillFieldsChild[i].childRoles = fillFieldsChild[i].childRoles.filter((element:any) => {
-          if(element.leftValue!=""&&element.rightValue!=""){
-            return element
-          }
-        });
-      }
+  if(props.data.control.fillRoles.child){
+    fillFieldsChild = JSON.parse(JSON.stringify(props.data.control.fillRoles.child))
+    fillFieldsChild = fillFieldsChild.filter((item:any)=>{
+      //console.log(item)
+      return item.asfChildTableKey!=""
+    })
+
       
+    //console.log(fillFieldsChild)
+    for(let i= 0;i<fillFieldsChild.length;i++){
+      if(fillFieldsChild[i].asfChildTableKey!=""){
+        if(fillFieldsChild[i].childRoles.length>0){
+          fillFieldsChild[i].childRoles = fillFieldsChild[i].childRoles.filter((element:any) => {
+            if(element.leftValue!=""&&element.rightValue!=""){
+              return element
+            }
+          });
+        }
+        
+      }
     }
+    //console.log(fillFieldsMaster)
   }
-  //console.log(fillFieldsMaster)
+  
+
 
 /*