Merge branch 'dev' into pre-production

src/components/tablecmt/tablecmt.vue

@@ -160,9 +160,9 @@
               <el-text class="mx-1 tabtitles" @click.stop @dblclick.stop="copyalls(column)">{{
                 column.label
               }}</el-text>
-              <el-icon v-if="column.type == 1 || column.type == 2 || column.type == 3"
+              <!-- <el-icon v-if="column.type == 1 || column.type == 2 || column.type == 3"
                 ><DocumentCopy
-              /></el-icon>
+              /></el-icon> -->
             </div>
           </div>
         </template>

src/page/index/index.vue

@@ -16,9 +16,9 @@
         <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
           <router-view #="{ Component }">
             <!-- <keep-alive :include="$store.getters.tagsKeep" :max="20">    -->
-            <!-- <keep-alive :max="20"> -->
+            <keep-alive :max="10">
               <component :is="Component" />
-            <!-- </keep-alive> -->
+            </keep-alive>
           </router-view>
         </div>
       </div>

src/router/views/index.js

@@ -1035,30 +1035,30 @@ export default [
       },
     ],
   },
-  {
+  // {
-    path: '/distribution/turndelivery/devtmp',
+  //   path: '/distribution/turndelivery/devtmp',
-    component: Layout,
+  //   component: Layout,
-    redirect: '/distribution/turndelivery/devtmp',
+  //   redirect: '/distribution/turndelivery/devtmp',
-    children: [
+  //   children: [
-      {
+  //     {
-        path: '/distribution/turndelivery/devtmp',
+  //       path: '/distribution/turndelivery/devtmp',
-        name: '商配计划重构',
+  //       name: '商配计划重构',
-        component: () => import('@/views/distribution/turndelivery/devtmp.vue'),
+  //       component: () => import('@/views/distribution/turndelivery/devtmp.vue'),
-      },
+  //     },
-    ],
+  //   ],
-  },
+  // },
-  {
+  // {
-    path: '/distribution/signfor//devtmp',
+  //   path: '/distribution/signfor//devtmp',
-    component: Layout,
+  //   component: Layout,
-    redirect: '/distribution/signfor//devtmp',
+  //   redirect: '/distribution/signfor//devtmp',
-    children: [
+  //   children: [
-      {
+  //     {
-        path: '/distribution/signfor//devtmp',
+  //       path: '/distribution/signfor//devtmp',
-        name: '签收明细重构',
+  //       name: '签收明细重构',
-        component: () => import('@/views/distribution/signfor//devtmp.vue'),
+  //       component: () => import('@/views/distribution/signfor//devtmp.vue'),
-      },
+  //     },
-    ],
+  //   ],
-  },
+  // },
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,