Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -25,7 +25,15 @@ export const constantRoutes = [
     component: () => import('@/views/error-page/404'),
     component: () => import('@/views/error-page/404'),
     hidden: true
     hidden: true
   },
   },
-  { path: '*', redirect: '/404', hidden: true }
+  { path: '*', redirect: '/404', hidden: true },
+  // 详情
+  {
+    path: '/fqsq',
+    component: () => import('@/views/ywbl/fqsq/fqsq.vue'),
+    name: 'fqsq',
+    hidden: true,
+    meta: { title: '发起申请' }
+  }
 ]
 ]
 
 
 /**
 /**
@@ -81,15 +89,6 @@ export const asyncRoutes = [
         name: 'ybx',
         name: 'ybx',
         meta: { title: '已办箱' }
         meta: { title: '已办箱' }
       },
       },
-      {
-        path: 'fqsq',
-        id: '24',
-        parentId: '2',
-        component: () => import('@/views/ywbl/fqsq/fqsq.vue'),
-        name: 'fqsq',
-        hidden: true,
-        meta: { title: '发起申请' }
-      }
     ]
     ]
   },
   },
   {
   {

@@ -2,13 +2,14 @@
   <div class='fqsq'>
   <div class='fqsq'>
     <div class="fqsq-header">
     <div class="fqsq-header">
       <ul>
       <ul>
-        <li v-for="(item, index) in headerleftList.slice(0, headerleftList.length - 3)" :key="index">
+        <li @click="operation(index)" v-for="(item, index) in headerleftList.slice(0, headerleftList.length - 4)"
+          :key="index">
           <svg-icon :icon-class="item.icon" />
           <svg-icon :icon-class="item.icon" />
           {{ item.name }}
           {{ item.name }}
         </li>
         </li>
       </ul>
       </ul>
       <ul>
       <ul>
-        <li v-for="(item, index) in headerleftList.slice(-3)" :key="index">
+        <li @click="operation(index)" v-for="(item, index) in headerleftList.slice(-4)" :key="index">
           <svg-icon :icon-class="item.icon" />
           <svg-icon :icon-class="item.icon" />
           {{ item.name }}
           {{ item.name }}
         </li>
         </li>
@@ -68,6 +69,10 @@ export default {
         {
         {
           name: '转出',
           name: '转出',
           icon: ''
           icon: ''
+        },
+        {
+          name: '退出',
+          icon: ''
         }
         }
       ],
       ],
       activeName: '1',
       activeName: '1',
@@ -101,6 +106,11 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    operation (index) {
+      if (index == 3) {
+        window.close()
+      }
+    },
     loadView (view) {
     loadView (view) {
       return r => require.ensure([], () => r(require(`./components/${view}.vue`)))
       return r => require.ensure([], () => r(require(`./components/${view}.vue`)))
     },
     },
@@ -121,6 +131,8 @@ export default {
 .fqsq {
 .fqsq {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
+  padding: 0 10%;
+  box-sizing: border-box;
   background-color: #ffffff;
   background-color: #ffffff;
 
 
   &-header {
   &-header {
@@ -129,7 +141,6 @@ export default {
     height: 64px;
     height: 64px;
     background-color: #10CCB8;
     background-color: #10CCB8;
     color: #ffffff;
     color: #ffffff;
-    border-radius: 4px;
     justify-content: space-between;
     justify-content: space-between;
     padding-left: 15px;
     padding-left: 15px;
 
 

@@ -95,7 +95,8 @@ export default {
   methods: {
   methods: {
     submitForm () {
     submitForm () {
       this.$emit('input', false)
       this.$emit('input', false)
-      this.$router.push({ name: 'fqsq', query: { id: '1' } })
+      const { href } = this.$router.resolve('/fqsq')
+      window.open(href, '_blank');
     },
     },
     closeDialog () {
     closeDialog () {
       this.$emit('input', false)
       this.$emit('input', false)