From 94316b30a74bcd60b77e91a3eaa2f388ea7802eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 16 Jul 2021 20:51:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/mdp.scss                           |  4 +--
 .../mdp/workflow/biz/bizModel/BizModelMng.vue |  4 +--
 src/views/mdp/workflow/de/model/ModelMng.vue  |  4 +--
 .../mdp/workflow/hi/procinst/ProcinstMng.vue  |  8 ++---
 .../workflow/re/deployment/DeploymentMng.vue  |  4 +--
 .../re/procdef/ProcdefListForParames.vue      |  8 ++---
 .../re/procdef/ProcdefListForSimpleStart.vue  |  8 ++---
 .../re/procdef/ProcdefListForStart.vue        |  6 ++--
 .../mdp/workflow/re/procdef/ProcdefMng.vue    |  2 +-
 .../workflow/re/procdef/ProcdefSuspend.vue    |  4 +--
 .../workflow/ru/execution/ExecutionMng.vue    |  8 ++---
 .../ProcinstParamesExecutionSet.vue           | 33 ++++++++-----------
 src/views/mdp/workflow/ru/task/TaskMng.vue    |  4 +--
 13 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 7993426f..c6ae1bb1 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -88,8 +88,8 @@
     align-items: center;
     overflow-x: hidden; 
   }
