Merge branch 'lwx_15'

# Conflicts:
#	src/types/components.d.ts

src/components/DesignForm/app/index.vue

@@ -102,6 +102,7 @@ const designStore = useDesignFormStore()
 const route = useRoute()
 const router = useRouter()
 const tableDataList = ref([]) // 表格行数据
+const currentAsfTableDataList = ref([])//当前点击的关联表单数据
 const openTaskDrawer = ref(false)	//新增数据
 
 const state = reactive({
@@ -309,6 +310,7 @@ const searchSend = reactive({
 	viewClass:{}
 })
 let asfDetails = []
+let asfQueryParams: any[] = []
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 15:51:32
@@ -358,10 +360,10 @@ const getPageData = () => {
 					})
 					
 					
-					if(asfDetails.length>0){
+					if(asfDetails.length>0&&data.data.list!=null){
 						//console.log(data.data.list)
 						//拼装参数,asf值对象数组
-						let asfQueryParams = []
+						asfQueryParams = []
 						for(let j = 0;j< asfDetails.length;j++){
 							let asfQueryParamsItem :any = {}
 							//console.log(asfDetails[j])
@@ -369,6 +371,7 @@ const getPageData = () => {
 							asfQueryParamsItem.field = asfDetails[j].field
 							
 							let asfToSelectIds = []
+							console.log(data.data.list)
 							for(let i = 0;i<data.data.list.length;i++){
 								let asfMasterAndAsfId:any = {}
 								asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
@@ -426,6 +429,108 @@ const getPageData = () => {
 				})
 	}	
 }
+
+const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
+	let searchData = [{"id":"id","label":"Id","field":"id","type":"bigint(20)","attribute":"","pattern":"bigint","fieldClass":"id","activeValue":"","inactiveValue":"","config":{"optionsType":0},"control":{"optionsValue3Formid":"","optionsValue3Field":""},"options":[],"isSearch":true,"value":asfToSelectMastersKey}]
+	//state.loading = true;
+	let sendData = {
+		formId:asfFormId,
+		page:1,
+		pagesize:1,
+		searchData:json2string(searchData)
+	}
+	//console.log("asf获取列表详细信息",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值对象数组
+				let asfAsfQueryParams = []
+				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
+					asfAsfQueryParams.push(asfQueryParamsItem)
+				}
+				let queryCount = 0
+				for(let i = 0;i<asfAsfQueryParams[0].asfToSelectIds.length;i++){
+					if(asfAsfQueryParams[0].asfToSelectIds[i].asfId!=undefined&&asfAsfQueryParams[0].asfToSelectIds[i].asfId!=""){
+						queryCount++
+					}
+				}
+				
+				//console.log(asfAsfQueryParams)
+				if(queryCount>0){
+					getAsfDataTitlesByIds(asfAsfQueryParams).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])
+								}
+								
+								
+							}
+						}
+						currentAsfTableDataList.value = dataList.data.list
+
+					});
+				}else{
+					currentAsfTableDataList.value = data.data.list
+
+					
+				}
+				
+			}else{
+				currentAsfTableDataList.value = data.data.list
+
+				
+				
+			}
+			/* //liwenxuan 关联表单数据获取 end
+			state.total = data.data.total
+			state.loading = false; */
+		})
+		.finally(()=>{
+			/* state.loading = false; */
+
+			//显示关联表单本条详情
+			tablePageClass.value = 4;	
+			drawerWith.value = container.value?.clientWidth
+			asflookPageInfoIsShow.value = true;
+						
+
+		})
+		
+}
+
 //liwenxuan 关联表单数据获取 start
 function getAsfDataTitlesByIds(asfQueryParams: any[]) {
 	return request({ 
@@ -435,6 +540,45 @@ function getAsfDataTitlesByIds(asfQueryParams: any[]) {
 	});
 }
 //liwenxuan 关联表单数据获取 end
+
+//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) */
+	let asfFormId = item.control.formid//关联表单在customer_form中的id
+	//alert("asfFormId:"+asfFormId)
+	let scopeColumnProperty = scope.column.property//exp:associatedForms1720570283525
+
+	let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id
+	//alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId)
+	let asfToSelectMastersKey = ""
+	for(let i = 0;i<asfQueryParams.length;i++){
+		if(asfQueryParams[i].field == scopeColumnProperty){
+			
+			for(let j = 0;j<asfQueryParams[i].asfToSelectIds.length;j++){
+				
+				if(asfQueryParams[i].asfToSelectIds[j].asfMasterId==asfQueryParamsNAsfToSelectIdsNAsfMasterId){
+					asfToSelectMastersKey = asfQueryParams[i].asfToSelectIds[j].asfId
+					
+				}
+			}
+		}
+	}
+	//alert("asfToSelectMastersKey:"+asfToSelectMastersKey)
+
+
+	
+	
+	asfGetPageData(asfFormId,asfToSelectMastersKey)
+	
+}
+//liwenxuan 关联表单详情弹窗 end
+
+
 onMounted(()=>{
 	getPageData()
 	nextTick(()=>{
@@ -503,7 +647,9 @@ const drawerWith = ref();	//编辑表单时抽屉宽度
 */
 const tablePageClass = ref(1)
 const lookPageInfoIsShow = ref(false)
+const asflookPageInfoIsShow = ref(false)
 const pageInfoCont = ref<any>()
+
 const lookPageInfo = (val:any) => {
 	tablePageClass.value = 4;
 	pageInfoCont.value = val
@@ -955,7 +1101,7 @@ const tabsView = (val:any,types:number) => {
 									key="primary"
 									type="primary"
 									link
-									@click="console.log(item);console.log(scope)"
+									@click="showAsfDetailDialog(item,scope,asfQueryParams)"
 									>
 									
 									{{scope.row[scope.column.property]}}
@@ -1056,7 +1202,7 @@ const tabsView = (val:any,types:number) => {
 			</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" />
 		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="props.versionid" :versiontitle="props.versiontitle" :drawerwith="drawerWith" :pick-app-menu="pickAppMenu" @searchquery="getListData" />
 	
 	</div>

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

@@ -94,6 +94,7 @@ const designStore = useDesignFormStore()
 const route = useRoute()
 const router = useRouter()
 const tableDataList = ref([]) // 表格行数据
+const currentAsfTableDataList = ref([])//当前点击的关联表单数据
 const openTaskDrawer = ref(false)	//新增数据
 
 const state = reactive({
@@ -300,7 +301,7 @@ const searchSend = reactive({
 })
 
 let asfDetails = []
-
+let asfQueryParams: any[] = []
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 15:51:32
@@ -313,6 +314,7 @@ const getPageData = () => {
 		page:state.currentPage,
 		pagesize:state.pageSize,
 		searchData:json2string(props.searchData)
+		//searchData:"id:1"
 	}
 	console.log("获取列表详细信息",sendData)
 	gainFormPageListCont(sendData)
@@ -328,10 +330,10 @@ const getPageData = () => {
 			})
 			
 			
-			if(asfDetails.length>0){
+			if(asfDetails.length>0&&data.data.list!=null){
 				//console.log(data.data.list)
 				//拼装参数,asf值对象数组
-				let asfQueryParams = []
+				asfQueryParams = []
 				for(let j = 0;j< asfDetails.length;j++){
 					let asfQueryParamsItem :any = {}
 					//console.log(asfDetails[j])
@@ -392,6 +394,111 @@ const getPageData = () => {
 			state.loading = false;
 		})
 }
+
+
+const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
+	let searchData = [{"id":"id","label":"Id","field":"id","type":"bigint(20)","attribute":"","pattern":"bigint","fieldClass":"id","activeValue":"","inactiveValue":"","config":{"optionsType":0},"control":{"optionsValue3Formid":"","optionsValue3Field":""},"options":[],"isSearch":true,"value":asfToSelectMastersKey}]
+	//state.loading = true;
+	let sendData = {
+		formId:asfFormId,
+		page:1,
+		pagesize:1,
+		searchData:json2string(searchData)
+	}
+	//console.log("asf获取列表详细信息",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值对象数组
+				let asfAsfQueryParams = []
+				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
+					asfAsfQueryParams.push(asfQueryParamsItem)
+				}
+				let queryCount = 0
+				for(let i = 0;i<asfAsfQueryParams[0].asfToSelectIds.length;i++){
+					if(asfAsfQueryParams[0].asfToSelectIds[i].asfId!=undefined&&asfAsfQueryParams[0].asfToSelectIds[i].asfId!=""){
+						queryCount++
+					}
+				}
+				
+				//console.log(asfAsfQueryParams)
+				if(queryCount>0){
+					getAsfDataTitlesByIds(asfAsfQueryParams).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])
+								}
+								
+								
+							}
+						}
+						currentAsfTableDataList.value = dataList.data.list
+
+					});
+				}else{
+					currentAsfTableDataList.value = data.data.list
+
+					
+				}
+				
+			}else{
+				currentAsfTableDataList.value = data.data.list
+
+				
+				
+			}
+			/* //liwenxuan 关联表单数据获取 end
+			state.total = data.data.total
+			state.loading = false; */
+		})
+		.finally(()=>{
+			/* state.loading = false; */
+
+			//显示关联表单本条详情
+			tablePageClass.value = 4;	
+			drawerWith.value = container.value?.clientWidth
+			asflookPageInfoIsShow.value = true;
+						
+
+		})
+		
+}
+
+
+
 onMounted(()=>{
 	getPageData()
 	nextTick(()=>{
@@ -407,6 +514,43 @@ 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) */
+	let asfFormId = item.control.formid//关联表单在customer_form中的id
+	//alert("asfFormId:"+asfFormId)
+	let scopeColumnProperty = scope.column.property//exp:associatedForms1720570283525
+
+	let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id
+	//alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId)
+	let asfToSelectMastersKey = ""
+	for(let i = 0;i<asfQueryParams.length;i++){
+		if(asfQueryParams[i].field == scopeColumnProperty){
+			
+			for(let j = 0;j<asfQueryParams[i].asfToSelectIds.length;j++){
+				
+				if(asfQueryParams[i].asfToSelectIds[j].asfMasterId==asfQueryParamsNAsfToSelectIdsNAsfMasterId){
+					asfToSelectMastersKey = asfQueryParams[i].asfToSelectIds[j].asfId
+					
+				}
+			}
+		}
+	}
+	//alert("asfToSelectMastersKey:"+asfToSelectMastersKey)
+
+
+	
+	
+	asfGetPageData(asfFormId,asfToSelectMastersKey)
+	
+}
+//liwenxuan 关联表单详情弹窗 end
 
 /**
 @ 作者: 秦东
@@ -470,6 +614,7 @@ const drawerWith = ref();	//编辑表单时抽屉宽度
 */
 const tablePageClass = ref(1)
 const lookPageInfoIsShow = ref(false)
+const asflookPageInfoIsShow = ref(false)
 const pageInfoCont = ref<any>()
 const lookPageInfo = (val:any) => {
 	tablePageClass.value = 4;
@@ -918,7 +1063,7 @@ const tabsView = (val:any,types:number) => {
 									key="primary"
 									type="primary"
 									link
-									@click="console.log(item);console.log(scope)"
+									@click="showAsfDetailDialog(item,scope,asfQueryParams)"
 									>
 									
 									{{scope.row[scope.column.property]}}
@@ -1023,8 +1168,13 @@ const tabsView = (val:any,types:number) => {
 			</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" />
 		<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

@@ -260,6 +260,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,7 +200,7 @@ const initLoadData = () => {
 
 
 						if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
-							console.log(stateData.tableData.columns[i])
+							//console.log(stateData.tableData.columns[i])
 							let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
 							/*
 								在这里请求后台获取字段
@@ -209,13 +209,27 @@ const initLoadData = () => {
 								stateData.tableData.columns[i].options = data
 								if(stateData.searchData.length>0){
 									for(let j = 0;j<stateData.searchData.length;j++){
-										console.log(stateData.searchData[j])
+										//console.log(stateData.searchData[j])
 										if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
 											stateData.searchData[j].options = data
 										}
 									}
 								}
 							})
+
+							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])
+									}
+								}
+							}
 						}
 					}
 				}