diff --git a/src/assets/images/icon/arrow.png b/src/assets/images/icon/arrow.png new file mode 100644 index 0000000..b6fbf2b Binary files /dev/null and b/src/assets/images/icon/arrow.png differ diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 29c8bfe..4f740d7 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -687,20 +687,6 @@ background-color: #011E4F !important; } -.el-tag.el-tag--info { - margin: 0 0 0 8px; - height: 20px; - line-height: 20px; - font-size: 12px; - background-color: #E8F2FF; - border: none; - color: #0348F3; -} - -.el-tag.el-tag--info .el-tag__close { - background-color: #0348F3; -} - //出入库 .dpflex { display: flex; diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 25b3bcd..184752e 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -868,6 +868,7 @@ padding: 20px 0; } } + @mixin elTag-style{ [data-theme="dark"] & { border: 1px solid $mainColor; @@ -880,6 +881,17 @@ } } +@mixin select-elTag-style{ + [data-theme="dark"] & { + color: #fff; + background-color: #02255f; + } + [data-theme="light"] & { + color: #0348F3; + background-color: #EEF5FE; + } +} + @mixin prepend-input{ [data-theme="dark"] & { border: 1px solid $mainColor; diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 72ff41f..6c4915c 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -138,6 +138,15 @@ } } } + .el-select{ + margin-right: 10px; + .el-input__inner{ + height: 30px !important; + line-height: 30px !important; + background-color: transparent; + @include pagination-input; + } + } } .el-tabs{ @@ -1503,6 +1512,20 @@ input[type ='number'] { color: #f65163; } + +.el-tag.el-tag--info { + margin: 0 0 0 8px; + height: 20px; + line-height: 20px; + font-size: 12px; + border: none; + @include select-elTag-style; +} + +.el-tag.el-tag--info .el-tag__close { + @include select-elTag-style; +} + // table 选中状态 .el-table__body .rowStyle>td { color: #fff !important; diff --git a/src/views/system/processManage/index.vue b/src/views/system/processManage/index.vue index 8e37042..c9efe16 100644 --- a/src/views/system/processManage/index.vue +++ b/src/views/system/processManage/index.vue @@ -59,7 +59,10 @@ export default { diff --git a/src/views/system/processManage/modelDesign/index.vue b/src/views/system/processManage/modelDesign/index.vue index b64ba60..4f9f803 100644 --- a/src/views/system/processManage/modelDesign/index.vue +++ b/src/views/system/processManage/modelDesign/index.vue @@ -1,5 +1,14 @@ - 模型设计 + 模型设计 + + + diff --git a/src/views/system/processManage/runningProcess/index.vue b/src/views/system/processManage/runningProcess/index.vue index 70ceeab..248ac1f 100644 --- a/src/views/system/processManage/runningProcess/index.vue +++ b/src/views/system/processManage/runningProcess/index.vue @@ -1,9 +1,98 @@ - 运行中流程 + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.createTime | parseTime }} + + + + + + + - diff --git a/src/views/system/processManage/runningProcess/module/approvalList/index.vue b/src/views/system/processManage/runningProcess/module/approvalList/index.vue new file mode 100644 index 0000000..f77a826 --- /dev/null +++ b/src/views/system/processManage/runningProcess/module/approvalList/index.vue @@ -0,0 +1,52 @@ + + + + + + + + + + + diff --git a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue new file mode 100644 index 0000000..f77a826 --- /dev/null +++ b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue @@ -0,0 +1,52 @@ + + + + + + + + + + + diff --git a/src/views/system/processManage/runningProcess/module/detail.vue b/src/views/system/processManage/runningProcess/module/detail.vue new file mode 100644 index 0000000..1d71e4f --- /dev/null +++ b/src/views/system/processManage/runningProcess/module/detail.vue @@ -0,0 +1,172 @@ + + + + + 流程名称:01-归档审批流程 + 启动时间:2016-09-21 08:50:08 + 实例ID:9af7f46a-ea52- 4aa3-b8c3-9fd484c2af12 + 发起人:admin + + + + + + 业务详情 + + 业务类型:归档审批 + 原始位置:全宗A-整理库-门类A + 目标位置:全宗A-整理库-门类A + 赋权类型:- + 起始时间:- + 终止时间:- + 利用目的:- + 业务状态:已完成 + 审批状态:通过 + + + + + + 流程示意图 + 业务详情 + 任务列表 + 审批列表 + + + + + + + + + + + diff --git a/src/views/system/processManage/runningProcess/module/processImg/index.vue b/src/views/system/processManage/runningProcess/module/processImg/index.vue new file mode 100644 index 0000000..b3f398a --- /dev/null +++ b/src/views/system/processManage/runningProcess/module/processImg/index.vue @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/views/system/processManage/runningProcess/module/taskList/index.vue b/src/views/system/processManage/runningProcess/module/taskList/index.vue new file mode 100644 index 0000000..f77a826 --- /dev/null +++ b/src/views/system/processManage/runningProcess/module/taskList/index.vue @@ -0,0 +1,52 @@ + + + + + + + + + + +
流程名称:01-归档审批流程
启动时间:2016-09-21 08:50:08
实例ID:9af7f46a-ea52- 4aa3-b8c3-9fd484c2af12
发起人:admin
业务类型:归档审批
原始位置:全宗A-整理库-门类A
目标位置:全宗A-整理库-门类A
赋权类型:-
起始时间:-
终止时间:-
利用目的:-
业务状态:已完成
审批状态:通过