@@ -144,9 +145,16 @@ const generateQrCode= ()=>{
{{ group }}
-
+
{{ generateQrCode() }}
-
![]()
+
+
![]()
+
使用手机企业微信
扫一扫
+
+
+
打印日期:{{ new Date().toLocaleString() }}
+
打印人: {{userName}}
+
@@ -312,4 +320,4 @@ h5{
border: 1px solid rgb(182, 181, 181);
}
-
\ No newline at end of file
+
diff --git a/src/components/DesignForm/tableListPage/index copy.vue b/src/components/DesignForm/tableListPage/index copy.vue
deleted file mode 100644
index 7a91c76..0000000
--- a/src/components/DesignForm/tableListPage/index copy.vue
+++ /dev/null
@@ -1,2505 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
-
- 操作按钮区域
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.column.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ writeListTitle(scope.row, viewPage.list) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.column.label }}
-
-
-
-
- {{ scope.row[scope.column.property] }}
-
-
-
- 启用
- 已禁用
- 已删除
-
-
-
- {{ scope.row[scope.column.property] }}
-
-
-
- {{ scope.row[scope.column.property] }}
-
-
-
-
-
- {{ scope.row[scope.column.property] }}
-
-
-
- {{ judjeCascader(scope.row[scope.column.property], item.options) }}
-
-
-
- {{ judjeRadio(scope.row[scope.column.property], item.options) }}
-
-
-
-
-
-
- 启用
-
- 禁用
-
-
- {{ scope.row[scope.column.property] }}
-
-
-
- {{ scope.row[scope.column.property] }}
-
-
-
- {{ scope.row[scope.column.property] }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- {{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}
- |
-
-
- |
-
-
- | {{ item.key }} |
- {{ item.value }} |
-
-
-
-
-
-
-
-
- |
- {{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{
- tablesData[tableKey].dataTitle
- }}
- |
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index db05cba..fa01ebe 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -39,8 +39,8 @@ import { softDeletion, retractRunWorkFlow, recalSendMsg } from "@/api/taskapi/ma
import { echatsViews } from "@/api/DesignForm/types";
import { formatNumber } from "@/api/DesignForm/utils";
import { Ref } from "vue";
-import printHtmlRender from './printHtmlRender.vue'
-import {fieldTree,PageConfig} from './printHtmlRender.vue'
+import printHtmlRender from '../printHtmlRender.vue'
+import {fieldTree,PageConfig} from '../printHtmlRender.vue'
import {printElement} from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/printHtmlDom.js"
//引入组件
import FormPageCont from "@/components/DesignForm/tableListPage/formPageCont.vue";
@@ -1344,16 +1344,15 @@ const lookPageInfo = (val: any) => {
lookPageInfoIsShow.value = true;
};
-
+/****************表单打印功能************************/
const printRenderMode = ref(false);
-// Explicitly type as Ref
-
const printRenderTree: Ref = ref([]);
const printPage = async (row: any) => {
let data:any[]=[]
let _pageConfig:PageConfig
let title:string="表单";
- await getPrintTemplate({"versionid":props.versionid,"formkey":props.formKey}).then(resp=>{
+ //这里appkey和formkey 有些乱,由于历史遗留问题,不好区分。。。
+ await getPrintTemplate({"versionid":props.versionid,"formkey":props.appKey}).then(resp=>{
title=resp.data.title
if(resp.data.formtemplatejson!=""){
data=JSON.parse(resp.data.formtemplatejson)
@@ -1375,7 +1374,7 @@ const printPage = async (row: any) => {
}
})
- let qrstr=`https://wab.hxgk.group/#/form_table/taskInfo?id=${props.formId}}&key=${props.appKey}&
+ let qrstr=`https://wab.hxgk.group/#/form_table/taskInfo?id=${props.formId}&key=${props.appKey}&
formid=${props.versionid}&formKey=${props.formKey}&state=2`
data.forEach(node=>{
@@ -1397,7 +1396,7 @@ const printPage = async (row: any) => {
name:title,
fieldTree:printRenderTree.value,
pageConfig:_pageConfig,
- formData:qrstr
+ qrcode:qrstr
})
])
]),
@@ -1408,26 +1407,25 @@ const printPage = async (row: any) => {
};
-function deepLoopForm(node:fieldTree, row: Record){
- if(Array.isArray(node)){
- node.forEach(item=>{deepLoopForm(item,row)})
- return
- }
- if(node.field!=""){
- let rnode:Object;
- if (row.hasOwnProperty(node.field!)){// 有这个字段
- if (node.type=="table" || node.type=="tabs"){
- node.data=row[node.field!]
- }else{
- node.field=row[node.field!]
+const deepLoopForm=(node:fieldTree, row: Record)=>{
+ if(Array.isArray(node)){
+ node.forEach(item=>{deepLoopForm(item,row)})
+ return
+ }
+
+ if(node.field!=""){
+ let rnode:Object;
+ if (row.hasOwnProperty(node.field!)){// 有这个字段
+ if (node.type=="table" || node.type=="tabs"){
+ node.data=row[node.field!]
+ }else{
+ node.field=row[node.field!]
+ }
}
}
}
-}
-
-
/**
@ 作者: 秦东
@ 时间: 2024-04-05 11:29:50
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index 1ed75e9..1360111 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -541,7 +541,7 @@ defineExpose({
:form-id="stateForm.formId"
:app-key="props.menusInfo.appkey"
:versionid="versionId"
- :form-key="props.formKey"
+ :form-key="props.menusInfo.id"
:versiontitle="versionTitle"
v-model:look-page-is-show="lookPageIsShow"
:viewPage="stateList.view"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index fc16bcf..d1b9e41 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -776,7 +776,6 @@ const dialogConfirmTree = (val: treeStruct[], types: string) => {
};
- +++++++++++++++++++++++++
{
};
- ++++++++++++++++++++++
import { ref, onMounted,toRaw} from 'vue';
import {getPrintTemplate,savePrintTemplate} from '@/api/DesignForm/requestapi'
-import printHtmlRender from '@/components/DesignForm/tableListPage/printHtmlRender.vue'
-import { fieldTree,PageConfig} from '@/components/DesignForm/tableListPage/printHtmlRender.vue'
+import printHtmlRender from '@/components/DesignForm/printHtmlRender.vue'
+import { fieldTree,PageConfig} from '@/components/DesignForm/printHtmlRender.vue'
interface fieldTreeEx extends fieldTree{
unitName?:string;
@@ -355,7 +355,7 @@ const updateNodeData=(val:fieldTree,val2:boolean,val3:boolean)=>{