diff --git a/src/components/DesignForm/printHtmlRender.ts b/src/components/DesignForm/printHtmlRender.ts index ec9a8a3..a09a6a2 100644 --- a/src/components/DesignForm/printHtmlRender.ts +++ b/src/components/DesignForm/printHtmlRender.ts @@ -2,12 +2,27 @@ import {getPrintTemplate} from '@/api/DesignForm/requestapi' import {fieldTree,PageConfig} from './printHtmlRender.vue' import printHtmlRender from './printHtmlRender.vue' import {printWithSmartPagination} from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/printHtmlDom.js" +import {gainRunTaskFlow} from "@/api/DesignForm/requestapi"; const printRenderTree: Ref = ref([]); export const printHtmlPage = async (pformid:string,pappkey:string,pversionid:string,pformkey:string,row: any) => { let data:any[]=[] let _pageConfig:PageConfig let title:string="表单"; + let flowlist:any[]=[] + + if (row.flowIsOpens==1){ + let sendInfo = { + id:row.runFlowId + } + await gainRunTaskFlow(sendInfo) + .then((resp:any) =>{ + console.log("获取流程--werwerwerwer--->",resp.data) + flowlist=resp.data.flowList + }) + } + + await getPrintTemplate({"versionid":pversionid,"formkey":pappkey}).then(resp=>{ title=resp.data.title if(resp.data.formtemplatejson!=""){ @@ -32,8 +47,8 @@ export const printHtmlPage = async (pformid:string,pappkey:string,pversionid:str } }) - let qrstr=`https://wab.hxgk.group/#/form_table/taskInfo?id=${pformid}&key=${pappkey}& - formid=${pversionid}&formKey=${pformkey}&state=2` + let qrstr=`https://wab.hxgk.group/#/form_table/taskListPage?id=${pformid}&key=${pappkey}& + formid=${pversionid}&formKey=${pformkey}&qrDetailId=${row.id}` data.forEach(node=>{ deepLoopForm(node,row) }) @@ -57,6 +72,7 @@ export const printHtmlPage = async (pformid:string,pappkey:string,pversionid:str name:title, fieldTree:printRenderTree.value, pageConfig:_pageConfig, + flowList:flowlist, qrcode:qrstr, }) ]) diff --git a/src/components/DesignForm/printHtmlRender.vue b/src/components/DesignForm/printHtmlRender.vue index 0c8316b..b8ed07f 100644 --- a/src/components/DesignForm/printHtmlRender.vue +++ b/src/components/DesignForm/printHtmlRender.vue @@ -31,6 +31,7 @@ const props = withDefaults(defineProps<{ name:string, pageConfig:PageConfig, fieldTree:fieldTree[], + flowList:any[], qrcode?:string, }>(),{}) @@ -169,6 +170,50 @@ const generateQrCode= ()=>{
{{ group }}
+ + +
+ + + + + + + + + + + + + + +
审批流程
审批节点处理人操作记录
+
+
{{ generateQrCode() }}
@@ -208,9 +253,16 @@ div:empty { grid-template-columns: 1fr 1fr; border: 1px solid rgb(226, 226, 226); } +.operate_log{ + display: block; + border-bottom: 1px solid rgb(182, 181, 181); +} +td > .operate_log:last-child{ + border-bottom: none; +} h3{ width: 100%; - font-size: 25px; + font-size: 22px; font-weight: bold; } diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/printSetupPage2.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/printSetupPage2.vue index dc4c1c5..0cfa39b 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/printSetupPage2.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/printSetupPage2.vue @@ -342,7 +342,7 @@ const updateNodeData=(val:fieldTree,val2:boolean,val3:boolean)=>{
-
+
@@ -354,17 +354,18 @@ const updateNodeData=(val:fieldTree,val2:boolean,val3:boolean)=>{
-
- +
+
- +