提交

src/permission.js

@@ -57,8 +57,8 @@ router.beforeEach((to, from, next) => {
         if (whiteList.includes(to.name)) {
             next()
         } else {
-            //next({ path: '/user/login', query: { redirect: to.fullPath } });
-            next({path: '/user/login'});
+            next({ path: '/user/login', query: { redirect: to.fullPath } });
+            // next({path: '/user/login'});
             NProgress.done()
         }
     }

src/views/modules/knowledge/warehouse/knowledgeAddUpdate.vue

@@ -201,7 +201,7 @@ export default {
   },
   data() {
     return {
-      loading:false,
+      loading: false,
       api,
       classApi,
       saveLoading: false,
@@ -261,7 +261,7 @@ export default {
         },
         {
           title: '审批人',
-          dataIndex: 'approverName',
+          dataIndex: 'approverAndActualName',
         },
         {
           title: '审批状态',
@@ -438,7 +438,7 @@ export default {
           return {
             name: item.name,
             approverId: item.approverId,
-            approverName: item.approverName,
+            approverAndActualName: item.approverAndActualName,
             isFinal: item.isFinal
           }
         })
@@ -512,6 +512,7 @@ export default {
       } else {
         // 从知识管理跳进
         this.saveLoading = true
+
         if(this.type == 'knowledgeManageList') {
           this.$refs.knowledgeRef.validate(valid => {
           if (valid) {
@@ -542,7 +543,6 @@ export default {
           })
         }
       }
-      this.saveLoading = false
     },
     transCheckedTarget(arg) {
       this.checkedTarget = arg