refactor: routes

src/router/index.js

@@ -126,10 +126,7 @@ export const asyncRoutes = [
             path: ':id',
             component: () => import('@/views/schedule/designer/index'),
             access: Access.MANAGE_CALENDAR,
-            meta: {
-              title: '编辑',
-              cache: 'ScheduleList'
-            },
+            meta: { title: '编辑', cache: 'ScheduleList' },
             props: {
               redirect: 'schedule-list'
             }
@@ -145,25 +142,37 @@ export const asyncRoutes = [
       },
       {
         path: 'review',
+        component: () => import('@/views/review/index'),
+        access: Access.MANAGE_GROUP,
+        meta: { title: '审核管理' }
+      },
+      {
+        path: 'workflow',
         component: Solo,
         access: Access.MANAGE_GROUP,
-        meta: { title: '审核管理' },
+        meta: { title: '流程审核' },
         children: [
           {
-            name: 'review-list',
+            name: 'workflow-list',
             path: '',
-            component: () => import('@/views/review/index'),
-            meta: { cache: 'Review' }
+            component: () => import('@/views/review/workflow/index'),
+            meta: { cache: 'WorkflowList' }
           },
           {
             hidden: true,
-            name: 'review-detail',
+            name: 'workflow-detail',
             path: ':id',
-            component: () => import('@/views/review/detail/index'),
-            meta: { title: '审核', cache: 'Review' }
+            component: () => import('@/views/review/workflow/detail/index'),
+            meta: { title: '审核', cache: 'WorkflowList' }
           }
         ]
       },
+      {
+        path: 'mine',
+        component: () => import('@/views/review/workflow/mine/index'),
+        access: Access.MANAGE_CALENDAR,
+        meta: { title: '我的流程' }
+      },
       {
         name: 'schedule-deploy-history',
         path: 'history',

src/views/review/index.vue

@@ -29,14 +29,6 @@
         label="发布审核"
         name="ReviewPublish"
       />
-      <el-tab-pane
-        label="流程审批"
-        name="ReviewWorkflow"
-      />
-      <el-tab-pane
-        label="我的流程"
-        name="MyWorkflow"
-      />
     </el-tabs>
     <component
       :is="active"
@@ -90,8 +82,6 @@ import ReviewProgram from './components/ReviewProgram'
 import ReviewProgramRecur from './components/ReviewProgramRecur'
 import ReviewSchedule from './components/ReviewSchedule'
 import ReviewPublish from './components/ReviewPublish'
-import ReviewWorkflow from './components/ReviewWorkflow'
-import MyWorkflow from './components/MyWorkflow'
 
 export default {
   name: 'Review',
@@ -100,9 +90,7 @@ export default {
     ReviewProgram,
     ReviewProgramRecur,
     ReviewSchedule,
-    ReviewPublish,
-    ReviewWorkflow,
-    MyWorkflow
+    ReviewPublish
   },
   data () {
     return {

src/views/review/detail/index.vue → src/views/review/workflow/detail/index.vue

@@ -12,7 +12,7 @@
       @click="getPublishWorkflowDetail"
     />
     <div v-if="dataMap.length">
-      <div class="l-flex--row has-padding o-title">{{ title }}</div>
+      <div class="l-flex--row o-title has-bottom-padding u-color--black u-bold">{{ title }}</div>
       <div class="l-flex--row has-padding">
         <el-steps
           :active="active"
@@ -119,7 +119,7 @@
 </template>
 
 <script>
-import ReviewDialog from '../components/ReviewDialog'
+import ReviewDialog from './components/ReviewDialog'
 import {
   getPublishWorkflowDetail,
   calendarPublishReject
@@ -182,12 +182,12 @@ const allDataMap = [
   'programCalendar',
   'calendarReleaseScheduling'
 ]
+
 export default {
   name: 'ReviewDetail',
   components: {
     ReviewDialog
   },
-  props: {},
   data () {
     return {
       error: false,
@@ -249,7 +249,6 @@ export default {
               { prop: 'duration', label: '时长' },
               { prop: 'size', label: '文件大小' },
               { prop: 'createBy', label: '申请人' },
-              { prop: 'createTime', label: '提交时间', 'min-width': 100 },
               { prop: 'ai', label: 'AI审核', type: 'tag', width: 100 },
               {
                 label: '审核状态',
@@ -278,7 +277,6 @@ export default {
               { prop: 'name', label: '节目名称', 'min-width': 100 },
               { prop: 'resolutionRatio', label: '分辨率' },
               { prop: 'createBy', label: '申请人' },
-              { prop: 'createTime', label: '提交时间' },
               {
                 label: '审核状态',
                 type: 'tag',
@@ -325,7 +323,6 @@ export default {
               { prop: 'name', label: '排期名称', 'min-width': 100 },
               { prop: 'resolutionRatio', label: '分辨率' },
               { prop: 'createBy', label: '申请人' },
-              { prop: 'createTime', label: '提交时间' },
               {
                 label: '审核状态',
                 type: 'tag',
@@ -386,7 +383,6 @@ export default {
               { prop: 'name', label: '名称', 'min-width': 100 },
               { prop: 'resolutionRatio', label: '分辨率' },
               { prop: 'createBy', label: '申请人' },
-              { prop: 'createTime', label: '提交时间' },
               {
                 type: 'invoke',
                 width: 160,
@@ -778,6 +774,7 @@ export default {
   }
 }
 </script>
+
 <style lang="scss" scoped>
 .o-card {
   display: flex;
@@ -805,8 +802,6 @@ export default {
 }
 .o-title {
   font-size: 18px;
-  font-weight: bold;
-  color: #333333;
 }
 .fl-end {
   justify-content: flex-end;

src/views/review/components/ReviewWorkflow.vue → src/views/review/workflow/index.vue

@@ -1,18 +1,28 @@
 <template>
-  <schema-table
-    ref="table"
-    :schema="schema"
-    @row-click="onToggle"
-  />
+  <wrapper
+    fill
+    margin
+    padding
+    background
+  >
+    <schema-table
+      ref="table"
+      :schema="schema"
+      @row-click="onToggle"
+    />
+  </wrapper>
 </template>
 
 <script>
 import { getPublishWorkflows } from '@/api/workflow'
 import {
-  PublishType, EventPriority
+  PublishType,
+  EventPriority
 } from '@/constant'
 import { getEventDescription } from '@/utils/event'
+
 export default {
+  name: 'WorkflowList',
   data () {
     return {
       schema: {
@@ -147,7 +157,7 @@ export default {
     },
     review (item) {
       this.$router.push({
-        name: 'review-detail',
+        name: 'workflow-detail',
         params: {
           id: item.workflowId,
           name: item.name
@@ -157,5 +167,3 @@ export default {
   }
 }
 </script>
-
-<style></style>

src/views/review/components/MyWorkflow.vue → src/views/review/workflow/mine/index.vue

@@ -1,5 +1,10 @@
 <template>
-  <div>
+  <wrapper
+    fill
+    margin
+    padding
+    background
+  >
     <el-tabs
       :value="active"
       class="c-tabs has-bottom-padding"
@@ -25,18 +30,20 @@
       @row-click="onToggle"
     />
     <schedule-dialog ref="scheduleDialog" />
-  </div>
-
+  </wrapper>
 </template>
 
 <script>
 import {
-  getPublishWorkflows, calendarPublishRestart
+  getPublishWorkflows,
+  calendarPublishRestart
 } from '@/api/workflow'
 import {
-  PublishType, EventPriority
+  PublishType,
+  EventPriority
 } from '@/constant'
 import { getEventDescription } from '@/utils/event'
+
 export default {
   name: 'MyWorkflow',
   data () {
@@ -44,9 +51,6 @@ export default {
       active: '1',
       schema: {
         condition: { self: true, status: 1, name: '' },
-        // filters: [
-        //   { key: 'name', type: 'search', placeholder: '名称' }
-        // ],
         list: getPublishWorkflows,
         transform: this.transform,
         cols: [
@@ -69,7 +73,6 @@ export default {
           { prop: 'type', label: '类型', width: 100 },
           { prop: 'name', label: '名称', 'min-width': 100 },
           { prop: 'resolutionRatio', label: '分辨率' },
-          { prop: 'createBy', label: '申请人' },
           { prop: 'createTime', label: '提交时间' },
           {
             label: '审核状态',
@@ -83,7 +86,7 @@ export default {
           },
           {
             type: 'invoke',
-            width: 160,
+            width: 120,
             render: [
               { label: '查看', on: this.onView },
               { label: '提交', render ({ status }) {
@@ -178,21 +181,7 @@ export default {
       this.$refs.scheduleDialog.show(id)
     },
     viewProgram (id) {
-      window.open(
-        this.$router.resolve({
-          name: 'program',
-          params: { id }
-        }).href,
-        '_blank'
-      )
-    },
-    review (item) {
-      this.$router.push({
-        name: 'review-detail',
-        params: {
-          id: item.workflowId
-        }
-      })
+      this.$viewProgram(id)
     },
     restart (item) {
       calendarPublishRestart(item.workflowId, item.name).then(() => {
@@ -202,5 +191,3 @@ export default {
   }
 }
 </script>
-
-<style></style>