From e58f1726312ffa898c7b62ca2e96a6038c2fb04e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 18 Apr 2023 10:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/Separate.vue                  |  1 -
 src/views/activiti/form/ProcessUdgetPlanForm.vue | 11 ++++++++++-
 src/views/activiti/historicDetail.vue            | 15 ++++++++++++---
 src/views/activiti/historicPictrue.vue           | 13 ++++++++++++-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/views/activiti/Separate.vue b/src/views/activiti/Separate.vue
index 5801b46..29fcecc 100644
--- a/src/views/activiti/Separate.vue
+++ b/src/views/activiti/Separate.vue
@@ -31,7 +31,6 @@ name: "Separate",
   },
   created() {
     console.log("有值LOL",JSON.parse(decodeURIComponent(this.$route.query.item)));
-
     this.lcModa = JSON.parse(decodeURIComponent(this.$route.query.item));
     console.log(this.lcModa);
   },
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 0d8f3a8..83418de 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <a-spin :spinning="confirmLoading" style="height: 680px;padding-top: 10px">
+  <a-spin :spinning="confirmLoading" style="padding-top: 10px;" :style="conheight">
     <j-form-container  style="background-color: #efefef;padding-top: 10px" >
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
@@ -247,6 +247,9 @@
       return {
         //用于回显物料号
         listId: [],
+        conheight:{
+          height:''
+        },
         // data,
         // columns,
         // editingKey: '',
@@ -691,6 +694,9 @@
     mounted() {
       // console.log( isPlanType);
       // this.form.setFieldsValue("materialGroup",123123);
+      // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
+        window.addEventListener('resize', this.getHeight);
+        this.getHeight();
     },
     methods: {
       lengthCheck(rule, value, callback) {
@@ -699,6 +705,9 @@
           callback('长度应当在0 ~ 12 字符')
         }
       },
+      getHeight(){
+        this.conheight.height=window.innerHeight-230+'px';
+      },
       selectRowChange(a, b, c) {
         // console.log("执行了",a,b,c);
       },
diff --git a/src/views/activiti/historicDetail.vue b/src/views/activiti/historicDetail.vue
index 732c5f2..6471624 100644
--- a/src/views/activiti/historicDetail.vue
+++ b/src/views/activiti/historicDetail.vue
@@ -1,7 +1,5 @@
-<style lang="less">
-</style>
 <template>
-  <div class="search">
+  <div class="search" :style="conheight">
     <a-card style="margin-bottom:10px;">
       <p slot="title">
         <span>流程审批进度历史</span>
@@ -124,6 +122,9 @@ export default {
         historicFlow:'/actTask/historicFlow/',
         getHighlightImg:`${window._CONFIG['domianURL']}/activiti/models/getHighlightImg/`
       },
+      conheight:{
+        height:''
+      },
       type: 0,
       loading: false, // 表单加载状态
       loadingImg: false,
@@ -138,12 +139,20 @@ export default {
       this.init();
     }
   },
+  mounted() {
+    // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
+    window.addEventListener('resize', this.getHeight);
+    this.getHeight();
+  },
   watch: {
     procInstId:function(newval ,oldName) {
       this.init();
     }
   },
   methods: {
+    getHeight(){
+      this.conheight.height=window.innerHeight-230+'px';
+    },
     loadData(){
 
     },
diff --git a/src/views/activiti/historicPictrue.vue b/src/views/activiti/historicPictrue.vue
index 7aae0e2..3e510d2 100644
--- a/src/views/activiti/historicPictrue.vue
+++ b/src/views/activiti/historicPictrue.vue
@@ -1,7 +1,7 @@
 <style lang="less">
 </style>
 <template>
-  <div class="search">
+  <div class="search" :style="conheight" style="overflow:auto;">
     <!--<a-card style="margin-bottom:10px;">
       <p slot="title">
         <span>流程审批进度历史</span>
@@ -120,6 +120,9 @@ export default {
   },
   data() {
     return {
+      conheight:{
+        height:''
+      },
       url:{
         historicFlow:'/actTask/historicFlow/',
         getHighlightImg:`${window._CONFIG['domianURL']}/activiti/models/getHighlightImg/`,
@@ -150,6 +153,11 @@ export default {
     //
     // }
   },
+  mounted() {
+    // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
+    window.addEventListener('resize', this.getHeight);
+    this.getHeight();
+  },
   watch: {
     procInstId:function(newval ,oldName) {
       this.init();
@@ -159,6 +167,9 @@ export default {
     }
   },
   methods: {
+    getHeight(){
+      this.conheight.height=window.innerHeight-230+'px';
+    },
     loadData(){
 
     },