From 5f208b18a94a8cbb2e3a8381b25c932cd2da1ebe Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 12 Dec 2024 18:14:37 +0800
Subject: [PATCH] 1

---
 src/utils/formBuilder.js      |  4 ++++
 src/utils/print.js            | 11 +++++++----
 src/views/dashboard/index.vue |  4 ++--
 src/views/flow/create.vue     |  8 +++++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js
index 8b55583..eae94ce 100644
--- a/src/utils/formBuilder.js
+++ b/src/utils/formBuilder.js
@@ -895,6 +895,10 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
     }
 
     if (formItem) {
+      this.logs.forEach(log => {
+        if(!log.is_jointly_sign) return
+
+      })
       return row
         ? formItem
         : h(
diff --git a/src/utils/print.js b/src/utils/print.js
index 42135ab..327bd22 100644
--- a/src/utils/print.js
+++ b/src/utils/print.js
@@ -6,7 +6,7 @@ import store from '@/store'
  * @param{string} [logContent] 审批表格html
  * @return{void}
 **/
-export function print(printJs, isLog, form, logContent) {
+export async function print(printJs, isLog, form, logContent) {
   const staticMap = new Map([
     ['apply_name', () => `<span>${form.creator?.name}</span>`],
     ['apply_department_name', () => `<span>${form.creator_department?.name}</span>`],
@@ -22,7 +22,8 @@ export function print(printJs, isLog, form, logContent) {
   while ((match = regexField.exec(printJs)) !== null) {
     fieldMaths.push(match[0]); // 提取 <field> 之间的内容
   }
-  fieldMaths.forEach(async fieldMath => {
+  for (let i = 0;i < fieldMaths.length; i++) {
+    let fieldMath = fieldMaths[i]
     const matchName = fieldMath.match(/name="([^"]+)"/);
     if (matchName) {
       const nameValue = matchName[1];
@@ -37,6 +38,7 @@ export function print(printJs, isLog, form, logContent) {
           })
           let subFormBody = subForm.content.match(/<table(.*?)<\/table>/g)[0]
           printStr = printStr.replace(fieldMath,subFormBody)
+          console.log(fieldMath, printStr)
         } else {
           printStr = printStr.replace(fieldMath,`<span>${value}</span>`)
         }
@@ -44,7 +46,7 @@ export function print(printJs, isLog, form, logContent) {
     } else {
       console.log('未找到name属性');
     }
-  })
+  }
   if(isLog) {
     const logStyle = logContent.match(/<style>(.*?)<\/style>/g)
     let totalLogStyle= ''
@@ -53,8 +55,9 @@ export function print(printJs, isLog, form, logContent) {
     })
     printStr = printStr.replace('</style>',`</style>${totalLogStyle}<style>.vxe-table { width: 100%; } .vxe-table * { width: auto !important;white-space: initial; }.vxe-table:not(.is--print) .col--ellipsis > div { word-break: break-all;white-space: normal;overflow: initial; }.tblPrint .vxe-table td,.tblPrint .vxe-table th { font-size: 20px;padding: 0; }</style>`)
     const logBody = logContent.match(/<table(.*?)<\/table>/g)[0]
-    printStr = printStr.replace('</table>',`</talbe>${logBody}`)
+    printStr = printStr.replace('</table>\n<style>',`</talbe>${logBody}<style>`)
   }
+  console.log(printStr)
   let printWindow = window.open('', '_blank');
   printWindow.document.write(printStr);
   printWindow.focus();
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 73d7d82..0733af0 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -285,7 +285,7 @@ import { flow } from "@/api/flow";
 import { index as configIndex } from "@/api/config";
 import { index } from "@/api/attendance";
 import {isExternal} from "@/utils/validate";
-import {defaultModalSize} from "@/settings";
+import { defaultModalSize } from "@/settings";
 export default {
   name: "Dashboard",
   components: {
@@ -453,7 +453,7 @@ export default {
         });
         if (res.status === 200) {
           console.log(res)
-          this.quickMenus[3].num = res.data.data?.count_unread ?? 0
+          this.quickMenus[3].num = res.data.data?.count_todo ?? 0
           this.quickMenus[4].num = res.data.data?.count_unread_ccs ?? 0
         }
       } catch (err) {
diff --git a/src/views/flow/create.vue b/src/views/flow/create.vue
index c3a8e8f..b39af83 100644
--- a/src/views/flow/create.vue
+++ b/src/views/flow/create.vue
@@ -419,9 +419,9 @@ export default {
           type: 'html',
           download: false
         })
-        print.bind(this)(printText, isLog, _this.config.flow, res.content)
+        await print.bind(this)(printText, isLog, _this.config.flow, res.content)
       } else {
-        print.bind(this)(printText, isLog, _this.config.flow)
+        await print.bind(this)(printText, isLog, _this.config.flow)
       }
     },
 
@@ -500,7 +500,9 @@ export default {
           if (/\/detail/.test(this.$route.path) && this.$route.query.flow_id) {
             object[field.name] = "";
           } else {
-            object[field.name] = (this.writeableFields.indexOf(field.id) !== -1 && field.default_value) ? field.default_value : (field.type === 'file' ? [] : "");
+            if (this.writeableFields.indexOf(field.id) !== -1 || this.readableFields.indexOf(field.id) !== -1) {
+              object[field.name] = (this.writeableFields.indexOf(field.id) !== -1 && field.default_value) ? field.default_value : (field.type === 'file' ? [] : "");
+            }
           }
         }
       });