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

src/components/SalesModule/groupTourOrder.vue

@@ -2394,7 +2394,7 @@
       //跳转至领取合同
       goContract(item){
         let routeData = this.$router.resolve({
-          name: 'TravelContract',
+          name: 'TravelContractNew',
           query: {
             TCID: item.tcid,
             orderID:item.orderId,

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -4937,7 +4937,7 @@
        //跳转至领取合同
       goContract(item){
         let routeData = this.$router.resolve({
-          name: 'TravelContract',
+          name: 'TravelContractNew',
           query: {
             TCID: item.tcid,
             orderID:item.orderId,

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -5262,7 +5262,7 @@
       goContract(item) {
         if (item.ContractNum) {
           let routeData = this.$router.resolve({
-            name: 'ElectronicContract',
+            name: 'TravelContractDetail',
             query: {
               TCID: item.TCID,
               orderID: item.OrderId,
@@ -5272,7 +5272,7 @@
           window.open(routeData.href, '_blank')
         } else {
           let routeData = this.$router.resolve({
-            name: 'TravelContract',
+            name: 'TravelContractNew',
             query: {
               TCID: item.TCID,
               orderID: item.OrderId,

src/router/config.js

@@ -3830,7 +3830,22 @@ export default {
                 title: '领队报账'
             }
         },
-        
+        {
+            path:'/TravelContractNew', //新电子合同
+            name: 'TravelContractNew',
+            component: resolve => require(['@/components/TravelContractNew'], resolve),
+            meta: {
+                title: '电子合同'
+            }
+        },
+        {
+            path:'/TravelContractDetail', //新电子合同详情
+            name: 'TravelContractDetail',
+            component: resolve => require(['@/components/TravelContractDetail'], resolve),
+            meta: {
+                title: '电子合同'
+            }
+        },
         {
             path: '/supplierLogin', //供应商登录
             name: 'supplierLogin',