Merge branch 'han_printing'

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<any[]> = 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
     }
   })

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 "未操作"
+}
+
 </script>
 
 <template>
@@ -172,7 +180,7 @@ const generateQrCode= ()=>{
   </div>
 
 
-  <div v-if="props.flowList.length>0" class="section_table">
+  <div v-if="props.flowList && props.flowList.length>0" class="section_table">
     <table class="bder_table">
       <caption >审批流程</caption>
       <thead>
@@ -190,21 +198,27 @@ const generateQrCode= ()=>{
                 <span v-if="item.examinemode==1">(依次审批)</span>
                 <span v-if="item.examinemode==2">(会签)</span>
                 <span v-if="item.examinemode==3">(或签)</span>
-                <br><span v-if="item.status==2">已完成</span><span v-else="item.status==2">未处理</span>
+                <br><span v-if="item.status==2">已同意</span>
+                    <span v-else-if="item.status==3">已驳回</span>
+                    <span v-else>未处理</span>
               </div>
             </td>
 
             <td >
               <template v-for="oper in item.operator" >
                 <span v-if="oper.log" class="operate_log" >
+                  <template v-for="log in oper.log">
                     {{ oper.name }}--{{ oper.departmentname }}--{{ oper.postname }}
+                  </template>
                 </span>
               </template>
             </td>
             <td >
               <template v-for="oper in item.operator" >
                 <span v-if="oper.log" class="operate_log" >
-                  {{ oper.log[0].cause }} {{ oper.log[0].time.slice(0,16) }}
+                  <template v-for="log in oper.log">
+                    ({{ getStateText(log.state) }}) {{ log.cause }} {{ log.time.slice(0,16) }}
+                  </template>
                 </span>
               </template>
             </td>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/printSetupPage2.vue

@@ -315,7 +315,6 @@ const updateNodeData=(val:fieldTree,val2:boolean,val3:boolean)=>{
     <el-tab-pane label="默认" name="html">
       <div style="display: grid; grid-template-columns: 1fr 4fr;">
         <div class="hiprintEpContainer" >
-          <el-button type="primary"  @click="onSaveTreeData">保存模板</el-button>
           <span>系统字段</span>
           <el-checkbox-group v-model="objPageConfig.pagebrow" class="basic_fields">
             <el-checkbox label="创建人" value="founder" />
@@ -353,6 +352,8 @@ const updateNodeData=(val:fieldTree,val2:boolean,val3:boolean)=>{
               <el-radio-button label="横向" value="htal" />
               <el-radio-button label="纵向" value="vtal" />
             </el-radio-group>
+
+            <el-button style="position: absolute;right: 90px;" type="primary"  @click="onSaveTreeData">保存模板</el-button>
           </div>
           <div style="margin: 10px auto; background: white;box-shadow:0px 0px 6px rgba(0,0,0,0.12);overflow-y: scroll; scrollbar-width: none;" 
           :style="{width: objPageConfig.width,height:objPageConfig.height}">