diff --git a/src/components/DesignForm/printHtmlRender.ts b/src/components/DesignForm/printHtmlRender.ts index a09a6a2..246d7cd 100644 --- a/src/components/DesignForm/printHtmlRender.ts +++ b/src/components/DesignForm/printHtmlRender.ts @@ -3,8 +3,10 @@ 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"; +import { useOrgMemberStore } from "@/store/modules/orgMember"; const printRenderTree: Ref = ref([]); +const orgMembers = useOrgMemberStore() export const printHtmlPage = async (pformid:string,pappkey:string,pversionid:string,pformkey:string,row: any) => { let data:any[]=[] let _pageConfig:PageConfig @@ -17,7 +19,7 @@ export const printHtmlPage = async (pformid:string,pappkey:string,pversionid:str } await gainRunTaskFlow(sendInfo) .then((resp:any) =>{ - console.log("获取流程--werwerwerwer--->",resp.data) + //console.log("获取流程--werwerwerwer--->",resp.data) flowlist=resp.data.flowList }) } @@ -36,13 +38,13 @@ export const printHtmlPage = async (pformid:string,pappkey:string,pversionid:str _pageConfig=JSON.parse(resp.data.pageconfigjson) if(_pageConfig.founder!=""){ _pageConfig.founder=row[_pageConfig.founder] + _pageConfig.deptOrg=orgMembers.listMap[row.createrOrg] } + if(_pageConfig.founderTime!=""){ _pageConfig.founderTime=row[_pageConfig.founderTime] } - if(_pageConfig.deptOrg!=""){ - _pageConfig.deptOrg=row[_pageConfig.deptOrg] - } + _pageConfig.masters_key=row.masters_key } }) diff --git a/src/components/DesignForm/printHtmlRender.vue b/src/components/DesignForm/printHtmlRender.vue index b8ed07f..156ec48 100644 --- a/src/components/DesignForm/printHtmlRender.vue +++ b/src/components/DesignForm/printHtmlRender.vue @@ -68,6 +68,14 @@ const generateQrCode= ()=>{ }) } +const getStateText=(val:number)=>{ + if(val==1) return "未操作" + if(val==2) return "已同意" + if(val==3) return "已驳回" + if(val==4) return "已查看" + return "未操作" +} +