From 0071e0140b7b4c2805656641e56ea7affb719820 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 22 Jan 2025 09:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=9D=9E=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/tableListPage/index.vue        | 99 ++++++++++++-------
 1 file changed, 63 insertions(+), 36 deletions(-)

diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 54897f8..131156d 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -626,7 +626,9 @@ const setUpClick = (val: string, id: string) => {
           
         }else if(props.formBasicConfig.qrCodePrintStyle&&props.formBasicConfig.qrCodePrintStyle=="1"){
           //fieldsMap = null
+          tablesData.value = getDetailQrCodesData
           qrCodesPrintDialogFlag.value = true
+          loadingInstance1.close()
         }
         
       })/* .finally(()=>{
@@ -1932,44 +1934,69 @@ const diGuiJilian = (val: any, options: any[]) => {
     />
     <!-- 2025 liwenxuan 二维码打印 -->
     <el-dialog
-    v-model="qrCodesPrintDialogFlag"
-    class="glxxsztc"
-    top="150px"
-    :close-on-click-modal="false"
-    title="生成的二维码"
-    :show-close="false"
-    style="margin-top: 10px"
-    width="50%"
-  >
-    <div v-if="formBasicConfig.qrCodePrintStyle == '2'" style="min-height: 50px; max-height: 750px; overflow-y: auto">
-      <div 
-        v-for="(tableData, tableKey) in tablesData" 
-        :id="tableKey" 
-        :key="tableKey" 
-        :ref="(el: any) => { if (el) tableRefs[tableKey] = el }" 
-        style="margin-bottom: 30px; width: 95%;"
-      >
-        <table>
-          <tr>
-            <th style="font-weight: bold; font-size:medium;" colspan="2">{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}</th>
-            <th rowspan="6"><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th>
-          </tr>
-          <tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex">
-            <th>{{ item.key }}</th>
-            <td>{{ item.value }}</td>
-          </tr>
-        </table>
+      v-model="qrCodesPrintDialogFlag"
+      class="glxxsztc"
+      top="150px"
+      :close-on-click-modal="false"
+      title="生成的二维码"
+      :show-close="false"
+      style="margin-top: 10px"
+      width="50%"
+    >
+      <div v-if="formBasicConfig.qrCodePrintStyle == '2'" style="min-height: 50px; max-height: 750px; overflow-y: auto">
+        <div 
+          v-for="(tableData, tableKey) in tablesData" 
+          :id="tableKey" 
+          :key="tableKey" 
+          :ref="(el: any) => { if (el) tableRefs[tableKey] = el }" 
+          style="margin-bottom: 30px; width: 95%;"
+        >
+          <table>
+            <tr>
+              <th style="font-weight: bold; font-size:medium;" colspan="2">{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}</th>
+              <th rowspan="6"><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th>
+            </tr>
+            <tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex">
+              <th>{{ item.key }}</th>
+              <td>{{ item.value }}</td>
+            </tr>
+          </table>
+        </div>
       </div>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button :disabled="isButton1Disabled" type="primary" plain @click="downloadTables">下载</el-button>
-        <el-button :disabled="isButton2Disabled" type="primary" plain @click="closeQrDownload">
-          确定
-        </el-button>
+      <div v-if="formBasicConfig.qrCodePrintStyle == '1'" style="display: flex; flex-direction: column; align-items: center; min-height: 50px; max-height: 750px; overflow-y: auto">
+        <div 
+          v-for="(tableData, tableKey) in tablesData" 
+          :id="tableKey" 
+          :key="tableKey" 
+          :ref="(el: any) => { if (el) tableRefs[tableKey] = el }" 
+          style="margin-bottom: 30px; width: 400px;"
+        >
+          <table >
+            <tr>
+              <th style="font-weight: bold; font-size:medium;" colspan="1">{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}</th>
+              <!-- <th ><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th> -->
+            </tr>
+            <tr>
+              <!-- <th style="font-weight: bold; font-size:medium;" colspan="2">{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}</th> -->
+              <th ><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th>
+            </tr>
+            <!-- <tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex">
+              <th>{{ item.key }}</th>
+              <td>{{ item.value }}</td>
+            </tr> -->
+          </table>
+        </div>
       </div>
-    </template>
-  </el-dialog>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :disabled="isButton1Disabled" type="primary" plain @click="downloadTables">下载</el-button>
+          <el-button :disabled="isButton2Disabled" type="primary" plain @click="closeQrDownload">
+            确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
 
     <el-dialog
       v-model="asfShowDetailsFlag"