refactor: adjust some status processing

src/api/base.js

@@ -80,10 +80,13 @@ export function addUser (data) {
   return data
 }
 
-export function canDel ({ createBy, org }) {
+export function canDel ({ status, org, createBy }) {
   if (store.getters.isSuperAdmin) {
     return true
   }
+  if (status === State.SUBMITTED) {
+    return false
+  }
   if (store.getters.isGroupAdmin) {
     if (store.getters.isTopGroupAdmin) {
       return true

src/components/Schedule/mixins/event.js

@@ -78,7 +78,7 @@ export default {
       if (!event) {
         return
       }
-      console.log(event)
+      console.log('event', event)
       if (this.$eventProxy && this.getEventUnique(this.$eventProxy.origin) === this.getEventUnique(event)) {
         done()
         this.dirty = true

src/constant.js

@@ -101,7 +101,6 @@ export const RoleAccess = {
   ],
   [Role.SUPERVISOR]: [
     Access.MANAGE_DEVICE,
-    Access.VIEW_CALENDAR,
     Access.MANAGE_GROUP,
     Access.VIEW_LOGS
   ],

src/router/index.js

@@ -70,14 +70,14 @@ export const asyncRoutes = [
         name: 'media',
         path: 'media',
         component: () => import('@/views/platform/media/index'),
-        access: [Access.VIEW_CALENDAR, Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
+        access: [Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
         meta: { title: '媒资管理' }
       },
       {
         name: 'program-list',
         path: 'program',
         component: () => import('@/views/bigscreen/index'),
-        access: [Access.VIEW_CALENDAR, Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
+        access: [Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
         meta: { title: '节目管理' }
       },
       {
@@ -89,7 +89,7 @@ export const asyncRoutes = [
             name: 'recur-list',
             path: '',
             component: () => import('@/views/schedule/index'),
-            access: [Access.VIEW_CALENDAR, Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
+            access: [Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
             meta: { cache: 'ScheduleList' },
             props: { type: ScheduleType.RECUR, redirect: 'recur-design' }
           },
@@ -113,7 +113,7 @@ export const asyncRoutes = [
             name: 'schedule-list',
             path: '',
             component: () => import('@/views/schedule/index'),
-            access: [Access.VIEW_CALENDAR, Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
+            access: [Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
             meta: { cache: 'ScheduleList' },
             props: {
               type: ScheduleType.COMPLEX,

src/views/bigscreen/ProgramDesigner.vue

@@ -44,13 +44,13 @@
           :program="item"
         >
           <div
-            v-if="item.status === 0"
+            v-if="item.status !== 1 && item.status !== 2"
             @click="onSubmit(item)"
           >
             提交
           </div>
           <div
-            v-else
+            v-if="item.status === 1 || item.status === 2"
             @click="onCopy(item)"
           >
             复制

src/views/schedule/ScheduleDesigner.vue

@@ -100,10 +100,10 @@ export default {
   data () {
     return {
       invokes: [
-        { label: '编辑', render ({ status }) { return status === State.READY }, on: this.onDesign },
-        { label: '提交', render ({ status }) { return status === State.READY }, on: this.onSubmit },
-        { label: '查看', render ({ status }) { return status !== State.READY }, on: this.onView },
-        { label: '复制', render ({ status }) { return status !== State.READY }, on: this.onCopy },
+        { label: '编辑', render ({ status }) { return status !== State.SUBMITTED && status !== State.RESOLVED }, on: this.onDesign },
+        { label: '提交', render ({ status }) { return status !== State.SUBMITTED && status !== State.RESOLVED }, on: this.onSubmit },
+        { label: '查看', render ({ status }) { return status === State.SUBMITTED || status === State.RESOLVED }, on: this.onView },
+        { label: '复制', render ({ status }) { return status === State.SUBMITTED || status === State.RESOLVED }, on: this.onCopy },
         { label: '删除', render ({ del }) { return del }, on: this.onDel }
       ],
       active: `${this.status}`,
@@ -121,9 +121,7 @@ export default {
     }
   },
   activated () {
-    if (this.$route.params.refresh) {
-      this.$refs.table.resetCondition({ status: State.READY })
-    }
+    this.$refs.table.pageTo(1)
   },
   methods: {
     onTabClick ({ name: active }) {

src/views/schedule/designer/index.vue

@@ -32,8 +32,7 @@ export default {
     onSubmit () {
       if (this.redirect) {
         this.$router.replace({
-          name: this.redirect,
-          params: { refresh: true }
+          name: this.redirect
         })
       }
     }

src/views/schedule/mixin.js

@@ -33,12 +33,6 @@ export default {
         cols: [
           { prop: 'name', label: '名称', 'min-width': 120 },
           { prop: 'resolutionRatio', label: '分辨率' },
-          { label: '审核状态', type: 'tag', render ({ status }) {
-            return {
-              type: [void 0, 'warning', 'success'][status],
-              label: ['待提交', '未审核', '已审核'][status]
-            }
-          } },
           { prop: 'createTime', label: '创建时间', 'min-width': 90 },
           { type: 'invoke', width: 160, render: this.invokes }
         ]