1

src/components/DesignForm/app/index.vue

@@ -304,6 +304,7 @@ const searchSend = reactive({
 	searchData:json2string(props.searchData)
 })
 let asfDetails = []
+let asfQueryParams = []
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 15:51:32
@@ -351,7 +352,7 @@ const getPageData = () => {
 					if(asfDetails.length>0){
 						//console.log(data.data.list)
 						//拼装参数,asf值对象数组
-						let asfQueryParams = []
+						asfQueryParams = []
 						for(let j = 0;j< asfDetails.length;j++){
 							let asfQueryParamsItem :any = {}
 							//console.log(asfDetails[j])

src/components/DesignForm/tableListPage/formPageCont.vue

@@ -133,6 +133,7 @@ const getCustomrrFormInfo = () => {
 		})
 		.finally(()=>{
 			formLoading.value = false;
+			//alert(props.pageInfo.masters_key)
 			gainEditDataLog({id:props.pageInfo.masters_key})
 			.then(({data})=>{
 				console.log("获取修改记录-1111-->",data)

src/components/DesignForm/tableListPage/index.vue

@@ -281,7 +281,7 @@ watch(()=>props.lookPageIsShow,(val:boolean)=>{
 	}
 })
 let asfDetails = []
-
+let asfQueryParams = []
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 15:51:32
@@ -294,6 +294,7 @@ const getPageData = () => {
 		page:state.currentPage,
 		pagesize:state.pageSize,
 		searchData:json2string(props.searchData)
+		//searchData:"id:1"
 	}
 	console.log("获取列表详细信息",sendData)
 	gainFormPageListCont(sendData)
@@ -312,7 +313,7 @@ const getPageData = () => {
 			if(asfDetails.length>0){
 				//console.log(data.data.list)
 				//拼装参数,asf值对象数组
-				let asfQueryParams = []
+				asfQueryParams = []
 				for(let j = 0;j< asfDetails.length;j++){
 					let asfQueryParamsItem :any = {}
 					//console.log(asfDetails[j])
@@ -373,6 +374,97 @@ const getPageData = () => {
 			state.loading = false;
 		})
 }
+
+
+const asfGetPageData = () => {
+	//state.loading = true;
+	let sendData = {
+		formId:props.formId,
+		page:1,
+		pagesize:1,
+		searchData:json2string(props.searchData)
+	}
+	console.log("获取列表详细信息",sendData)
+	gainFormPageListCont(sendData)
+		.then((data)=>{
+			
+			//console.log("获取列表详细信息----------------->",data)
+			//liwenxuan 关联表单数据获取 start
+			
+			let dataList = data
+			//console.log(dataList)
+			asfDetails = props.data.columns.filter((item: any) => {
+				return item.fieldClass=="associatedForms"
+			})
+			
+			
+			if(asfDetails.length>0){
+				//console.log(data.data.list)
+				//拼装参数,asf值对象数组
+				asfQueryParams = []
+				for(let j = 0;j< asfDetails.length;j++){
+					let asfQueryParamsItem :any = {}
+					//console.log(asfDetails[j])
+					asfQueryParamsItem.formId = asfDetails[j].control.formid
+					asfQueryParamsItem.field = asfDetails[j].field
+					
+					let asfToSelectIds = []
+					for(let i = 0;i<data.data.list.length;i++){
+						let asfMasterAndAsfId:any = {}
+						asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
+						asfMasterAndAsfId.asfMasterId = data.data.list[i].id
+						
+						asfToSelectIds.push(asfMasterAndAsfId)
+					}
+					asfQueryParamsItem.asfToSelectIds = asfToSelectIds
+					asfQueryParams.push(asfQueryParamsItem)
+				}
+				let queryCount = 0
+				for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
+					if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
+						queryCount++
+					}
+				}
+				//console.log(asfQueryParams)
+				if(queryCount>0){
+					getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+						//console.log(data)
+						for(let i = 0;i<dataList.data.list.length; i++){
+							//console.log(dataList.data.list[i])
+							for(let j = 0;j<data.length;j++){
+								//console.log(data[j])
+								for(let n = 0;n<data[j].list.length;n++){
+									if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+										dataList.data.list[i][data[j].field] = data[j].list[n].label
+									}
+									//console.log(data[j].list[n])
+								}
+								
+								
+							}
+						}
+						tableDataList.value = dataList.data.list
+						
+					});
+				}else{
+					tableDataList.value = data.data.list
+				}
+				
+			}else{
+				tableDataList.value = data.data.list
+				
+			}
+			/* //liwenxuan 关联表单数据获取 end
+			state.total = data.data.total
+			state.loading = false; */
+		})
+		.finally(()=>{
+			/* state.loading = false; */
+		})
+}
+
+
+
 onMounted(()=>{
 	getPageData()
 })
@@ -385,6 +477,23 @@ function getAsfDataTitlesByIds(asfQueryParams: any[]) {
 	});
 }
 //liwenxuan 关联表单数据获取 end
