From c7fc84070c3c5c32f5c28474f3309833085adbe8 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 19 Feb 2025 15:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E5=B8=A6=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?2=201.=E8=A1=A8=E5=8D=95id=E5=8F=96=E7=9A=84=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E5=90=8E=E7=AB=AF=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E6=9C=AA=E9=85=8D=E7=BD=AE=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=AD=97=E6=AE=B5=E6=97=B6=E9=81=AE=E7=BD=A9=E5=B1=82?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/index.vue               | 11 ++++++-----
 src/components/DesignForm/tableListPage/index.vue     | 10 ++++++----
 .../sysworkflow/lowcodepage/pageFlow/tableFlow.vue    |  6 +++++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 19d1b6e..9a42738 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -517,17 +517,18 @@ const setUpClick = (val: string, id: string) => {
     //在此组装参数,以生成二维码图片
     let idArray = state.selectionChecked.map(item => item.id);
     if(idArray.length>0){
-      const loadingInstance1 = ElLoading.service({
-        fullscreen: true,
-        text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改
-      });
+      
       //console.log(props.formBasicConfig)
       if(props.formBasicConfig.qrCodeFlag==true){
         if(props.formBasicConfig.qrCodeInside==true){
           if(props.formBasicConfig.qrCodePrintStyle&&props.formBasicConfig.qrCodePrintStyle=="2"&&props.formBasicConfig.qrCodeShowFields.length==0){
-            alert("未选择表格展示字段")
+            alert("未配置表格展示字段")
             return
           }
+          const loadingInstance1 = ElLoading.service({
+            fullscreen: true,
+            text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改
+          });
           //请求数据
           let getDetailQrCodesData: any = {}
           let currentFieldsMapArrObj: any = {}
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 45167aa..2b34275 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -516,10 +516,7 @@ const setUpClick = (val: string, id: string) => {
     //在此组装参数,以生成二维码图片
     let idArray = state.selectionChecked.map(item => item.id);
     if(idArray.length>0){
-      const loadingInstance1 = ElLoading.service({
-        fullscreen: true,
-        text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改
-      });
+      
       //console.log(props.formBasicConfig)
 
       if(props.formBasicConfig.qrCodeFlag==true){
@@ -528,6 +525,10 @@ const setUpClick = (val: string, id: string) => {
             alert("未选择表格展示字段")
             return
           }
+          const loadingInstance1 = ElLoading.service({
+            fullscreen: true,
+            text: '正在生成二维码，请稍候...' // 添加的文字内容，可根据需要修改
+          });
 
           //请求数据
           let getDetailQrCodesData: any = {}
@@ -2023,6 +2024,7 @@ const diGuiJilian = (val: any, options: any[]) => {
       :versionid="props.versionid"
       :versiontitle="props.versiontitle"
       :drawerwith="drawerWith"
+      :cfid = "props.formId"
       @searchquery="getListData"
     />
     <!-- 2025 liwenxuan 二维码打印 -->
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
index 72c0bb4..bd63c4c 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
@@ -29,6 +29,10 @@ const props = defineProps({
 	drawerwith:{
 		type:Number,
 		default:0
+	},
+  cfid:{
+		type:String,
+		default:""
 	}
 })
 const formLoading = ref(false) //loading
@@ -445,7 +449,7 @@ function getQrCodeImgInside() {
 		url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
 		method: "post",
 		data: {
-		cfid: state.id,
+		cfid: props.cfid,
 		},
 	});
 }