Merge branch 'lwx_v17' into lwx_v19

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 = {}

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 二维码打印 -->

src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue

@@ -27,25 +27,29 @@ import {
 import FlowStep from "@/views/taskplatform/taskmanagement/flowStep.vue";
 
 const props = defineProps({
-  isopen: {
-    type: Boolean,
-    default: true,
-  },
-  versionid: {
-    type: String,
-    default: "",
-  },
-  versiontitle: {
-    type: String,
-    default: "",
-  },
-  drawerwith: {
-    type: Number,
-    default: 0,
-  },
+	isopen:{
+		type:Boolean,
+		default:true
+	},
+	versionid:{
+		type:String,
+		default:""
+	},
+	versiontitle:{
+		type:String,
+		default:""
+	},
+	drawerwith:{
+		type:Number,
+		default:0
+	},
+  cfid:{
+		type:String,
+		default:""
+	}
 });
-const formLoading = ref(false); //loading
-const flowLoading = ref(false); //loading
+const formLoading = ref(false) //loading
+const flowLoading = ref(false) //loading
 
 const flowFactor = reactive<conditionInfo[]>([]); //表单组件
 const flowMap = ref<any[]>(); //工作流
@@ -462,7 +466,7 @@ function getQrCodeImgInside() {
 		url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
 		method: "post",
 		data: {
-		cfid: state.id,
+		cfid: props.cfid,
 		},
 	});
 }