【修改】bug

src/layout/components/AppMain.vue

@@ -1,9 +1,11 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive >
-        <router-view />
-      </keep-alive>
+      <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
+    </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
+
     </transition>
   </section>
 </template>

src/layout/components/TagsView/index.vue

@@ -46,7 +46,7 @@ export default {
       return this.$store.state.tagsView.visitedViews
     },
     routes() {
-      return this.$store.state.permission.routes0
+      return this.$store.state.permission.routes
     }
   },
   watch: {

src/layout/index.vue

@@ -1,101 +1,106 @@
 <template>
   <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+    <div
+      v-if="device === 'mobile' && sidebar.opened"
+      class="drawer-bg"
+      @click="handleClickOutside"
+    />
     <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
+    <div :class="{ hasTagsView: needTagsView }" class="main-container">
+      <div :class="{ 'fixed-header': fixedHeader }">
         <navbar />
         <tags-view v-if="needTagsView" />
       </div>
+
+
       <app-main />
     </div>
   </div>
 </template>
 
 <script>
-import { Navbar, Sidebar, AppMain } from './components'
-import TagsView from './components/TagsView/index'
-import ResizeMixin from './mixin/ResizeHandler'
+import { Navbar, Sidebar, AppMain } from "./components";
+import TagsView from "./components/TagsView/index";
+import ResizeMixin from "./mixin/ResizeHandler";
 
 export default {
-  name: 'Layout',
+  name: "Layout",
   components: {
     Navbar,
     Sidebar,
     AppMain,
-    TagsView
+    TagsView,
   },
   mixins: [ResizeMixin],
   computed: {
     sidebar() {
-      return this.$store.state.app.sidebar
+      return this.$store.state.app.sidebar;
     },
     device() {
-      return this.$store.state.app.device
+      return this.$store.state.app.device;
     },
     fixedHeader() {
-      return this.$store.state.settings.fixedHeader
+      return this.$store.state.settings.fixedHeader;
     },
     needTagsView() {
-      return this.$store.state.settings.tagsView
+      return this.$store.state.settings.tagsView;
     },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
+        mobile: this.device === "mobile",
+      };
+    },
   },
 
-
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
-  }
-}
+      this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+@import "~@/styles/mixin.scss";
+@import "~@/styles/variables.scss";
 
-  .fixed-header {
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
 
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
 
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px);
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
 </style>

src/views/basic_data/dealer.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/basic_data/logistics.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/basic_data/material.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/basic_data/stock.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/basic_data/supplier.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/basic_data/taker.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/basic_data/wallet.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/finance/cash.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/finance/details.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/finance/rebate.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/sales/price.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/sales_policy/components/AddPolicy.vue

@@ -888,7 +888,7 @@ export default {
             customerNumber: el.number,
             lastOrderTime: "",
             limitTakeNum: 0,
-            policyId: this.comCode,
+            policyId: this.searchForm.code || this.comCode,
             policyTitle: "",
             remark: "",
           });
@@ -912,6 +912,7 @@ export default {
           title: "",
           type: "",
           ...this.searchForm,
+          flag:region,
           endTime: this.searchForm.endTime || "2100-01-01 00:00:00",
           imgSrc: this.fileList.length ? this.fileList[0].url : "",
         };

src/views/sales_policy/components/TabelTransfer.vue

@@ -376,7 +376,7 @@ export default {
         pageNum: this.currentPages,
         pageSize: this.pageSizes,
         keyword: this.keyword,
-        region: this.region,
+        region: '',
       };
       // 获取经销商列表
       getCrList(customerParams).then((res) => {

src/views/sales_policy/components/editPolicy.vue

@@ -883,7 +883,7 @@ export default {
             customerNumber: el.number || el.customerNumber,
             lastOrderTime: '',
             limitTakeNum: 0,
-            policyId: this.searchForm.code,
+            policyId: this.searchForm.code || this.detail.code,
             policyTitle: '',
             remark: ''
           })
@@ -896,6 +896,7 @@ export default {
         const params = {
           ...this.detail,
           ...this.searchForm,
+           flag:region,
           endTime: this.searchForm.endTime || '2100-01-01 00:00:00',
           policyCustomers: arr,
           imgSrc: this.fileList.length ? this.fileList[0].url : ''

src/views/supply/adjust.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/allot.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/apply.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/deliver.vue

@@ -1,7 +1,17 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
+
+
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/direct.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/displace.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/engin.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/implement.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/pickup.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/policy.vue

@@ -1,5 +1,15 @@
 <template>
   <div>
-    <router-view></router-view>
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
+    </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/policy/components/retail_form.vue

@@ -1486,7 +1486,7 @@ export default {
             })
           })
           this.goodsList = data.retailOrderItemList
-          console.log(goodsList,'748578');
+
         })
       })
     },

src/views/supply/purchase.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/reserve.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/retail.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/return.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+

src/views/supply/sales.vue

@@ -1,7 +1,15 @@
 <template>
   <div>
-    <keep-alive>
-    <router-view />
+  <keep-alive>
+    <router-view  v-if="$route.name" :key="$route.path"/>
     </keep-alive>
+     <router-view  v-if="!$route.name" :key="$route.path"/>
   </div>
 </template>
+
+<script>
+export default {
+
+}
+</script>
+