+const asfShowDetailsFlag = ref(false)
+//liwenxuan 关联表单详情弹窗 start
+function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){
+	let val = scope.row
+	//asfShowDetailsFlag.value= true
+	console.log("item----------------->",item)
+	console.log("scope----------------->",scope)
+	console.log("asfQueryParams----------------->",asfQueryParams)
+	console.log("val----------------->",val)
+
+
+	tablePageClass.value = 4;
+	asfPageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	asflookPageInfoIsShow.value = true;
+}
+//liwenxuan 关联表单详情弹窗 end
 
 /**
 @ 作者: 秦东
@@ -448,7 +557,9 @@ const drawerWith = ref();	//编辑表单时抽屉宽度
 */
 const tablePageClass = ref(1)
 const lookPageInfoIsShow = ref(false)
+const asflookPageInfoIsShow = ref(false)
 const pageInfoCont = ref<any>()
+const asfPageInfoCont = ref<any>()
 const lookPageInfo = (val:any) => {
 	tablePageClass.value = 4;
 	pageInfoCont.value = val
@@ -830,7 +941,7 @@ const editFormSendFlow = (val:any) => {
 									key="primary"
 									type="primary"
 									link
-									@click="console.log(item);console.log(scope)"
+									@click="showAsfDetailDialog(item,scope,asfQueryParams)"
 									>
 									
 									{{scope.row[scope.column.property]}}
@@ -920,8 +1031,13 @@ const editFormSendFlow = (val:any) => {
 			</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="asfPageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
 		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="props.versionid" :versiontitle="props.versiontitle" :drawerwith="drawerWith" @searchquery="getListData" />
+
+
+		<el-dialog v-model="asfShowDetailsFlag" title="关联表单详情查看" top="20px" style="margin-top:70px,margin-left:270px">
+                的事发生飞洒地方撒旦撒旦发
+        </el-dialog>
 	
 	</div>
 </template>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue

@@ -194,6 +194,20 @@ const gainAppFormPageInit = () =>{
 									}
 								}
 							})
+
+							if(stateData.searchData.length>0){
+								for(let j = 0;j<stateData.searchData.length;j++){
+									//console.log(stateData.searchData[j])
+									if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
+										
+										
+										console.log(stateData.tableData.columns[i])
+										stateData.searchData[j].control = stateData.tableData.columns[i].control
+										stateData.searchData[j].config = stateData.tableData.columns[i].config
+										console.log(stateData.searchData[j])
+									}
+								}
+							}
 						}
 					}
 				}

src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

@@ -200,6 +200,20 @@ const initLoadData = () => {
 									}
 								}
 							})
+
+							if(stateData.searchData.length>0){
+								for(let j = 0;j<stateData.searchData.length;j++){
+									//console.log(stateData.searchData[j])
+									if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
+										
+										
+										console.log(stateData.tableData.columns[i])
+										stateData.searchData[j].control = stateData.tableData.columns[i].control
+										stateData.searchData[j].config = stateData.tableData.columns[i].config
+										console.log(stateData.searchData[j])
+									}
+								}
+							}
 						}
 					}
 				}