修改bug

src/router/views/index.js

@@ -1882,5 +1882,70 @@ export default [{
       },
       component: () => import( /* webpackChunkName: "views" */ '@/views/salesManagement/outStock/index')
     }]
+  }, {
+    path: '/client/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/client/index',
+      name: '客户(Y)',
+      meta: {
+        i18n: '/client/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/client/index')
+    }]
+  }, {
+    path: '/client/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/client/index',
+      name: '客户(Y)',
+      meta: {
+        i18n: '/client/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/client/index')
+    }]
+  }, {
+    path: '/salesOrder/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/salesOrder/index',
+      name: '销售单',
+      meta: {
+        i18n: '/salesOrder/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/salesOrder/index')
+    }]
+  }, {
+    path: '/product/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/product/index',
+      name: '产品',
+      meta: {
+        i18n: '/product/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/product/index')
+    }]
+  }, {
+    path: '/Inventory/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/Inventory/index',
+      name: '库存',
+      meta: {
+        i18n: '/Inventory/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/Inventory/index')
+    }]
   }
 ]

src/views/Inventory/js/optionList.js

@@ -2,7 +2,7 @@ import { number } from "echarts"
 
 export const option = {
   searchShow: true,
-  searchMenuSpan: 16,
+  searchMenuSpan: 8,
   align: "center",
   searchSpan: 8,
   tip: false,
@@ -107,15 +107,6 @@ export const option = {
       hide: true,
       showColumn: false,
       index: 15
-    },
-    {
-      label: "条形码",
-      prop: "a",
-      overHidden: true,
-      search: true,
-      hide: true,
-      showColumn: false,
-      index: 16
     }
   ]
 }

src/views/client/js/optionList.js

@@ -12,7 +12,7 @@ export const option = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  menuWidth: 150,
+  menuWidth: 130,
   searchIcon: true,
   searchIndex: 2,
   column: [

src/views/product/index.vue

@@ -87,7 +87,7 @@ export default {
     },
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 46;
+        this.option.height = this.option.height -46;
       } else {
         this.option.height = this.option.height + 46;
       }

src/views/product/js/optionList.js

@@ -2,7 +2,7 @@ import { number } from "echarts"
 
 export const option = {
   searchShow: true,
-  searchMenuSpan: 16,
+  searchMenuSpan: 8,
   align: "center",
   searchSpan: 8,
   tip: false,
@@ -32,6 +32,7 @@ export const option = {
     {
       label: "单位",
       prop: "unit",
+      search: true,
       overHidden: true,
       index: 4
     },
@@ -44,8 +45,27 @@ export const option = {
     {
       label: "备注",
       prop: "remarks",
+      search: true,
       overHidden: true,
       index: 6
+    },
+    {
+      label: "状态",
+      prop: "remarks",
+      search: true,
+      hide: true,
+      showColumn: false,
+      overHidden: true,
+      index: 7
+    },
+    {
+      label: "标签",
+      prop: "label",
+      search: true,
+      hide: true,
+      showColumn: false,
+      overHidden: true,
+      index: 8
     }
   ]
 }

src/views/salesOrder/index.vue

@@ -15,7 +15,7 @@
         </template>
         <template slot="businesDateSearch">
           <el-date-picker v-model="search.businesDate" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
-            format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
+            format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions">
           </el-date-picker>
         </template>
         <template slot-scope="{ row, index }" slot="menu">
@@ -72,6 +72,29 @@ export default {
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       option: {},
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+        shortcuts: [
+          {
+            text: '昨天',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+      },
     };
   },
   components: {
@@ -94,9 +117,9 @@ export default {
     },
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 46;
+        this.option.height = this.option.height - 189;
       } else {
-        this.option.height = this.option.height + 46;
+        this.option.height = this.option.height + 189;
       }
       this.$refs.crud.getTableHeight();
     },

src/views/salesOrder/js/optionList.js

@@ -2,7 +2,7 @@ import { number } from "echarts"
 
 export const option = {
   searchShow: true,
-  searchMenuSpan: 8,
+  searchMenuSpan: 24,
   align: "center",
   searchSpan: 8,
   tip: false,
@@ -34,6 +34,15 @@ export const option = {
       index: 2
     },
     {
+      label: "电话",
+      prop: "tel",
+      type: 'select',
+      dicData: [],
+      search: true,
+      overHidden: true,
+      index: 3
+    },
+    {
       label: "日期",
       prop: "businesDate",
       search: true,
@@ -81,6 +90,30 @@ export const option = {
       index: 10
     },
     {
+      label: "产品",
+      prop: "cname",
+      type: "select",
+      dicData: [],
+      search: true,
+      index: 11
+    },
+    {
+      label: "客户分类",
+      prop: "corpType",
+      type: "select",
+      dicData: [],
+      search: true,
+      index: 12
+    },
+    {
+      label: "客户分类",
+      prop: "corpType",
+      type: "select",
+      dicData: [],
+      search: true,
+      index: 13
+    },
+    {
       label: "制单人",
       prop: "createUser",
       type: "select",
@@ -90,7 +123,7 @@ export const option = {
       },
       dicData: [],
       search: true,
-      index: 11
+      index: 14
     }
   ]
 }
@@ -121,6 +154,7 @@ export const optionList = {
     {
       label: "产品",
       prop: "cname",
+      width:'250px',
       overHidden: true
     },
     {
@@ -183,12 +217,7 @@ export const optionList = {
       prop: "purchaseQuantity",
       cell: true,
       overHidden: true
-    },
-    {
-      label: "总进价",
-      prop: "storageAmount",
-      overHidden: true
-    },
+    }
   ]
 }