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', () => `${form.creator?.name}`],
['apply_department_name', () => `${form.creator_department?.name}`],
@@ -22,7 +22,8 @@ export function print(printJs, isLog, form, logContent) {
while ((match = regexField.exec(printJs)) !== null) {
fieldMaths.push(match[0]); // 提取 之间的内容
}
- 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(//g)[0]
printStr = printStr.replace(fieldMath,subFormBody)
+ console.log(fieldMath, printStr)
} else {
printStr = printStr.replace(fieldMath,`${value}`)
}
@@ -44,7 +46,7 @@ export function print(printJs, isLog, form, logContent) {
} else {
console.log('未找到name属性');
}
- })
+ }
if(isLog) {
const logStyle = logContent.match(/',`${totalLogStyle}`)
const logBody = logContent.match(//g)[0]
- printStr = printStr.replace('
',`${logBody}`)
+ printStr = printStr.replace('
\n