-  .page-header{ 
-    overflow: auto;
+  .page-header{   
+    overflow: auto; 
   }
   .page-main{  
     overflow: auto;
diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
index 6bfeca58..6027e9e9 100644
--- a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
+++ b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row class="page-container border">
+		<el-row class="page-container border padding">
 			<el-row class="page-header">
 				<el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询">
 					<template slot="append">
@@ -10,7 +10,7 @@
 				<el-button @click="showAdd" icon="el-icon-plus" style="margin-left: 13px;">业务模块</el-button>
 				<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete">批量删除</el-button>
 			</el-row>
-			<el-row class="page-main">
+			<el-row class="page-main padding-top">
 				<!--列表 BizModel mdp_biz_model-->
 				<el-table  ref="table" :height="tableHeight" :data="bizModels"  highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column sortable type="selection" width="40"></el-table-column>
diff --git a/src/views/mdp/workflow/de/model/ModelMng.vue b/src/views/mdp/workflow/de/model/ModelMng.vue
index dc79b89e..5171e32c 100644
--- a/src/views/mdp/workflow/de/model/ModelMng.vue
+++ b/src/views/mdp/workflow/de/model/ModelMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row  class="page-container border">
+		<el-row  class="page-container border padding">
 			<el-row class="page-header">
 				<el-input v-model="filters.key" style="width:270px;"  placeholder="模糊查询">
 					<template slot="append">
@@ -12,7 +12,7 @@
 					icon="el-icon-download"
 				>导出数据</el-button>
 			</el-row>
-			<el-row class="page-main">
+			<el-row class="page-main padding-top">
 				<!--列表 Model act_de_model-->
 				<el-table  ref="table" :height="tableHeight" :data="models"    highlight-current-row v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column type="index" width="40"></el-table-column>
diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
index 74fd920f..e29e2fc4 100644
--- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
+++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
@@ -1,6 +1,6 @@
 <template>
-  <section>
-    <el-row class="page-container border"> 
+  <section >
+    <el-row class="page-container padding"> 
         <!--列表 Procinst act_hi_procinst-->
         <el-row class="page-header">
           <el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-lg-and-down">
@@ -18,7 +18,7 @@
             unlink-panels range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
             :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
           </el-date-picker>
-          <el-input v-model="filters.key" placeholder="模糊查询">  </el-input>
+          <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询">  </el-input>
           <el-button type="primary" class="padding-left" v-on:click="searchProcinsts" icon="el-icon-search">查询</el-button>
           <el-button class="padding-left"  icon="el-icon-more" @click="moreFilterVisible=true" circle></el-button>
           <el-drawer title="更多查询条件" :visible.sync="moreFilterVisible"   append-to-body :size="400">
@@ -104,7 +104,7 @@
             </el-row>
           </el-drawer>
         </el-row>
-        <el-row class="page-main">
+        <el-row class="page-main padding-top">
           <el-table ref="table" :height="tableHeight" :data="procinsts" highlight-current-row
             v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
             <el-table-column type="selection" width="40"></el-table-column>
diff --git a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
index e3d54bc0..d75d74af 100644
--- a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
+++ b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue
@@ -1,6 +1,6 @@
 <template>
   <section>
-    <el-row class="page-container border">
+    <el-row class="page-container border padding">
       <el-row  class="page-header">
         <el-select v-model="filters.category" clearable filterable placeholder="请选择分类">
           <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
@@ -12,7 +12,7 @@
         </el-input>
         <el-button @click="handleDownload" icon="el-icon-download" style="">导出数据</el-button>
       </el-row>
-      <el-row class="page-main">
+      <el-row class="page-main padding-top">
         <!--列表 Deployment act_re_deployment-->
         <el-table
           ref="table" :height="tableHeight"
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
index 4a66be53..b5fe0f73 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
@@ -1,19 +1,19 @@
 <template>
   <section>
-    <el-row class="page-container border">
-          <el-row class="page-header">
+    <el-row class="page-container border padding">
+          <el-row>
             <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
               <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
             </el-select>
 
-            <el-input v-model="filters.key" placeholder="模糊查询">
+            <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询">
             </el-input>
             <el-button type="primary"   v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button>
             <el-button @click.native="showTagSelect(false)" icon="el-icon-search" style="margin-left: 13px;" class="hidden-sm-and-down">标签</el-button>
             <el-button @click.native="showTagSelect(true)" icon="el-icon-plus" class="hidden-sm-and-down">标签</el-button>
             <el-button @click="handleDownload" 	icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
           </el-row>
-          <el-row class="page-main">
+          <el-row class="page-main padding-top">
             <!--列表 Procdef act_re_procdef-->
             <el-table
               ref="table" :height="tableHeight"
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
index 0820cef1..faca8577 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
-    <el-row v-if="flowStartVisible==false" class="page-container border">
-      <el-row class="page-header">
+    <el-row v-if="flowStartVisible==false" class="page-container border padding">
+      <el-row>
         <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
         </el-input>
         <el-button type="primary" v-loading="listLoading" :disabled="listLoading" v-on:click="searchProcdefs"
@@ -9,7 +9,7 @@
         <el-tag type="info" v-if="this.procdefs.length==0">如果没有找到流程，请将业务编码【{{this.filters.params.bizKey}}】与流程进行关联
         </el-tag>
       </el-row>
-      <el-row class="page-main">
+      <el-row class="page-main padding-top">
         <!--列表 Procdef act_re_procdef-->
         <el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row
           v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
@@ -347,7 +347,7 @@
   }
 </style>
 
-<style>
+<style scoped>
   .el-input-group__append,
   .el-input-group__prepend {
     background-color: #409EFF !important;
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
index 6198f610..315442a0 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
-    <el-row class="page-container border">
-        <el-row class="page-header">
+    <el-row class="page-container border padding">
+        <el-row>
           <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
             <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
           </el-select>
@@ -23,7 +23,7 @@
               v-on:check-change="handleCategoryCheckChange"></category-tree>
           </el-drawer>
         </el-row>
-        <el-row class="page-main">
+        <el-row class="page-main padding-top">
           <!--列表 Procdef act_re_procdef-->
           <el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row
             v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
index 4c0c3260..df824f61 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue
@@ -17,7 +17,7 @@
 			<el-button   @click.native="showTagSelect(false)"  >标签查找</el-button>
 			<el-button   @click.native="showTagSelect(true)"  >打标签</el-button>
 	    </el-row> 
-		<el-row class="page-main">
+		<el-row class="page-main padding-top">
 			<el-col :xs="4" :sm="4" :md="4" :lg="4" :xl="4" class="hidden-sm-and-down">
 				<category-tree ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox  :current-key="addForm.categoryId"  v-on:check-change="handleCategoryCheckChange" ></category-tree> 
 			</el-col>
diff --git a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
index efc49704..47dda96a 100644
--- a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
+++ b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
@@ -1,6 +1,6 @@
 <template>
   <section>
-    <el-row class="page-container border"> 
+    <el-row class="page-container border padding"> 
           <el-row class="page-header" >
             <el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
               <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
@@ -15,7 +15,7 @@
             <el-button @click="handleDownload" icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
           </el-row>
           <!--列表 Procdef act_re_procdef-->
-          <el-row class="page-main">
+          <el-row class="page-main padding-top">
           <el-table
             ref="table" :height="tableHeight"
             :data="procdefs"
diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
index b0ac8442..06877c74 100644
--- a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
+++ b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
-    <el-row class="page-container">  
-        <el-row class="page-header">
+    <el-row class="page-container padding">  
+        <el-row class="page-header ">
           <el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-md-and-down">
             <el-option value="" label="全部"> </el-option>
             <el-option value="startUserId" label="我发起"> </el-option>
@@ -16,7 +16,7 @@
             unlink-panels range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
             :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
           </el-date-picker>
-          <el-input v-model="filters.key"  placeholder="模糊查询"> 
+          <el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询"> 
           </el-input>
           <el-button type="primary" v-on:click="searchExecutions"  icon="el-icon-search">查询</el-button>
            <el-button  @click="moreFilterVisible=true" icon="el-icon-more" circle></el-button>
@@ -126,7 +126,7 @@
           </el-drawer>
         </el-row>
         <!--列表 Execution act_ru_execution-->
-        <el-row v-if="showCalendar==false" class="page-main">
+        <el-row v-if="showCalendar==false" class="page-main padding-top">
           <el-table ref="table" :height="tableHeight" :data="executions" highlight-current-row
             v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
             <el-table-column type="selection" width="40"></el-table-column>
diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
index e2dfe58f..d3f31e59 100644
--- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
+++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container page-full-height padding">
+	<section class="page-container padding">
 		<el-row class="page-header">    
 				<el-button class="hidden-md-and-down"   type="text"  @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
 				<el-button   type="text"  v-if="screenWidth>=500"  @click.native="handlePrint" icon="el-icon-printer">打印</el-button>    
@@ -42,19 +42,19 @@
 			<el-row style="padding-top:10px;"> 
 				<el-col :span="24" class="wf-sub-sub-title">  
 					<font  v-if="addForm.tagNames" >
-					<el-tag v-for="tag in (addForm.tagNames.split(','))" :key="tag"
+					<el-tag  v-for="tag in (addForm.tagNames.split(','))" :key="tag"
 						:type="'warning'"
 						:disable-transitions="false" >
 						{{tag}}
 					</el-tag>
 					</font>
-					发起部门: {{addForm.startDeptName}} &nbsp;&nbsp;&nbsp;
-					由&nbsp;{{addForm.startUsername}}&nbsp;于&nbsp;
-					{{addForm.startDate}} &nbsp;发起
+					发起部门: <font class="name-font">{{addForm.startDeptName}} </font>&nbsp;&nbsp;&nbsp;
+					由&nbsp; <font class="name-font">{{addForm.startUsername}}</font>&nbsp;于&nbsp;
+					 <font class="name-font">{{addForm.startDate}}</font> &nbsp;发起
 					</el-col>   
 			</el-row> 
 		</el-row>
-		<el-row class="page-context" style="padding-top:10px;">
+		<el-row class="page-main page-height-75 padding-top">
 			<el-row v-show="showMainContextOnly==true">
 				<div style="padding: 20px;" v-html="addForm.mainContext"></div>
 			</el-row>
@@ -243,7 +243,7 @@
 				</el-dialog> 
 			</el-row>
 		</el-row>
-		<el-row class="page-bottom">  
+		<el-row>  
 			<el-button    @click.native="handleCancel" icon="el-icon-back">取消</el-button>  
 			<el-button   v-if="screenWidth>=500"  @click.native="handlePrint" icon="el-icon-printer">打印</el-button>    
 			<el-button   v-if="isArchive"  @click.native="handleArchive" icon="el-icon-s-grid">归档</el-button> 
@@ -1138,18 +1138,19 @@
 <style scoped> 
 .wf-title {
 	text-align: center; 
-	font-size:2.5em;  
+	font-size:1.2em;  
 	overflow-x:auto;
 	overflow-y:auto;
 	
 }
 .wf-sub-title {
 	text-align: center;  
-	font-size:1.5em;  
+	font-size:1.1em;  
 	overflow-x:auto;
 	overflow-y:auto;
 }  
 .wf-sub-sub-title{ 
+	font-size:0.6em;  
 	text-align: center;  
 }
  .wf-main-context-box {  
@@ -1168,17 +1169,11 @@
 	text-align:center;
 	float:left;
 	padding-top:5px;
-} 
-.page-title{
-	height: calc(10vh);
-	overflow-x:auto;
-	overflow-y:auto;
-}
-.page-context{
-	height: calc(70vh);
-	overflow: auto;
-}
+}  
 .page-bottom{
 	height: calc(5vh); 
 }
+.name-font{
+	color:lightseagreen;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue
index 039387d2..60010026 100644
--- a/src/views/mdp/workflow/ru/task/TaskMng.vue
+++ b/src/views/mdp/workflow/ru/task/TaskMng.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
-    <el-row class="page-container page-full-height">  
-        <el-row class="page-header"> 
+    <el-row class="page-container">  
+        <el-row class="page-header padding"> 
           <el-select v-model="filters.procCategory" clearable filterable placeholder="选择分类">
             <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
           </el-select>