Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -190,7 +190,7 @@
               </div>
             </div>
             <div>
-              <span class="openGroup opbd" @click="goToOpenTravel('TravelManager6',item)">
+              <span class="openGroup opbd" @click="goToOpenTravel(item)">
                 <el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
@@ -557,7 +557,15 @@
         });
       },
       //开团或修改
-      goToOpenTravel(path, item) {
+      goToOpenTravel(item) {
+        var routeName = this.$route.name;
+        var path='';
+        if (routeName == 'newQuotation') {
+          path='TravelManager6'
+        }
+        if (routeName == 'newQuotation2') {
+          path='TravelManager5'
+        }
         if (item.ID > 0) {
           this.$router.push({
             name: path,

src/router/config.js

@@ -283,6 +283,14 @@ export default {
                                 title: '城市管理'
                             },
                         },
+                        {
+                            path: '/scmAccountManagement', //供应商账号管理
+                            name: 'scmAccountManagement',
+                            component: resolve => require(['@/components/platformModule/scmAccountManagement'], resolve),
+                            meta: {
+                                title: '供应商账号管理'
+                            },
+                        },
                         {
                             path: '/companyManagement', //公司管理
                             name: 'companyManagement',
@@ -2404,6 +2412,15 @@ export default {
                                 title: '报价单'
                             },
                         },
+                        //销售-自主开团报价单
+                        {
+                            path: '/newQuotation2',
+                            name: 'newQuotation2',
+                            component: resolve => require(['@/components/TravelManager/TravelNewQuotation/newQuotation'], resolve),
+                            meta: {
+                                title: '报价单'
+                            },
+                        },
                         { // 销售 任务管理
                             path: '/saleTaskManagement',
                             name: 'saleTaskManagement',