Merge remote-tracking branch 'origin/dev' into dev

src/router/views/index.js

@@ -296,8 +296,10 @@ export default [{
     children: [
       {
         path: '/exportcustomerInquiry_detailsPage',
+        name:'报价单',
         meta: {
-          i18n: 'exportcustomerInquiry_detailsPage'
+          i18n: 'exportcustomerInquiry_detailsPage',
+          keepAlive: true,
         },
         component: () => import( /* webpackChunkName: "views" */ '@/views/exportTrade/customerInquiry/detailsPage')
       }
@@ -311,8 +313,10 @@ export default [{
       children: [
         {
           path: '/exportpurchaseInquiry_detailsPage',
+          name:'采购询价',
           meta: {
-            i18n: 'exportpurchaseInquiry_detailsPage'
+            i18n: 'exportpurchaseInquiry_detailsPage',
+            keepAlive: true,
           },
           component: () => import( /* webpackChunkName: "views" */ '@/views/exportTrade/purchaseInquiry/detailsPage')
         }
@@ -326,8 +330,10 @@ export default [{
           children: [
             {
               path: '/exportshippingInquiry_detailsPage',
+              name:'船务询价',
               meta: {
-                i18n: 'exportshippingInquiry_detailsPage'
+                i18n: 'exportshippingInquiry_detailsPage',
+                keepAlive: true,
               },
               component: () => import( /* webpackChunkName: "views" */ '@/views/exportTrade/shippingInquiry/detailsPage')
             }
@@ -341,8 +347,10 @@ export default [{
     children: [
       {
         path: '/exportsalesContract_detailsPage',
+        name:'销售订单',
         meta: {
-          i18n: 'exportsalesContract_detailsPage'
+          i18n: 'exportsalesContract_detailsPage',
+          keepAlive: true,
         },
         component: () => import( /* webpackChunkName: "views" */ '@/views/exportTrade/salesContract/detailsPage')
       }
@@ -356,8 +364,10 @@ export default [{
     children: [
       {
         path: '/exportPurchaseContract_detailsPage',
+        name:'采购订单',
         meta: {
-          i18n: 'exportPurchaseContract_detailsPage'
+          i18n: 'exportPurchaseContract_detailsPage',
+          keepAlive: true,
         },
         component: () => import( /* webpackChunkName: "views" */ '@/views/exportTrade/purchaseContract/detailsPage')
       }
@@ -373,7 +383,8 @@ export default [{
         path: '/importInvoice_detailsPage',
         name: '发货单',
         meta: {
-          i18n: 'importInvoice_detailsPage'
+          i18n: 'importInvoice_detailsPage',
+          keepAlive:true,
         },
         component: () => import( /* webpackChunkName: "views" */ '@/views/importTrade/invoice/detailsPageEdit')
       }
@@ -387,8 +398,10 @@ export default [{
     children: [
       {
         path: '/exportReceipt_detailsPage',
+        name:"收货单",
         meta: {
-          i18n: 'exportReceipt_detailsPage'
+          i18n: 'exportReceipt_detailsPage',
+          keepAlive:true,
         },
         component: () => import( /* webpackChunkName: "views" */ '@/views/exportTrade/receipt/detailsPageEdit')
       }

src/views/exportTrade/customerInquiry/index.vue

@@ -141,12 +141,14 @@ export default {
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportcustomerInquiry_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
       });
     },
     editOpen(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportcustomerInquiry_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
@@ -180,6 +182,7 @@ export default {
       this.onLoad(this.page, this.search);
     },
     newAdd() {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportcustomerInquiry_detailsPage"
       });

src/views/exportTrade/purchaseContract/index.vue

@@ -151,12 +151,14 @@ export default {
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportpurchaseContract_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
       });
     },
     editOpen(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportpurchaseContract_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
@@ -200,6 +202,7 @@ export default {
       this.onLoad(this.page, this.search);
     },
     newAdd() {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportpurchaseContract_detailsPage",
         query:{

src/views/exportTrade/purchaseInquiry/index.vue

@@ -129,20 +129,14 @@ export default {
     },
     //查看跳转页面
     beforeOpenPage(row, index) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportpurchaseInquiry_detailsPage",
         query: { id: JSON.stringify(row.id) }
       });
     },
-    //新增跳转页面
-    beforeOpen(row) {
-      console.log(row);
-      this.$router.push({
-        path: "/exportInvoice_detailsPage",
-        query: { id: JSON.stringify(row.id) }
-      });
-    },
     editOpen(row) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportpurchaseInquiry_detailsPage",
         query: { id: JSON.stringify(row.id) }
@@ -177,6 +171,7 @@ export default {
       this.onLoad(this.page, this.search);
     },
     newAdd() {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportpurchaseInquiry_detailsPage"
       });

src/views/exportTrade/receipt/index.vue

@@ -124,12 +124,14 @@ export default {
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportReceipt_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
       });
     },
     editOpen(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportReceipt_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
@@ -163,6 +165,7 @@ export default {
       this.onLoad(this.page, this.search);
     },
     newAdd() {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportReceipt_detailsPage"
       });

src/views/exportTrade/salesContract/index.vue

@@ -139,12 +139,14 @@ export default {
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportsalesContract_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
       });
     },
     editOpen(row, status) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportsalesContract_detailsPage",
         query: { id: JSON.stringify(row.id), status: status }
@@ -178,6 +180,7 @@ export default {
       this.onLoad(this.page, this.search);
     },
     newAdd() {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportsalesContract_detailsPage"
       });

src/views/exportTrade/shippingInquiry/index.vue

@@ -106,12 +106,14 @@ export default {
   methods: {
     //查看跳转页面
     beforeOpenPage(row, index) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportshippingInquiry_detailsPage",
         query: { id: JSON.stringify(row.id) }
       });
     },
     editOpen(row) {
+      this.$router.$avueRouter.closeTag();
       this.$router.push({
         path: "/exportshippingInquiry_detailsPage",
         query: { id: JSON.stringify(row.id) }