Merge remote-tracking branch 'origin/dev' into dev

src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue

@@ -7,7 +7,7 @@
       </a-tab-pane>
 
       <a-tab-pane tab="流程节点图" key="2" forceRender >
-        <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
+        <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId" :style=conheight style="overflow-y:auto"/>
       </a-tab-pane>
       <a-tab-pane tab="制式表格" key="3" forceRender>
         <process-material-warehousing-statement :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
@@ -41,6 +41,9 @@ export default {
         list:"",
         getProcessPicture:'/hy/processMaterialWarehousing/getProcessPicture'
       },
+      conheight:{
+        height:''
+      },
     }
   },
   props: {
@@ -90,6 +93,12 @@ export default {
     console.log(this.proMaterListId);
     // this.getPicture();
   },
+  mounted() {
+    console.log("执行声明周期监听")
+    // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
+    window.addEventListener('resize', this.getHeight);
+    this.getHeight();
+  },
   watch:{
     $route(to,from) {
       this.tabKey = '1'
@@ -97,6 +106,9 @@ export default {
     }
   },
   methods: {
+    getHeight(){
+      this.conheight.height=window.innerHeight-230+'px';
+    },
     callback(key){
       this.tabKey = key
       if (key==2){

src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue

@@ -7,7 +7,7 @@
       </a-tab-pane>
 
       <a-tab-pane tab="流程节点图" key="2" forceRender>
-        <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
+        <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId" :style=conheight style="overflow-y:auto"/>
       </a-tab-pane>
       <a-tab-pane tab="制式表格" key="3" forceRender>
         <ProcessMaterialsDeliveryStatement  :materWared="this.$route.query.item"/>
@@ -43,6 +43,9 @@ export default {
         list:"",
         getProcessPicture:'/hy/processMaterialWarehousing/getProcessPicture'
       },
+      conheight:{
+        height:''
+      },
     }
   },
   props: {
@@ -91,6 +94,12 @@ export default {
   created(){
     console.log(this.proMaterListId);
   },
+  mounted() {
+    console.log("执行声明周期监听")
+    // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
+    window.addEventListener('resize', this.getHeight);
+    this.getHeight();
+  },
   watch:{
     $route(to,from) {
       this.tabKey = '1'
@@ -98,6 +107,9 @@ export default {
     }
   },
   methods: {
+    getHeight(){
+      this.conheight.height=window.innerHeight-230+'px';
+    },
     callback(key){
       this.tabKey = key
       if (key==2){

src/views/accessrecords/plan/ProcessMaterialsPlan.vue

@@ -7,7 +7,7 @@
       </a-tab-pane>
 
       <a-tab-pane tab="流程节点图" key="2" forceRender >
-        <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
+        <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId" :style=conheight style="overflow-y:auto"/>
       </a-tab-pane>
       <a-tab-pane tab="制式表格" key="3" forceRender>
         <ProcessMaterialsPlanList  :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
@@ -43,6 +43,9 @@
           list:"",
           getProcessPicture:'/hy/processMaterialWarehousing/getProcessPicture'
         },
+        conheight:{
+          height:''
+        },
       }
     },
     props: {
@@ -93,6 +96,12 @@
       console.log("=================",this.proMaterListId,"===================")
       // this.getPicture();
     },
+    mounted() {
+      console.log("执行声明周期监听")
+      // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
+      window.addEventListener('resize', this.getHeight);
+      this.getHeight();
+    },
     watch:{
       proMaterListId:function (newData, oldData) {
         //newData是更新后的数据
@@ -107,6 +116,9 @@
       }
     },
     methods: {
+      getHeight(){
+        this.conheight.height=window.innerHeight-230+'px';
+      },
       callback(key) {
         this.tabKey = key
         console.log("=================",key,"===================")

src/views/modules/oss/OSSFileList.vue

@@ -102,7 +102,7 @@
               <a-divider type="vertical"/>
           <a @click="downloadFile(record.url)">下载</a>
               <a-divider type="vertical"/>
-          <a @click="ossDelete(record.id)" v-if="record.status == 1">删除</a>
+<!--          <a @click="ossDelete(record.id)" v-if="record.status == 1">删除</a>-->
         </span>
 
       </a-table>