csx 6 vuotta sitten
vanhempi
commit
b77933bc31
3 muutettua tiedostoa jossa 80 lisäystä ja 78 poistoa
  1. 1 1
      config/index.js
  2. 79 76
      src/router/index.js
  3. 0 1
      src/xt_pages/data/druguseTemplate.vue

+ 1 - 1
config/index.js Näytä tiedosto

@@ -29,7 +29,7 @@ module.exports = {
29 29
     // Use Eslint Loader?
30 30
     // If true, your code will be linted during bundling and
31 31
     // linting errors and warnings will be shown in the console.
32
-    useEslint: true,
32
+    useEslint: false,
33 33
 
34 34
     // If true, eslint errors and warnings will also be shown in the error overlay
35 35
     // in the browser.

+ 79 - 76
src/router/index.js Näytä tiedosto

@@ -384,7 +384,7 @@ export const xt_constantRouterMap = [
384 384
   },
385 385
   {
386 386
     path: '/fullscreenboard',
387
-    component: () => import('@/xt_pages/fullscreenboard/index'), 
387
+    component: () => import('@/xt_pages/fullscreenboard/index'),
388 388
     hidden:true,
389 389
   },
390 390
   {
@@ -412,111 +412,114 @@ export const xt_constantRouterMap = [
412 412
         component: () => import('@/xt_pages/stock/index'),
413 413
         name: 'config',
414 414
         meta: {title: 'config'},
415
-        children:[
416
-
417
-          {
418
-            path: 'manufacturer',
419
-            component: () => import('@/xt_pages/stock/config/manufacturer'),
420
-            name: 'manufacturer',
421
-            meta: {title: 'manufacturer'}
422
-          },
423
-          {
424
-            path: 'dealer',
425
-            component: () => import('@/xt_pages/stock/config/dealer'),
426
-            name: 'dealer',
427
-            meta: {title: 'dealer'}
428
-          },
429
-          {
430
-            path: 'type',
431
-            component: () => import('@/xt_pages/stock/config/goodType'),
432
-            name: 'goodType',
433
-            meta: {title: 'goodType'}
434
-          },
435
-
436
-          {
437
-            path: 'info',
438
-            component: () => import('@/xt_pages/stock/config/goodInfo'),
439
-            name: 'goodInfo',
440
-            meta: {title: 'goodInfo'}
441
-          },
442
-        ]
443 415
       },
444
-
445 416
       {
446 417
         path: '/stock/in',
447
-        component: () => import('@/xt_pages/stock/stockIn'),
448
-        name: 'stockIn',
449
-        meta: {title: 'stockIn',noCache: true }
450
-
418
+        component: () => import('@/xt_pages/stock/stockInOrder'),
419
+        name: 'stockInOrder',
420
+        meta: {title: 'stockInOrder',noCache: true }
421
+      }, {
422
+        path: '/stock/in/other',
423
+        component: () => import('@/xt_pages/stock/otherStockInOrder'),
424
+        name: 'otherStockInOrder',
425
+        meta: {title: 'otherStockInOrder',noCache: true }
426
+      },{
427
+        path: '/stock/return',
428
+        component: () => import('@/xt_pages/stock/salesReturnOrder'),
429
+        name: 'salesReturnOrder',
430
+        meta: {title: 'salesReturnOrder',noCache: true}
431
+      },{
432
+        path: '/stock/return/other',
433
+        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
434
+        name: 'otherSalesReturnOrder',
435
+        meta: {title: 'otherSalesReturnOrder',noCache: true}
451 436
       },
452
-
453 437
        {
454 438
         path: '/stock/out',
455
-        component: () => import('@/xt_pages/stock/stockOut'),
456
-        name: 'stockOut',
457
-        meta: {title: 'stockOut'}
439
+        component: () => import('@/xt_pages/stock/stockOutOrder'),
440
+        name: 'stockOutOrder',
441
+        meta: {title: 'stockOutOrder',noCache: true}
442
+      },{
443
+        path: '/stock/out/other',
444
+        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
445
+        name: 'otherStockOutOrder',
446
+        meta: {title: 'otherStockOutOrder',noCache: true}
447
+      },{
448
+        path: '/stock/cancel',
449
+        component: () => import('@/xt_pages/stock/cancelStockOrder'),
450
+        name: 'cancelStockOrder',
451
+        meta: {title: 'cancelStockOrder',noCache: true}
452
+      },{
453
+        path: '/stock/cancel/other',
454
+        component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
455
+        name: 'otherCancelStockOrder',
456
+        meta: {title: 'otherCancelStockOrder',noCache: true}
458 457
       },{
459 458
         path: '/stock/query',
460 459
         component: () => import('@/xt_pages/stock/stockQuery'),
461 460
         name: 'stockQuery',
462 461
         meta: {title: 'stockQuery'}
463
-      },{
462
+      }, {
464 463
         path: '/stock/in/add',
465
-        component: () => import('@/xt_pages/stock/addStockIn'),
466
-        name: 'addStockIn',
464
+        component: () => import('@/xt_pages/stock/stockInOrderAdd'),
465
+        name: 'stockInOrderAdd',
467 466
         hidden: true,
468 467
         is_menu: false,
469
-        meta: {title: 'addStockIn',noCache: true}
470
-      }, {
471
-        path: '/stock/out/add',
472
-        component: () => import('@/xt_pages/stock/addStockOut'),
473
-        name: 'addStockOut',
468
+        meta: {title: 'stockInOrderAdd'}
469
+      },{
470
+        path: '/stock/in/detail',
471
+        component: () => import('@/xt_pages/stock/stockInDetail'),
472
+        name: 'stockInDetail',
474 473
         hidden: true,
475 474
         is_menu: false,
476
-        meta: {title: 'addStockOut',noCache: true }
475
+        meta: {title: 'stockInDetail'}
477 476
       },{
478
-        path: '/stock/return',
479
-        component: () => import('@/xt_pages/stock/salesReturn'),
480
-        name: 'salesReturn',
477
+        path: '/stock/return/detail',
478
+        component: () => import('@/xt_pages/stock/salesReturnDetail'),
479
+        name: 'salesReturnDetail',
481 480
         hidden: true,
482 481
         is_menu: false,
483
-        meta: {title: 'salesReturn'}
482
+        meta: {title: 'salesReturnDetail'}
484 483
       },{
485
-        path: '/stock/return/record',
486
-        component: () => import('@/xt_pages/stock/salesReutrnRecord'),
487
-        name: 'salesReutrnRecord',
484
+        path: '/stock/return/add',
485
+        component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
486
+        name: 'salesReturnOrderAdd',
488 487
         hidden: true,
489 488
         is_menu: false,
490
-        meta: {title: 'salesReutrnRecord'}
491
-      },{
492
-        path: '/stock/warehouse/record',
493
-        component: () => import('@/xt_pages/stock/warehouseRecord'),
494
-        name: 'warehouseRecord',
489
+        meta: {title: 'salesReturnOrderAdd'}
490
+      }, {
491
+        path: '/stock/out/add',
492
+        component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
493
+        name: 'stockOutOrderAdd',
495 494
         hidden: true,
496 495
         is_menu: false,
497
-        meta: {title: 'warehouseRecord'}
496
+        meta: {title: 'stockOutOrderAdd',noCache: true }
498 497
       },{
499
-        path: '/stock/cancel/',
500
-        component: () => import('@/xt_pages/stock/cancelStock'),
501
-        name: 'cancelStock',
498
+        path: '/stock/out/detail',
499
+        component: () => import('@/xt_pages/stock/stockOutDetail'),
500
+        name: 'stockOutDetail',
502 501
         hidden: true,
503 502
         is_menu: false,
504
-        meta: {title: 'cancelStock'}
505
-      }, {
506
-        path: '/stock/cancel/record',
507
-        component: () => import('@/xt_pages/stock/cancelStockRecord'),
508
-        name: 'cancelStockRecord',
503
+        meta: {title: 'stockOutDetail',noCache: true }
504
+      },{
505
+        path: '/stock/cancel/add',
506
+        component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
507
+        name: 'cancelStockOrderAdd',
509 508
         hidden: true,
510 509
         is_menu: false,
511
-        meta: {title: 'cancelStockRecord'}
512
-      }, {
513
-        path: '/stock/out/record',
514
-        component: () => import('@/xt_pages/stock/stockOutRecord'),
515
-        name: 'stockOutRecord',
510
+        meta: {title: 'cancelStockOrderAdd',noCache: true }
511
+      },{
512
+        path: '/stock/cancel/detail',
513
+        component: () => import('@/xt_pages/stock/cancelStockDetail'),
514
+        name: 'cancelStockDetail',
516 515
         hidden: true,
517 516
         is_menu: false,
518
-        meta: {title: 'stockOutRecord'}
519
-      },
517
+        meta: {title: 'cancelStockDetail',noCache: true }
518
+      }
519
+
520
+
521
+
522
+
520 523
     ]
521 524
   },
522 525
   {
@@ -750,7 +753,7 @@ export const xt_asyncRouterMap = [
750 753
   // },
751 754
   // {
752 755
   //   path: '/fullscreenboard',
753
-  //   component: () => import('@/xt_pages/fullscreenboard/index'), 
756
+  //   component: () => import('@/xt_pages/fullscreenboard/index'),
754 757
   //   hidden:true,
755 758
   // },
756 759
   // {

+ 0 - 1
src/xt_pages/data/druguseTemplate.vue Näytä tiedosto

@@ -17,7 +17,6 @@
17 17
             :data="adviceTemplates"
18 18
             border
19 19
             fit
20
-
21 20
             @cell-mouse-leave="cellMouseLeave"
22 21
             @cell-mouse-enter="cellMouseEnter"
23 22
             :row-class-name="tableRowClassNames"