diff --git a/src/views/formTable/page/cardPage.vue b/src/views/formTable/page/cardPage.vue
index 60db50a..dab8100 100644
--- a/src/views/formTable/page/cardPage.vue
+++ b/src/views/formTable/page/cardPage.vue
@@ -358,7 +358,125 @@ const columnsFilter = computed(() => {
const searchQuery = computed(() => {
return json2string(props.stateListInfo.searchData);
});
+//liwenxuan 20250117 二维码跳转表单单条数据详情展示 start
+const qrJumpGetPageData = (qrDetailId: string) => {
+ let qrJumpSearchData = [{"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":qrDetailId}]
+ loadText.value = "数据加载中，请稍后......"
+ loadingList.value = true
+ console.log(searchQuery.value)
+ let sendData = {
+ formId: props.appId,
+ page:1,
+ pagesize:1,
+ searchData:json2string(qrJumpSearchData)
+ }
+
+ state.loading = true;
+ gainFormPageListCont(sendData)
+ .then((data) => {
+ console.log("获取列表详细信息----------ee------->",data.data)
+ // tableDataList.value = data.data.list;
+ if(Array.isArray(data.data.list)){
+
+ //liwenxuan 关联表单 start
+
+ //liwenxuan 关联表单数据获取 start
+ let dataList = data;
+ //console.log(dataList)
+ asfDetails = props.stateListInfo.tableData.columns.filter((item: any) => {
+ return item.fieldClass == "associatedForms";
+ });
+
+ if (asfDetails.length > 0 && data.data.list != null) {
+ //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 = [];
+ // 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];
+ 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;
+ tableDataList.value.push(... dataList.data.list)
+ });
+ } else {
+ //tableDataList.value = data.data.list;
+ tableDataList.value.push(...data.data.list)
+ }
+ } else {
+ //tableDataList.value = data.data.list;
+ tableDataList.value.push(...data.data.list)
+ }
+
+ //tableDataList.value = data.data.list
+ //liwenxuan 关联表单数据获取 end
+
+ //liwenxuan 关联表单 end
+
+ /* tableDataList.value.push(...data.data.list)
+ console.log(tableDataList.value) */
+ }
+
+ pageTotal.value = pageTotal.value + data.data.count
+ if(data.data.total > 0){
+ if(pageTotal.value < data.data.total){
+ let pagenum = state.pagesize - data.data.count
+ if (pagenum > 0) {
+ loadText.value = ""
+ loadingList.value = true
+ }else{
+ loadText.value = ""
+ loadingList.value = false
+ }
+ }else{
+ loadText.value = ""
+ loadingList.value = true
+ }
+
+ }else{
+ loadText.value = "此选项没有数据！"
+ loadingList.value = true
+ }
+
+ })
+}
+//liwenxuan 20250117 二维码跳转表单单条数据详情展示 end
/**
@ 作者: 秦东
@ 时间: 2024-11-05 10:15:38
@@ -367,6 +485,7 @@ const searchQuery = computed(() => {
const getPageData = () => {
loadText.value = "数据加载中，请稍后......"
loadingList.value = true
+ console.log(searchQuery.value)
let sendData = {
formId: props.appId,
page: state.page,
@@ -479,10 +598,28 @@ const getPageData = () => {
})
}
+// 使用 ref 来存储 URL 信息
+const fullUrl = ref(window.location.href);
+
onMounted(()=>{
nextTick(()=>{
- requeryList()
+ console.log(fullUrl.value)
+ if(fullUrl.value.includes("&qrDetailId=")){
+ let urlSplitArray = fullUrl.value.split("&qrDetailId=")
+ let qrDetailId = urlSplitArray[1]
+ qrJumpGetPageData(qrDetailId)
+
+ //
+ setTimeout(() => {
+ openLook(tableDataList.value[0])
+ }, 500);
+
+ }else{
+ requeryList()
+ }
})
+
+
})
@@ -715,11 +852,12 @@ defineExpose({
tableDataList =========> {{ tableDataList }}
-->
-
+
-
+