end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

工作流界面优化

master
陈裕财 5 years ago
parent
2eb0aaf0c5
commit
94316b30a7
13 changed files with 46 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/styles/mdp.scss
  2. 4
      src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
  3. 4
      src/views/mdp/workflow/de/model/ModelMng.vue
  4. 8
      src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
  5. 4
      src/views/mdp/workflow/re/deployment/DeploymentMng.vue
  6. 8
      src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
  7. 8
      src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
  8. 6
      src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
  9. 2
      src/views/mdp/workflow/re/procdef/ProcdefMng.vue
  10. 4
      src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
  11. 8
      src/views/mdp/workflow/ru/execution/ExecutionMng.vue
  12. 33
      src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
  13. 4
      src/views/mdp/workflow/ru/task/TaskMng.vue

4
src/styles/mdp.scss
View File

@ -88,8 +88,8 @@
align-items: center; align-items: center;
overflow-x: hidden; overflow-x: hidden;
} }
.page-header{
overflow: auto;
.page-header{
overflow: auto;
} }
.page-main{ .page-main{
overflow: auto; overflow: auto;

4
src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<section> <section>
<el-row class="page-container border">
<el-row class="page-container border padding">
<el-row class="page-header"> <el-row class="page-header">
<el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询"> <el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询">
<template slot="append"> <template slot="append">
@ -10,7 +10,7 @@
<el-button @click="showAdd" icon="el-icon-plus" style="margin-left: 13px;">业务模块</el-button> <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-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>
<el-row class="page-main">
<el-row class="page-main padding-top">
<!--列表 BizModel mdp_biz_model--> <!--列表 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 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> <el-table-column sortable type="selection" width="40"></el-table-column>

4
src/views/mdp/workflow/de/model/ModelMng.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<section> <section>
<el-row class="page-container border">
<el-row class="page-container border padding">
<el-row class="page-header"> <el-row class="page-header">
<el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询"> <el-input v-model="filters.key" style="width:270px;" placeholder="模糊查询">
<template slot="append"> <template slot="append">
@ -12,7 +12,7 @@
icon="el-icon-download" icon="el-icon-download"
>导出数据</el-button> >导出数据</el-button>
</el-row> </el-row>
<el-row class="page-main">
<el-row class="page-main padding-top">
<!--列表 Model act_de_model--> <!--列表 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 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> <el-table-column type="index" width="40"></el-table-column>

8
src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<section>
<el-row class="page-container border">
<section >
<el-row class="page-container padding">
<!--列表 Procinst act_hi_procinst--> <!--列表 Procinst act_hi_procinst-->
<el-row class="page-header"> <el-row class="page-header">
<el-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-lg-and-down"> <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" unlink-panels range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions"> :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
</el-date-picker> </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 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-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"> <el-drawer title="更多查询条件" :visible.sync="moreFilterVisible" append-to-body :size="400">
@ -104,7 +104,7 @@
</el-row> </el-row>
</el-drawer> </el-drawer>
</el-row> </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 <el-table ref="table" :height="tableHeight" :data="procinsts" highlight-current-row
v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" width="40"></el-table-column> <el-table-column type="selection" width="40"></el-table-column>

4
src/views/mdp/workflow/re/deployment/DeploymentMng.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<section> <section>
<el-row class="page-container border">
<el-row class="page-container border padding">
<el-row class="page-header"> <el-row class="page-header">
<el-select v-model="filters.category" clearable filterable placeholder="请选择分类"> <el-select v-model="filters.category" clearable filterable placeholder="请选择分类">
<el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option> <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
@ -12,7 +12,7 @@
</el-input> </el-input>
<el-button @click="handleDownload" icon="el-icon-download" style="">导出数据</el-button> <el-button @click="handleDownload" icon="el-icon-download" style="">导出数据</el-button>
</el-row> </el-row>
<el-row class="page-main">
<el-row class="page-main padding-top">
<!--列表 Deployment act_re_deployment--> <!--列表 Deployment act_re_deployment-->
<el-table <el-table
ref="table" :height="tableHeight" ref="table" :height="tableHeight"

8
src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
View File

@ -1,19 +1,19 @@
<template> <template>
<section> <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-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
<el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option> <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
</el-select> </el-select>
<el-input v-model="filters.key" placeholder="模糊查询">
<el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询">
</el-input> </el-input>
<el-button type="primary" v-on:click="searchProcdefs" icon="el-icon-search">查询</el-button> <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(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.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-button @click="handleDownload" icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
</el-row> </el-row>
<el-row class="page-main">
<el-row class="page-main padding-top">
<!--列表 Procdef act_re_procdef--> <!--列表 Procdef act_re_procdef-->
<el-table <el-table
ref="table" :height="tableHeight" ref="table" :height="tableHeight"

8
src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<section> <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 v-model="filters.key" style="width:270px;" placeholder="模糊查询">
</el-input> </el-input>
<el-button type="primary" v-loading="listLoading" :disabled="listLoading" v-on:click="searchProcdefs" <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 type="info" v-if="this.procdefs.length==0">如果没有找到流程，请将业务编码【{{this.filters.params.bizKey}}】与流程进行关联
</el-tag> </el-tag>
</el-row> </el-row>
<el-row class="page-main">
<el-row class="page-main padding-top">
<!--列表 Procdef act_re_procdef--> <!--列表 Procdef act_re_procdef-->
<el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row <el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row
v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
@ -347,7 +347,7 @@
} }
</style> </style>
<style>
<style scoped>
.el-input-group__append, .el-input-group__append,
.el-input-group__prepend { .el-input-group__prepend {
background-color: #409EFF !important; background-color: #409EFF !important;

6
src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<section> <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-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类">
<el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option> <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
</el-select> </el-select>
@ -23,7 +23,7 @@
v-on:check-change="handleCategoryCheckChange"></category-tree> v-on:check-change="handleCategoryCheckChange"></category-tree>
</el-drawer> </el-drawer>
</el-row> </el-row>
<el-row class="page-main">
<el-row class="page-main padding-top">
<!--列表 Procdef act_re_procdef--> <!--列表 Procdef act_re_procdef-->
<el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row <el-table ref="procdefsTable" :height="tableHeight" :data="procdefs" highlight-current-row
v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">

2
src/views/mdp/workflow/re/procdef/ProcdefMng.vue
View File

@ -17,7 +17,7 @@
<el-button @click.native="showTagSelect(false)" >标签查找</el-button> <el-button @click.native="showTagSelect(false)" >标签查找</el-button>
<el-button @click.native="showTagSelect(true)" >打标签</el-button> <el-button @click.native="showTagSelect(true)" >打标签</el-button>
</el-row> </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"> <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> <category-tree ref="categoryTree" multiple :expandOnClickNode="false" :defaultExpandAll="true" show-checkbox :current-key="addForm.categoryId" v-on:check-change="handleCategoryCheckChange" ></category-tree>
</el-col> </el-col>

4
src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<section> <section>
<el-row class="page-container border">
<el-row class="page-container border padding">
<el-row class="page-header" > <el-row class="page-header" >
<el-select v-model="filters.procCategory" clearable filterable placeholder="请选择分类"> <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-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-button @click="handleDownload" icon="el-icon-download" class="hidden-md-and-down">导出数据</el-button>
</el-row> </el-row>
<!--列表 Procdef act_re_procdef--> <!--列表 Procdef act_re_procdef-->
<el-row class="page-main">
<el-row class="page-main padding-top">
<el-table <el-table
ref="table" :height="tableHeight" ref="table" :height="tableHeight"
:data="procdefs" :data="procdefs"

8
src/views/mdp/workflow/ru/execution/ExecutionMng.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<section> <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-select v-model="filters.filterType" clearable placeholder="查询范围" class="hidden-md-and-down">
<el-option value="" label="全部"> </el-option> <el-option value="" label="全部"> </el-option>
<el-option value="startUserId" 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" unlink-panels range-separator="-" start-placeholder="创建日期" end-placeholder="创建日期" value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions"> :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
<el-input v-model="filters.key" placeholder="模糊查询">
<el-input v-model="filters.key" style="width:20%;" placeholder="模糊查询">
</el-input> </el-input>
<el-button type="primary" v-on:click="searchExecutions" icon="el-icon-search">查询</el-button> <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> <el-button @click="moreFilterVisible=true" icon="el-icon-more" circle></el-button>
@ -126,7 +126,7 @@
</el-drawer> </el-drawer>
</el-row> </el-row>
<!--列表 Execution act_ru_execution--> <!--列表 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 <el-table ref="table" :height="tableHeight" :data="executions" highlight-current-row
v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> v-loading="listLoading" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" width="40"></el-table-column> <el-table-column type="selection" width="40"></el-table-column>

33
src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<section class="page-container page-full-height padding">
<section class="page-container padding">
<el-row class="page-header"> <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 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> <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-row style="padding-top:10px;">
<el-col :span="24" class="wf-sub-sub-title"> <el-col :span="24" class="wf-sub-sub-title">
<font v-if="addForm.tagNames" > <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'" :type="'warning'"
:disable-transitions="false" > :disable-transitions="false" >
{{tag}} {{tag}}
</el-tag> </el-tag>
</font> </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-col>
</el-row> </el-row>
</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"> <el-row v-show="showMainContextOnly==true">
<div style="padding: 20px;" v-html="addForm.mainContext"></div> <div style="padding: 20px;" v-html="addForm.mainContext"></div>
</el-row> </el-row>
@ -243,7 +243,7 @@
</el-dialog> </el-dialog>
</el-row> </el-row>
</el-row> </el-row>
<el-row class="page-bottom">
<el-row>
<el-button @click.native="handleCancel" icon="el-icon-back">取消</el-button> <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="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> <el-button v-if="isArchive" @click.native="handleArchive" icon="el-icon-s-grid">归档</el-button>
@ -1138,18 +1138,19 @@
<style scoped> <style scoped>
.wf-title { .wf-title {
text-align: center; text-align: center;
font-size:2.5em;
font-size:1.2em;
overflow-x:auto; overflow-x:auto;
overflow-y:auto; overflow-y:auto;
} }
.wf-sub-title { .wf-sub-title {
text-align: center; text-align: center;
font-size:1.5em;
font-size:1.1em;
overflow-x:auto; overflow-x:auto;
overflow-y:auto; overflow-y:auto;
} }
.wf-sub-sub-title{ .wf-sub-sub-title{
font-size:0.6em;
text-align: center; text-align: center;
} }
.wf-main-context-box { .wf-main-context-box {
@ -1168,17 +1169,11 @@
text-align:center; text-align:center;
float:left; float:left;
padding-top:5px; padding-top:5px;
}
.page-title{
height: calc(10vh);
overflow-x:auto;
overflow-y:auto;
}
.page-context{
height: calc(70vh);
overflow: auto;
}
}
.page-bottom{ .page-bottom{
height: calc(5vh); height: calc(5vh);
} }
.name-font{
color:lightseagreen;
}
</style> </style>

4
src/views/mdp/workflow/ru/task/TaskMng.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<section> <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-select v-model="filters.procCategory" clearable filterable placeholder="选择分类">
<el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option> <el-option v-for="item in categorys" :key="item" :label="item" :value="item"></el-option>
</el-select> </el-select>

Write Preview
Loading…
Cancel
Save