gjy 2 years ago
parent
commit
4f5e50f034

+ 0 - 14
src/components/syClick.vue

@@ -23,23 +23,9 @@
         },
         data() {
             return {
-                // list:[{title:'1111111111'},{title:'22222222222'},{title:'333333'}],
-				left: 0,
-				clickHeight:50,
-				downIcon: true,
             }
         },
         methods: {
-			UnNavClick(){
-				this.downIcon = !this.downIcon;
-				this.clickHeight = 100
-			},
-            // 关闭所有的标签
-			CloseNavClick(){
-				this.downIcon = !this.downIcon;
-				this.clickHeight = 50
-                // this.$emit('removeAll')
-			},
             
             // 删除标签页
             removeTag(index) {

+ 1 - 2
src/permission.js

@@ -21,7 +21,6 @@ router.beforeEach(async (to, _, next) => {
   console.log(hasToken)
   if (hasToken) {
     if (whiteList.includes(to.path)) {
-      console.log(222222222222222)
       next({
         path: '/'
       });
@@ -70,7 +69,7 @@ router.beforeEach(async (to, _, next) => {
         }
         next();
       } else {
-        console.log(22222)
+
         if (!whiteList.includes(to.path)) {
           checkLoginUser();
         }

+ 4 - 4
src/styles/media.scss

@@ -55,7 +55,7 @@
   .winseaview-main {
     width: calc(100% - 60px);
     left: 60px;
-    height: calc(100% - 40px);
+    height: calc(100% - 100px);
   }
 }
 
@@ -71,7 +71,7 @@
   left: 200px;
   padding: 0;
   width: calc(100% - 200px);
-  height: calc(100% - 40px);
+  height: calc(100% - 100px);
   box-sizing: border-box;
   .el-tabs__item {
     color: #999999;
@@ -167,7 +167,7 @@
   .winseaview-main {
     left: 0;
     width: 100%;
-    height: calc(100% - 40px);
+    height: calc(100% - 100px);
   }
   .winseaview-header {
     // margin-bottom: 15px;
@@ -185,7 +185,7 @@
     .winseaview-main {
       left: $width;
       width: 100%;
-      height: calc(100% - 40px);
+      height: calc(100% - 100px);
     }
     .winseaview-header {
       padding: 0;

+ 0 - 1
src/views/profitable/expensemanagementdetails.vue

@@ -113,7 +113,6 @@
               <div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style='display:inline-block;'>
                 <el-button v-if='scope.row.status=="待确认"&&scope.row.expensesType==1' @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
               </div>
-              
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
               <el-button v-if='scope.row.expensesPurpose==1&&scope.row.status=="已收款"&&!scope.row.approveStatus||scope.row.expensesPurpose==1&&scope.row.status=="已付款"&&!scope.row.approveStatus' @click="accomplish(scope.row)" type="primary">完成</el-button>
               <el-button  v-if='scope.row.status=="已驳回"' @click="edit(scope.row)" type="primary">编辑</el-button>