Browse Source

Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

xiaoming_global 6 years ago
parent
commit
a1213cf3a4
35 changed files with 1703 additions and 1801 deletions
  1. 27 0
      .idea/codeStyles/Project.xml
  2. 5 0
      .idea/codeStyles/codeStyleConfig.xml
  3. 4 0
      .idea/encodings.xml
  4. 6 0
      .idea/misc.xml
  5. 8 0
      .idea/modules.xml
  6. 6 0
      .idea/vcs.xml
  7. 8 0
      .idea/xt_vue.iml
  8. 392 392
      src/router/index.js
  9. 2 2
      src/views/layout/components/Navbar.vue
  10. 6 1
      src/views/layout/components/Sidebar/index.vue
  11. 476 557
      src/xt_pages/data/druguseTemplate.vue
  12. 2 2
      src/xt_pages/home/modify_user_info_dialog.vue
  13. 138 157
      src/xt_pages/sign/index.vue
  14. 24 24
      src/xt_pages/stock/cancelStockOrder.vue
  15. 15 17
      src/xt_pages/stock/cancelStockOrderAdd.vue
  16. 5 14
      src/xt_pages/stock/cancelStockOrderEdit.vue
  17. 35 38
      src/xt_pages/stock/detail/cancelStockDetail.vue
  18. 34 38
      src/xt_pages/stock/detail/salesReturnDetail.vue
  19. 28 32
      src/xt_pages/stock/detail/stockInDetail.vue
  20. 35 39
      src/xt_pages/stock/detail/stockOutDetail.vue
  21. 24 24
      src/xt_pages/stock/otherCancelStockOrder.vue
  22. 23 23
      src/xt_pages/stock/otherSalesReturnOrder.vue
  23. 25 25
      src/xt_pages/stock/otherStockInOrder.vue
  24. 122 123
      src/xt_pages/stock/otherStockOutOrder.vue
  25. 5 15
      src/xt_pages/stock/salesReturnEdit.vue
  26. 21 21
      src/xt_pages/stock/salesReturnOrder.vue
  27. 15 20
      src/xt_pages/stock/salesReturnOrderAdd.vue
  28. 21 23
      src/xt_pages/stock/stockDetail.vue
  29. 23 26
      src/xt_pages/stock/stockInOrder.vue
  30. 15 19
      src/xt_pages/stock/stockInOrderAdd.vue
  31. 6 11
      src/xt_pages/stock/stockInOrderEdit.vue
  32. 122 123
      src/xt_pages/stock/stockOutOrder.vue
  33. 16 19
      src/xt_pages/stock/stockOutOrderAdd.vue
  34. 6 13
      src/xt_pages/stock/stockOutOrderEdit.vue
  35. 3 3
      src/xt_permission.js

+ 27 - 0
.idea/codeStyles/Project.xml View File

1
+<component name="ProjectCodeStyleConfiguration">
2
+  <code_scheme name="Project" version="173">
3
+    <JSCodeStyleSettings version="0">
4
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
5
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
6
+      <option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />
7
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
8
+      <option name="USE_DOUBLE_QUOTES" value="false" />
9
+      <option name="FORCE_QUOTE_STYlE" value="true" />
10
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
11
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
12
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
13
+      <option name="SPACE_BEFORE_ASYNC_ARROW_LPAREN" value="false" />
14
+    </JSCodeStyleSettings>
15
+    <codeStyleSettings language="JavaScript">
16
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
17
+      <option name="IF_BRACE_FORCE" value="1" />
18
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
19
+      <option name="WHILE_BRACE_FORCE" value="1" />
20
+      <option name="FOR_BRACE_FORCE" value="1" />
21
+      <indentOptions>
22
+        <option name="INDENT_SIZE" value="2" />
23
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
24
+      </indentOptions>
25
+    </codeStyleSettings>
26
+  </code_scheme>
27
+</component>

+ 5 - 0
.idea/codeStyles/codeStyleConfig.xml View File

1
+<component name="ProjectCodeStyleConfiguration">
2
+  <state>
3
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
4
+  </state>
5
+</component>

+ 4 - 0
.idea/encodings.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
4
+</project>

+ 6 - 0
.idea/misc.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="JavaScriptSettings">
4
+    <option name="languageLevel" value="ES6" />
5
+  </component>
6
+</project>

+ 8 - 0
.idea/modules.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/.idea/xt_vue.iml" filepath="$PROJECT_DIR$/.idea/xt_vue.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 6 - 0
.idea/vcs.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
5
+  </component>
6
+</project>

+ 8 - 0
.idea/xt_vue.iml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="WEB_MODULE" version="4">
3
+  <component name="NewModuleRootManager">
4
+    <content url="file://$MODULE_DIR$" />
5
+    <orderEntry type="inheritedJdk" />
6
+    <orderEntry type="sourceFolder" forTests="false" />
7
+  </component>
8
+</module>

+ 392 - 392
src/router/index.js View File

548
 
548
 
549
 export const xt_asyncRouterMap = [
549
 export const xt_asyncRouterMap = [
550
 // //////////////////////////////////线在开始
550
 // //////////////////////////////////线在开始
551
-  // {
552
-  //   path: '/patients',
553
-  //   component: Layout,
554
-  //   redirect: 'noredirect',
555
-  //   name: 'User',
556
-  //   alwaysShow: true,
557
-  //   meta: {
558
-  //     title: 'user',
559
-  //     icon: 'bingren'
560
-  //   },
561
-  //   children: [
562
-  //     {
563
-  //       path: '/patients/patients',
564
-  //       component: () => import('@/xt_pages/user/patients'),
565
-  //       name: 'Patient',
566
-  //       meta: { title: 'patient', noCache: true }
567
-  //     },
568
-  //     {
569
-  //       path: '/patients/create',
570
-  //       component: () => import('@/xt_pages/user/createPatient'),
571
-  //       name: 'createPatient',
572
-  //       meta: { title: 'createPatient', noCache: true }
573
-  //     },
574
-  //     {
575
-  //       path: '/patients/patient/:id',
576
-  //       component: () => import('@/xt_pages/user/patientInfo'),
577
-  //       hidden: true,
578
-  //       is_menu: false,
579
-  //       name: 'patient Page',
580
-  //       meta: { title: 'patientPage', noCache: true }
581
-  //     },
582
-  //     {
583
-  //       path: '/patients/patient/:id/edit',
584
-  //       component: () => import('@/xt_pages/user/editPatient'),
585
-  //       hidden: true,
586
-  //       is_menu: false,
587
-  //       name: 'Edit Patient',
588
-  //       meta: { title: 'editPatient', noCache: true }
589
-  //     },
590
-  //     {
591
-  //       path: '/patients/patient/:id/dialysisSolution',
592
-  //       component: () => import('@/xt_pages/user/dialysisSolution'),
593
-  //       hidden: true,
594
-  //       is_menu: false,
595
-  //       name: 'dialysisSolution',
596
-  //       meta: { title: 'dialysisSolution', noCache: true }
597
-  //     },
598
-  //     {
599
-  //       path: '/patients/patient/:id/weight',
600
-  //       component: () => import('@/xt_pages/user/weight'),
601
-  //       hidden: true,
602
-  //       is_menu: false,
603
-  //       name: 'weight',
604
-  //       meta: { title: 'weight', noCache: true }
605
-  //     },
606
-  //     {
607
-  //       path: '/patients/patient/:id/dialysisRecord',
608
-  //       component: () => import('@/xt_pages/user/dialysisRecord'),
609
-  //       hidden: true,
610
-  //       is_menu: false,
611
-  //       name: 'dialysisRecord',
612
-  //       meta: { title: 'dialysisRecord', noCache: true }
613
-  //     },
614
-  //     {
615
-  //       path: '/patients/patient/:id/scheduling',
616
-  //       component: () => import('@/xt_pages/user/scheduling'),
617
-  //       hidden: true,
618
-  //       is_menu: false,
619
-  //       name: 'scheduling',
620
-  //       meta: { title: 'scheduling', noCache: true }
621
-  //     },
622
-  //     {
623
-  //       path: '/patients/patient/:id/doctorAdvice',
624
-  //       component: () => import('@/xt_pages/user/doctorAdvice'),
625
-  //       hidden: true,
626
-  //       is_menu: false,
627
-  //       name: 'doctorAdvice',
628
-  //       meta: { title: 'doctorAdvice', noCache: true }
629
-  //     },
630
-  //     {
631
-  //       path: '/patients/inspection',
632
-  //       component: () => import('@/xt_pages/user/inspection'),
633
-  //       hidden: true,
634
-  //       is_menu: false,
635
-  //       name: 'Inspection',
636
-  //       meta: { title: 'inspection', noCache: true }
637
-  //     },
638
-  //     {
639
-  //       path: '/patients/course',
640
-  //       component: () => import('@/xt_pages/user/courseOfDisease'),
641
-  //       hidden: true,
642
-  //       is_menu: false,
643
-  //       name: 'CourseOfDiseaseManage',
644
-  //       meta: { title: 'CourseOfDiseaseManage', noCache: true }
645
-  //     },
646
-  //     {
647
-  //       path: '/patients/rescue',
648
-  //       component: () => import('@/xt_pages/user/rescueRecord'),
649
-  //       hidden: true,
650
-  //       is_menu: false,
651
-  //       name: 'RescueRecord',
652
-  //       meta: { title: 'RescueRecord', noCache: true }
653
-  //     },
654
-  //     {
655
-  //       path: '/patients/patient/:id/proeducation',
656
-  //       component: () => import('@/xt_pages/user/proeducation'),
657
-  //       hidden: true,
658
-  //       is_menu: false,
659
-  //       name: 'proeducation',
660
-  //       meta: { title: 'proeducation', noCache: true }
661
-  //     }
662
-  //   ]
663
-  // },
664
-  // {
665
-  //   path: '/workforce',
666
-  //   component: Layout,
667
-  //   redirect: 'noredirect',
668
-  //   name: 'workforce',
669
-  //   alwaysShow: true,
670
-  //   meta: {
671
-  //     title: 'workforce',
672
-  //     icon: 'paiban'
673
-  //   },
674
-  //   children: [
675
-  //     {
676
-  //       path: '/workforce/appointment',
677
-  //       component: () => import('@/xt_pages/workforce/appointment'),
678
-  //       name: 'appointment',
679
-  //       meta: { title: 'appointment', noCache: true }
680
-  //     },
681
-  //     {
682
-  //       path: '/workforce/sign',
683
-  //       component: () => import('@/xt_pages/workforce/sign'),
684
-  //       hidden: true,
685
-  //       is_menu: false,
686
-  //       name: 'workforcesign',
687
-  //       meta: { title: 'sign', noCache: true }
688
-  //     },
689
-  //     {
690
-  //       path: '/workforce/remind',
691
-  //       component: () => import('@/xt_pages/workforce/remind'),
692
-  //       name: 'remind',
693
-  //       meta: { title: 'remind', noCache: true }
694
-  //     },
695
-  //     {
696
-  //       path: "/workforce/template",
697
-  //       component: () => import("@/xt_pages/workforce/template"),
698
-  //       name: "workforce_template",
699
-  //       hidden: true,
700
-  //       is_menu: false,
701
-  //       meta: { title: 'workforce_template', noCache: true }
702
-  //     },
703
-  //     {
704
-  //       path: "/workforce/schedule/print",
705
-  //       component: () => import("@/xt_pages/workforce/schedule_print"),
706
-  //       name: "schedule_print",
707
-  //       hidden: true,
708
-  //       is_menu: false,
709
-  //       meta: { title: 'schedule_print', noCache: true }
710
-  //     },
711
-  //   ]
712
-  // },
713
-  // {
714
-  //   path: '/sign',
715
-  //   component: Layout,
716
-  //   redirct: '/sign/index',
717
-  //   children: [{
718
-  //     path: '/sign',
719
-  //     component: () => import('@/xt_pages/sign/index'),
720
-  //     name: 'sign',
721
-  //     meta: { title: 'signWeight', icon: 'sign', noCache: true }
722
-  //   }]
723
-  // },
724
-  // {
725
-  //   path: '/dialysis/',
726
-  //   component: Layout,
727
-  //   redirect: 'noredirect',
728
-  //   name: 'dialysis',
729
-  //   alwaysShow: true,
730
-  //   meta: {
731
-  //     title: 'dialysis',
732
-  //     icon: 'touxi'
733
-  //   },
734
-  //   children: [
735
-  //     { path: '/dialysis/dialysisrecord', component: () => import('@/xt_pages/dialysis/schedualPatient'), name: '透析记录', meta: { title: '透析记录' }},
736
-  //     {
737
-  //       path: '/dialysis/record/:id',
738
-  //       component: () => import('@/xt_pages/dialysis/dialysisPage'),
739
-  //       hidden: true,
740
-  //       is_menu: false,
741
-  //       name: 'paper',
742
-  //       meta: { title: 'paper', noCache: true }
743
-  //     },
744
-  //     {
745
-  //       path: '/dialysis/print',
746
-  //       component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
747
-  //       hidden: true,
748
-  //       is_menu: false,
749
-  //       name: 'dialysisPrintOrder',
750
-  //       meta: { title: 'dialysisPrintOrder', noCache: true }
751
-  //     },
551
+  {
552
+    path: '/patients',
553
+    component: Layout,
554
+    redirect: 'noredirect',
555
+    name: 'User',
556
+    alwaysShow: true,
557
+    meta: {
558
+      title: 'user',
559
+      icon: 'bingren'
560
+    },
561
+    children: [
562
+      {
563
+        path: '/patients/patients',
564
+        component: () => import('@/xt_pages/user/patients'),
565
+        name: 'Patient',
566
+        meta: { title: 'patient', noCache: true }
567
+      },
568
+      {
569
+        path: '/patients/create',
570
+        component: () => import('@/xt_pages/user/createPatient'),
571
+        name: 'createPatient',
572
+        meta: { title: 'createPatient', noCache: true }
573
+      },
574
+      {
575
+        path: '/patients/patient/:id',
576
+        component: () => import('@/xt_pages/user/patientInfo'),
577
+        hidden: true,
578
+        is_menu: false,
579
+        name: 'patient Page',
580
+        meta: { title: 'patientPage', noCache: true }
581
+      },
582
+      {
583
+        path: '/patients/patient/:id/edit',
584
+        component: () => import('@/xt_pages/user/editPatient'),
585
+        hidden: true,
586
+        is_menu: false,
587
+        name: 'Edit Patient',
588
+        meta: { title: 'editPatient', noCache: true }
589
+      },
590
+      {
591
+        path: '/patients/patient/:id/dialysisSolution',
592
+        component: () => import('@/xt_pages/user/dialysisSolution'),
593
+        hidden: true,
594
+        is_menu: false,
595
+        name: 'dialysisSolution',
596
+        meta: { title: 'dialysisSolution', noCache: true }
597
+      },
598
+      {
599
+        path: '/patients/patient/:id/weight',
600
+        component: () => import('@/xt_pages/user/weight'),
601
+        hidden: true,
602
+        is_menu: false,
603
+        name: 'weight',
604
+        meta: { title: 'weight', noCache: true }
605
+      },
606
+      {
607
+        path: '/patients/patient/:id/dialysisRecord',
608
+        component: () => import('@/xt_pages/user/dialysisRecord'),
609
+        hidden: true,
610
+        is_menu: false,
611
+        name: 'dialysisRecord',
612
+        meta: { title: 'dialysisRecord', noCache: true }
613
+      },
614
+      {
615
+        path: '/patients/patient/:id/scheduling',
616
+        component: () => import('@/xt_pages/user/scheduling'),
617
+        hidden: true,
618
+        is_menu: false,
619
+        name: 'scheduling',
620
+        meta: { title: 'scheduling', noCache: true }
621
+      },
622
+      {
623
+        path: '/patients/patient/:id/doctorAdvice',
624
+        component: () => import('@/xt_pages/user/doctorAdvice'),
625
+        hidden: true,
626
+        is_menu: false,
627
+        name: 'doctorAdvice',
628
+        meta: { title: 'doctorAdvice', noCache: true }
629
+      },
630
+      {
631
+        path: '/patients/inspection',
632
+        component: () => import('@/xt_pages/user/inspection'),
633
+        hidden: true,
634
+        is_menu: false,
635
+        name: 'Inspection',
636
+        meta: { title: 'inspection', noCache: true }
637
+      },
638
+      {
639
+        path: '/patients/course',
640
+        component: () => import('@/xt_pages/user/courseOfDisease'),
641
+        hidden: true,
642
+        is_menu: false,
643
+        name: 'CourseOfDiseaseManage',
644
+        meta: { title: 'CourseOfDiseaseManage', noCache: true }
645
+      },
646
+      {
647
+        path: '/patients/rescue',
648
+        component: () => import('@/xt_pages/user/rescueRecord'),
649
+        hidden: true,
650
+        is_menu: false,
651
+        name: 'RescueRecord',
652
+        meta: { title: 'RescueRecord', noCache: true }
653
+      },
654
+      {
655
+        path: '/patients/patient/:id/proeducation',
656
+        component: () => import('@/xt_pages/user/proeducation'),
657
+        hidden: true,
658
+        is_menu: false,
659
+        name: 'proeducation',
660
+        meta: { title: 'proeducation', noCache: true }
661
+      }
662
+    ]
663
+  },
664
+  {
665
+    path: '/workforce',
666
+    component: Layout,
667
+    redirect: 'noredirect',
668
+    name: 'workforce',
669
+    alwaysShow: true,
670
+    meta: {
671
+      title: 'workforce',
672
+      icon: 'paiban'
673
+    },
674
+    children: [
675
+      {
676
+        path: '/workforce/appointment',
677
+        component: () => import('@/xt_pages/workforce/appointment'),
678
+        name: 'appointment',
679
+        meta: { title: 'appointment', noCache: true }
680
+      },
681
+      {
682
+        path: '/workforce/sign',
683
+        component: () => import('@/xt_pages/workforce/sign'),
684
+        hidden: true,
685
+        is_menu: false,
686
+        name: 'workforcesign',
687
+        meta: { title: 'sign', noCache: true }
688
+      },
689
+      {
690
+        path: '/workforce/remind',
691
+        component: () => import('@/xt_pages/workforce/remind'),
692
+        name: 'remind',
693
+        meta: { title: 'remind', noCache: true }
694
+      },
695
+      {
696
+        path: "/workforce/template",
697
+        component: () => import("@/xt_pages/workforce/template"),
698
+        name: "workforce_template",
699
+        hidden: true,
700
+        is_menu: false,
701
+        meta: { title: 'workforce_template', noCache: true }
702
+      },
703
+      {
704
+        path: "/workforce/schedule/print",
705
+        component: () => import("@/xt_pages/workforce/schedule_print"),
706
+        name: "schedule_print",
707
+        hidden: true,
708
+        is_menu: false,
709
+        meta: { title: 'schedule_print', noCache: true }
710
+      },
711
+    ]
712
+  },
713
+  {
714
+    path: '/sign',
715
+    component: Layout,
716
+    redirct: '/sign/index',
717
+    children: [{
718
+      path: '/sign',
719
+      component: () => import('@/xt_pages/sign/index'),
720
+      name: 'sign',
721
+      meta: { title: 'signWeight', icon: 'sign', noCache: true }
722
+    }]
723
+  },
724
+  {
725
+    path: '/dialysis/',
726
+    component: Layout,
727
+    redirect: 'noredirect',
728
+    name: 'dialysis',
729
+    alwaysShow: true,
730
+    meta: {
731
+      title: 'dialysis',
732
+      icon: 'touxi'
733
+    },
734
+    children: [
735
+      { path: '/dialysis/dialysisrecord', component: () => import('@/xt_pages/dialysis/schedualPatient'), name: '透析记录', meta: { title: '透析记录' }},
736
+      {
737
+        path: '/dialysis/record/:id',
738
+        component: () => import('@/xt_pages/dialysis/dialysisPage'),
739
+        hidden: true,
740
+        is_menu: false,
741
+        name: 'paper',
742
+        meta: { title: 'paper', noCache: true }
743
+      },
744
+      {
745
+        path: '/dialysis/print',
746
+        component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
747
+        hidden: true,
748
+        is_menu: false,
749
+        name: 'dialysisPrintOrder',
750
+        meta: { title: 'dialysisPrintOrder', noCache: true }
751
+      },
752
 
752
 
753
-  //     // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
754
-  //     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
755
-  //     { path: '/dialysis/watch', component: () => import('@/xt_pages/dialysis/bloodPresssWatch'), name: 'watch', meta: { title: 'watch' }},
756
-  //     { path: '/dialysis/details', component: () => import('@/xt_pages/dialysis/details'), name: 'details', meta: { title: 'details' }, is_menu: false,},
757
-  //     {
758
-  //       path: '/dialysis/print/batch',
759
-  //       component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
760
-  //       hidden: true,
761
-  //       is_menu: false,
762
-  //       name: 'dialysis_batch_print',
763
-  //       meta: { title: '批量打印', noCache: true }
764
-  //     },
765
-  //     { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
766
-  //   ]
767
-  // },
768
-  // {
769
-  //   path: '/stock/',
770
-  //   component: Layout,
771
-  //   redirect: 'noredirect',
772
-  //   name: 'stockManage',
773
-  //   meta: { title: 'stockManage', icon: 'stock' },
774
-  //   children: [
775
-  //     {
776
-  //       path: '/stock/in',
777
-  //       component: () => import('@/xt_pages/stock/stockInOrder'),
778
-  //       name: 'stockInOrder',
779
-  //       meta: { title: 'stockInOrder', noCache: true }
780
-  //     }, {
781
-  //       path: '/stock/return',
782
-  //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
783
-  //       name: 'salesReturnOrder',
784
-  //       meta: { title: 'salesReturnOrder', noCache: true }
785
-  //     },
786
-  //     {
787
-  //       path: '/stock/out',
788
-  //       component: () => import('@/xt_pages/stock/stockOutOrder'),
789
-  //       name: 'stockOutOrder',
790
-  //       meta: { title: 'stockOutOrder', noCache: true }
791
-  //     }, {
792
-  //       path: '/stock/cancel',
793
-  //       component: () => import('@/xt_pages/stock/cancelStockOrder'),
794
-  //       name: 'cancelStockOrder',
795
-  //       meta: { title: 'cancelStockOrder', noCache: true }
796
-  //     }, {
797
-  //       path: '/stock/in/other',
798
-  //       component: () => import('@/xt_pages/stock/otherStockInOrder'),
799
-  //       name: 'otherStockInOrder',
800
-  //       meta: { title: 'otherStockInOrder', noCache: true }
801
-  //     }, {
802
-  //       path: '/stock/return/other',
803
-  //       component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
804
-  //       name: 'otherSalesReturnOrder',
805
-  //       meta: { title: 'otherSalesReturnOrder', noCache: true }
806
-  //     },{
807
-  //       path: '/stock/out/other',
808
-  //       component: () => import('@/xt_pages/stock/otherStockOutOrder'),
809
-  //       name: 'otherStockOutOrder',
810
-  //       meta: { title: 'otherStockOutOrder', noCache: true }
811
-  //     }, {
812
-  //       path: '/stock/cancel/other',
813
-  //       component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
814
-  //       name: 'otherCancelStockOrder',
815
-  //       meta: { title: 'otherCancelStockOrder', noCache: true }
816
-  //     }, {
817
-  //       path: '/stock/query',
818
-  //       component: () => import('@/xt_pages/stock/stockQuery'),
819
-  //       name: 'stockQuery',
820
-  //       meta: { title: 'stockQuery' }
821
-  //     }, {
822
-  //       path: '/stock/detail',
823
-  //       component: () => import('@/xt_pages/stock/stockDetailIndex'),
824
-  //       name: 'stockDetail',
825
-  //       meta: { title: 'stockDetail' }
826
-  //     },{
827
-  //       path: '/stock/in/add',
828
-  //       component: () => import('@/xt_pages/stock/stockInOrderAdd'),
829
-  //       name: 'stockInOrderAdd',
830
-  //       hidden: true,
831
-  //       is_menu: false,
832
-  //       meta: { title: 'stockInOrderAdd' }
833
-  //     }, {
834
-  //       path: '/stock/in/detail',
835
-  //       component: () => import('@/xt_pages/stock/stockInDetail'),
836
-  //       name: 'stockInDetail',
837
-  //       hidden: true,
838
-  //       is_menu: false,
839
-  //       meta: { title: 'stockInDetail' }
840
-  //     }, {
841
-  //       path: '/stock/return/detail',
842
-  //       component: () => import('@/xt_pages/stock/salesReturnDetail'),
843
-  //       name: 'salesReturnDetail',
844
-  //       hidden: true,
845
-  //       is_menu: false,
846
-  //       meta: { title: 'salesReturnDetail' }
847
-  //     }, {
848
-  //       path: '/stock/return/add',
849
-  //       component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
850
-  //       name: 'salesReturnOrderAdd',
851
-  //       hidden: true,
852
-  //       is_menu: false,
853
-  //       meta: { title: 'salesReturnOrderAdd' }
854
-  //     }, {
855
-  //       path: '/stock/out/add',
856
-  //       component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
857
-  //       name: 'stockOutOrderAdd',
858
-  //       hidden: true,
859
-  //       is_menu: false,
860
-  //       meta: { title: 'stockOutOrderAdd', noCache: true }
861
-  //     }, {
862
-  //       path: '/stock/out/detail',
863
-  //       component: () => import('@/xt_pages/stock/stockOutDetail'),
864
-  //       name: 'stockOutDetail',
865
-  //       hidden: true,
866
-  //       is_menu: false,
867
-  //       meta: { title: 'stockOutDetail', noCache: true }
868
-  //     }, {
869
-  //       path: '/stock/cancel/add',
870
-  //       component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
871
-  //       name: 'cancelStockOrderAdd',
872
-  //       hidden: true,
873
-  //       is_menu: false,
874
-  //       meta: { title: 'cancelStockOrderAdd', noCache: true }
875
-  //     }, {
876
-  //       path: '/stock/cancel/detail',
877
-  //       component: () => import('@/xt_pages/stock/cancelStockDetail'),
878
-  //       name: 'cancelStockDetail',
879
-  //       hidden: true,
880
-  //       is_menu: false,
881
-  //       meta: { title: 'cancelStockDetail', noCache: true }
882
-  //     },
883
-  //     {
884
-  //       path: '/stock/config',
885
-  //       component: () => import('@/xt_pages/stock/index'),
886
-  //       name: 'config',
887
-  //       meta: { title: 'config' }
888
-  //     }
753
+      // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
754
+      // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
755
+      { path: '/dialysis/watch', component: () => import('@/xt_pages/dialysis/bloodPresssWatch'), name: 'watch', meta: { title: 'watch' }},
756
+      { path: '/dialysis/details', component: () => import('@/xt_pages/dialysis/details'), name: 'details', meta: { title: 'details' }, is_menu: false,},
757
+      {
758
+        path: '/dialysis/print/batch',
759
+        component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
760
+        hidden: true,
761
+        is_menu: false,
762
+        name: 'dialysis_batch_print',
763
+        meta: { title: '批量打印', noCache: true }
764
+      },
765
+      { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
766
+    ]
767
+  },
768
+  {
769
+    path: '/stock/',
770
+    component: Layout,
771
+    redirect: 'noredirect',
772
+    name: 'stockManage',
773
+    meta: { title: 'stockManage', icon: 'stock' },
774
+    children: [
775
+      {
776
+        path: '/stock/config',
777
+        component: () => import('@/xt_pages/stock/index'),
778
+        name: 'config',
779
+        meta: { title: 'config' }
780
+      },
781
+      {
782
+        path: '/stock/in',
783
+        component: () => import('@/xt_pages/stock/stockInOrder'),
784
+        name: 'stockInOrder',
785
+        meta: { title: 'stockInOrder', noCache: true }
786
+      }, {
787
+        path: '/stock/return',
788
+        component: () => import('@/xt_pages/stock/salesReturnOrder'),
789
+        name: 'salesReturnOrder',
790
+        meta: { title: 'salesReturnOrder', noCache: true }
791
+      },
792
+      {
793
+        path: '/stock/out',
794
+        component: () => import('@/xt_pages/stock/stockOutOrder'),
795
+        name: 'stockOutOrder',
796
+        meta: { title: 'stockOutOrder', noCache: true }
797
+      }, {
798
+        path: '/stock/cancel',
799
+        component: () => import('@/xt_pages/stock/cancelStockOrder'),
800
+        name: 'cancelStockOrder',
801
+        meta: { title: 'cancelStockOrder', noCache: true }
802
+      }, {
803
+        path: '/stock/in/other',
804
+        component: () => import('@/xt_pages/stock/otherStockInOrder'),
805
+        name: 'otherStockInOrder',
806
+        meta: { title: 'otherStockInOrder', noCache: true }
807
+      }, {
808
+        path: '/stock/return/other',
809
+        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
810
+        name: 'otherSalesReturnOrder',
811
+        meta: { title: 'otherSalesReturnOrder', noCache: true }
812
+      },{
813
+        path: '/stock/out/other',
814
+        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
815
+        name: 'otherStockOutOrder',
816
+        meta: { title: 'otherStockOutOrder', noCache: true }
817
+      }, {
818
+        path: '/stock/cancel/other',
819
+        component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
820
+        name: 'otherCancelStockOrder',
821
+        meta: { title: 'otherCancelStockOrder', noCache: true }
822
+      }, {
823
+        path: '/stock/query',
824
+        component: () => import('@/xt_pages/stock/stockQuery'),
825
+        name: 'stockQuery',
826
+        meta: { title: 'stockQuery' }
827
+      }, {
828
+        path: '/stock/detail',
829
+        component: () => import('@/xt_pages/stock/stockDetailIndex'),
830
+        name: 'stockDetail',
831
+        meta: { title: 'stockDetail' }
832
+      },{
833
+        path: '/stock/in/add',
834
+        component: () => import('@/xt_pages/stock/stockInOrderAdd'),
835
+        name: 'stockInOrderAdd',
836
+        hidden: true,
837
+        is_menu: false,
838
+        meta: { title: 'stockInOrderAdd' }
839
+      }, {
840
+        path: '/stock/in/detail',
841
+        component: () => import('@/xt_pages/stock/stockInDetail'),
842
+        name: 'stockInDetail',
843
+        hidden: true,
844
+        is_menu: false,
845
+        meta: { title: 'stockInDetail' }
846
+      }, {
847
+        path: '/stock/return/detail',
848
+        component: () => import('@/xt_pages/stock/salesReturnDetail'),
849
+        name: 'salesReturnDetail',
850
+        hidden: true,
851
+        is_menu: false,
852
+        meta: { title: 'salesReturnDetail' }
853
+      }, {
854
+        path: '/stock/return/add',
855
+        component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
856
+        name: 'salesReturnOrderAdd',
857
+        hidden: true,
858
+        is_menu: false,
859
+        meta: { title: 'salesReturnOrderAdd' }
860
+      }, {
861
+        path: '/stock/out/add',
862
+        component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
863
+        name: 'stockOutOrderAdd',
864
+        hidden: true,
865
+        is_menu: false,
866
+        meta: { title: 'stockOutOrderAdd', noCache: true }
867
+      }, {
868
+        path: '/stock/out/detail',
869
+        component: () => import('@/xt_pages/stock/stockOutDetail'),
870
+        name: 'stockOutDetail',
871
+        hidden: true,
872
+        is_menu: false,
873
+        meta: { title: 'stockOutDetail', noCache: true }
874
+      }, {
875
+        path: '/stock/cancel/add',
876
+        component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
877
+        name: 'cancelStockOrderAdd',
878
+        hidden: true,
879
+        is_menu: false,
880
+        meta: { title: 'cancelStockOrderAdd', noCache: true }
881
+      }, {
882
+        path: '/stock/cancel/detail',
883
+        component: () => import('@/xt_pages/stock/cancelStockDetail'),
884
+        name: 'cancelStockDetail',
885
+        hidden: true,
886
+        is_menu: false,
887
+        meta: { title: 'cancelStockDetail', noCache: true }
888
+      }
889
 
889
 
890
-  //   ]
891
-  //  },
892
-  //  {
893
-  //    path: '/qcd',
894
-  //    component: Layout,
895
-  //    redirect: '/qcd/dialysistotal',
896
-  //    name: 'qcd',
897
-  //    alwaysShow: true,
898
-  //    meta: { title: '科室质控', icon: 'table' },
899
-  //    children: [
900
-  //      { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
901
-  //      { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
902
-  //      { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
903
-  //      { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
904
-  //      { path: '/qcd/outcomeIndicators/query', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
905
-  //      { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '患者分析' }},
906
-  //      { path: '/qcd/patientanalysis/weight',hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
907
-  //      { path: '/qcd/patientanalysis/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
908
-  //      { path: '/qcd/patientanalysis/dialysisage', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
909
-  //      { path: '/qcd/patientanalysis/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
910
-  //      { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
911
-  //      { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
912
-  //      { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
913
-  //      { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
914
-  //      { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
915
-  //      { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
916
-  //      { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }},
917
-  //    ]
918
-  //  },
919
-  //  {
920
-  //   path: '/data/',
921
-  //   component: Layout,
922
-  //   redirect: 'noredirect',
923
-  //   name: 'data',
924
-  //   meta: { title: 'data_dictionary', icon: 'excel' },
925
-  //   children: [
926
-  //     { path: '/data/dictionary', component: () => import('@/xt_pages/data/index'), name: 'dictionary', meta: { title: 'field_config' }},
927
-  //     { path: '/data/template', component: () => import('@/xt_pages/data/template'), name: 'template', meta: { title: 'template' }},
928
-  //     { path: '/data/druguse', component: () => import('@/xt_pages/data/druguseTemplate'), name: 'druguse', meta: { title: 'druguse' }}
929
-  //   ]
930
-  // },
931
-  // {
932
-  //   path: '/device',
933
-  //   component: Layout,
934
-  //   redirect: '/device/main',
935
-  //   name: 'device',
936
-  //   alwaysShow: true,
937
-  //   meta: { title: 'deviceManage', icon: 'shebei' },
938
-  //   children: [
939
-  //     { path: '/device/zones', component: () => import('@/xt_pages/device/zone_main'), name: 'deviceZoneManage', meta: { title: 'deviceZoneManage' }},
940
-  //     { path: '/device/groups', component: () => import('@/xt_pages/device/group_main'), name: 'deviceGroupManage', meta: { title: 'deviceGroupManage' }},
941
-  //     { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
942
-  //     { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
943
-  //   ]
944
-  // },
890
+    ]
891
+   },
892
+   {
893
+     path: '/qcd',
894
+     component: Layout,
895
+     redirect: '/qcd/dialysistotal',
896
+     name: 'qcd',
897
+     alwaysShow: true,
898
+     meta: { title: '科室质控', icon: 'table' },
899
+     children: [
900
+       { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
901
+       { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
902
+       { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
903
+       { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
904
+       { path: '/qcd/outcomeIndicators/query', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
905
+       { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '患者分析' }},
906
+       { path: '/qcd/patientanalysis/weight',hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
907
+       { path: '/qcd/patientanalysis/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
908
+       { path: '/qcd/patientanalysis/dialysisage', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
909
+       { path: '/qcd/patientanalysis/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
910
+       { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
911
+       { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
912
+       { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
913
+       { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
914
+       { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
915
+       { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
916
+       { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }},
917
+     ]
918
+   },
919
+   {
920
+    path: '/data/',
921
+    component: Layout,
922
+    redirect: 'noredirect',
923
+    name: 'data',
924
+    meta: { title: 'data_dictionary', icon: 'excel' },
925
+    children: [
926
+      { path: '/data/dictionary', component: () => import('@/xt_pages/data/index'), name: 'dictionary', meta: { title: 'field_config' }},
927
+      { path: '/data/template', component: () => import('@/xt_pages/data/template'), name: 'template', meta: { title: 'template' }},
928
+      { path: '/data/druguse', component: () => import('@/xt_pages/data/druguseTemplate'), name: 'druguse', meta: { title: 'druguse' }}
929
+    ]
930
+  },
931
+  {
932
+    path: '/device',
933
+    component: Layout,
934
+    redirect: '/device/main',
935
+    name: 'device',
936
+    alwaysShow: true,
937
+    meta: { title: 'deviceManage', icon: 'shebei' },
938
+    children: [
939
+      { path: '/device/zones', component: () => import('@/xt_pages/device/zone_main'), name: 'deviceZoneManage', meta: { title: 'deviceZoneManage' }},
940
+      { path: '/device/groups', component: () => import('@/xt_pages/device/group_main'), name: 'deviceGroupManage', meta: { title: 'deviceGroupManage' }},
941
+      { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
942
+      { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
943
+    ]
944
+  },
945
   // /////////////////////////////////////线在end
945
   // /////////////////////////////////////线在end
946
   {
946
   {
947
     path: '/role',
947
     path: '/role',

+ 2 - 2
src/views/layout/components/Navbar.vue View File

6
     <el-menu class="navbar" mode="horizontal">
6
     <el-menu class="navbar" mode="horizontal">
7
       <div>
7
       <div>
8
         <el-dropdown trigger="click" style="color:#fff;">
8
         <el-dropdown trigger="click" style="color:#fff;">
9
-        <span class="el-dropdown-link">{{orgname}}
9
+        <span class="el-dropdown-link">{{ this.$store.getters.xt_user.org.org_name }}
10
           <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
10
           <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
11
         </span>
11
         </span>
12
         </el-dropdown>
12
         </el-dropdown>
82
   export default {
82
   export default {
83
     data() {
83
     data() {
84
       return {
84
       return {
85
-        orgname:'',
85
+        orgname: ''
86
       }
86
       }
87
     },
87
     },
88
     components: {
88
     components: {

+ 6 - 1
src/views/layout/components/Sidebar/index.vue View File

5
     </div>
5
     </div>
6
     <el-menu
6
     <el-menu
7
       mode="vertical"
7
       mode="vertical"
8
-      unique-opened="ture"
8
+      :unique-opened="uniqueOpened"
9
       :show-timeout="200"
9
       :show-timeout="200"
10
       :default-active="$route.path"
10
       :default-active="$route.path"
11
       :collapse="isCollapse"
11
       :collapse="isCollapse"
32
       return !this.sidebar.opened;
32
       return !this.sidebar.opened;
33
     }
33
     }
34
   },
34
   },
35
+  data(){
36
+    return{
37
+      uniqueOpened:true,
38
+    }
39
+  },
35
   methods:{
40
   methods:{
36
     toggleSideBar() {
41
     toggleSideBar() {
37
       this.$store.dispatch("toggleSideBar");
42
       this.$store.dispatch("toggleSideBar");

File diff suppressed because it is too large
+ 476 - 557
src/xt_pages/data/druguseTemplate.vue


+ 2 - 2
src/xt_pages/home/modify_user_info_dialog.vue View File

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
-        <el-dialog title="修改个人信息" modal-append-to-body="false" append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
3
+        <el-dialog title="修改个人信息" :modal-append-to-body="false" :append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
4
             <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
4
             <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
5
                     v-loading="uploading">
5
                     v-loading="uploading">
6
                 <el-form-item label="账号:">
6
                 <el-form-item label="账号:">
34
             </div>
34
             </div>
35
         </el-dialog>
35
         </el-dialog>
36
 
36
 
37
-        <el-dialog title="修改密码" modal-append-to-body="false" append-to-body="true" :visible.sync="pwd_dialog_visible">
37
+        <el-dialog title="修改密码" :modal-append-to-body="false" :append-to-body="true" :visible.sync="pwd_dialog_visible">
38
             <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
38
             <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
39
                 <el-form-item label="账号:">
39
                 <el-form-item label="账号:">
40
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
40
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>

+ 138 - 157
src/xt_pages/sign/index.vue View File

10
                 <div class="dataTitle">患者列表</div>
10
                 <div class="dataTitle">患者列表</div>
11
                 <div style="margin-bottom: 10px;">
11
                 <div style="margin-bottom: 10px;">
12
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
12
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
13
-                    <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</el-button>
13
+                    <el-button type="primary" @change="changeSearch">搜索</el-button>
14
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
14
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
15
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
15
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
16
                     </el-select>
16
                     </el-select>
17
                 </div>
17
                 </div>
18
 
18
 
19
-                <el-table :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">
19
+                <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">
20
                     <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
20
                     <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
21
                     <el-table-column prop="name" label="姓名" min-width="20" align="center">
21
                     <el-table-column prop="name" label="姓名" min-width="20" align="center">
22
                        <template slot-scope="scope">
22
                        <template slot-scope="scope">
39
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
39
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
40
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
40
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
41
                         <template slot-scope="scope">
41
                         <template slot-scope="scope">
42
+<<<<<<< .mine
42
                            {{scope.row.before}} / {{scope.row.after}}
43
                            {{scope.row.before}} / {{scope.row.after}}
44
+=======
45
+                            {{scope.row.before}} / {{scope.row.after}}
46
+>>>>>>> .theirs
43
                         </template>
47
                         </template>
44
                     </el-table-column>
48
                     </el-table-column>
45
                 </el-table>
49
                 </el-table>
47
 
51
 
48
             <el-col :span="16">
52
             <el-col :span="16">
49
                 <div class="dataTitle">患者信息</div>
53
                 <div class="dataTitle">患者信息</div>
50
-                <el-form class="information">
54
+                <el-form class="information" label-position="left">
51
                   <div class="inforTitle">
55
                   <div class="inforTitle">
52
                   <el-button  @click="change()" style="float:right;">修改</el-button>
56
                   <el-button  @click="change()" style="float:right;">修改</el-button>
53
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
57
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
54
                    </div>
58
                    </div>
55
-                    <div class="border"></div>       
59
+                    <div class="border"></div>
56
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
60
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
57
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
61
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
58
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
62
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
59
                     </div>
63
                     </div>
60
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
64
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
61
-                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
62
-                     <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
63
-                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
64
-                     脉率(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
65
-                    </div> 
66
-                     <div class="border"></div> 
67
-                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
65
+                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
66
+                     脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
67
+                     呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
68
+                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
69
+                    </div>
70
+                    <div class="border"></div>
71
+                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
68
                      透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
72
                      透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
69
                      干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
73
                      干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
70
                     </div>
74
                     </div>
71
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
75
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
72
-                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
73
-                      <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
74
-                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
75
-                      脉率(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
76
-                    </div>      
76
+                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
77
+                      脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
78
+                      呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
79
+                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
80
+                    </div>
81
+
77
                     <div class="border"></div>
82
                     <div class="border"></div>
78
                     <div v-if="show">
83
                     <div v-if="show">
79
                     <el-row :gutter="20">
84
                     <el-row :gutter="20">
91
 </template>
96
 </template>
92
 
97
 
93
 <script>
98
 <script>
94
-import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata,sighdata} from '@/api/signandweigh'
99
+import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata, sighdata } from '@/api/signandweigh'
95
 import BreadCrumb from '../components/bread-crumb'
100
 import BreadCrumb from '../components/bread-crumb'
96
 export default {
101
 export default {
97
   name: 'sign',
102
   name: 'sign',
99
   data() {
104
   data() {
100
     return {
105
     return {
101
       crumbs: [
106
       crumbs: [
102
-          { path: '/sign/index', name: '签到称重' }
103
-        ],
107
+        { path: '/sign/index', name: '签到称重' }
108
+      ],
104
       patientlist: [],
109
       patientlist: [],
105
       signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
110
       signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
106
       queryParams: {
111
       queryParams: {
137
         DBP_after: '', // 舒张压
142
         DBP_after: '', // 舒张压
138
         SBP_after: '', // 收缩压
143
         SBP_after: '', // 收缩压
139
         dialysis_no: ''
144
         dialysis_no: ''
140
-       
145
+
141
       },
146
       },
142
       weigh_list: {
147
       weigh_list: {
143
         weight_before: '', // 透前体重
148
         weight_before: '', // 透前体重
188
       patients: [],
193
       patients: [],
189
       dialysis_stege: 0,
194
       dialysis_stege: 0,
190
       show: false,
195
       show: false,
191
-      disa:true,
192
-      signnid:"",
196
+      disa: true
193
     }
197
     }
194
   },
198
   },
195
   methods: {
199
   methods: {
196
     fetchSignPatients() {
200
     fetchSignPatients() {
197
       fetchSignPatients(this.queryParams).then(response => {
201
       fetchSignPatients(this.queryParams).then(response => {
198
-        this.patients = []      
202
+        this.patients = []
199
         if (response.data.state === 1) {
203
         if (response.data.state === 1) {
200
           this.patients = response.data.data.patients
204
           this.patients = response.data.data.patients
201
-          // console.log("病人信息",this.patients[0].schedule)           
202
-            //将没有排班的信息排除
203
-            console.log("病人信息",this.patients)
204
-            for(let i = this.patients.length-1;i>=0;i--){    
205
-             if(this.patients[i].schedule.id == 0){
206
-                 this.patients.splice(i,1)
207
-             }   
205
+          console.log('病人信息', this.patients[0].schedule)
206
+          // 将没有排班的信息排除
207
+          for (let i = this.patients.length - 1; i >= 0; i--) {
208
+            if (this.patients[i].schedule.id == 0) {
209
+              this.patients.splice(i, 1)
210
+            }
208
           }
211
           }
212
+
213
+          for (let i = this.patients.length - 1; ; i--) {
214
+            if (this.patients[i].schedule.id == 0) {
215
+              this.patients.splice(i, 1)
216
+            }
217
+          }
218
+
209
           this.queryParams.schedule_type = response.data.data.schedule_type
219
           this.queryParams.schedule_type = response.data.data.schedule_type
210
           this.querySignParams.date_time = response.data.data.today
220
           this.querySignParams.date_time = response.data.data.today
211
 
221
 
212
           if (this.queryParams.need_schedule_type === 1) {
222
           if (this.queryParams.need_schedule_type === 1) {
213
             var sl = this.schedules.length
223
             var sl = this.schedules.length
214
-            console.log("s1是什么东西")
224
+            console.log('s1是什么东西')
215
             console.log(sl)
225
             console.log(sl)
216
             for (let index = 0; index < sl; index++) {
226
             for (let index = 0; index < sl; index++) {
217
               if (this.schedules[index].type in response.data.data.panel) {
227
               if (this.schedules[index].type in response.data.data.panel) {
227
         }
237
         }
228
       })
238
       })
229
     },
239
     },
230
-      // getPatientSign(){
231
-      //     getPatientSign(this.querySignParams).then(response=>{
232
-      //         if (response.data.state==1) {
233
-      //             if (response.data.data.sign != null) {
234
-      //                 var sign = response.data.data.sign;
235
-      //                 this.weigh_form.dry_weight = sign.dry_weight;
236
-      //                 this.weigh_form.clothes_weight = sign.clothes_weight;
237
-      //                   // 透前
238
-      //                 this.weigh_form.weigh_before = sign.weigh_before;
239
-      //                 this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
240
-      //                 this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
241
-      //                 this.weigh_form.weight_before = sign.weight_before;
242
-      //                 this.weigh_form.temperature_before = sign.temperature_before;
243
-      //                 this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
244
-      //                 this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
245
-      //                 this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
246
-      //                 this.weigh_form.SBP_before = sign.SBP_before // 收缩压
247
-      //                   // 透后
248
-      //                 this.weigh_form.weigh_after = sign.weigh_after;
249
-      //                 this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
250
-      //                 this.weigh_form.weight_after = sign.weight_after
251
-      //                 this.weigh_form.temperature_after = sign.temperature_after;
252
-      //                 this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
253
-      //                 this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
254
-      //                 this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
255
-      //                 this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
256
-      //                 this.weigh_form.id=sign.id;
257
-      //             }
258
-      //         }
259
-      //     });
260
-      // },
240
+    // getPatientSign(){
241
+    //     getPatientSign(this.querySignParams).then(response=>{
242
+    //         if (response.data.state==1) {
243
+    //             if (response.data.data.sign != null) {
244
+    //                 var sign = response.data.data.sign;
245
+    //                 this.weigh_form.dry_weight = sign.dry_weight;
246
+    //                 this.weigh_form.clothes_weight = sign.clothes_weight;
247
+    //                   // 透前
248
+    //                 this.weigh_form.weigh_before = sign.weigh_before;
249
+    //                 this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
250
+    //                 this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
251
+    //                 this.weigh_form.weight_before = sign.weight_before;
252
+    //                 this.weigh_form.temperature_before = sign.temperature_before;
253
+    //                 this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
254
+    //                 this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
255
+    //                 this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
256
+    //                 this.weigh_form.SBP_before = sign.SBP_before // 收缩压
257
+    //                   // 透后
258
+    //                 this.weigh_form.weigh_after = sign.weigh_after;
259
+    //                 this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
260
+    //                 this.weigh_form.weight_after = sign.weight_after
261
+    //                 this.weigh_form.temperature_after = sign.temperature_after;
262
+    //                 this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
263
+    //                 this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
264
+    //                 this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
265
+    //                 this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
266
+    //                 this.weigh_form.id=sign.id;
267
+    //             }
268
+    //         }
269
+    //     });
270
+    // },
261
     changeSearch() {
271
     changeSearch() {
262
       this.queryParams.need_schedule_type = 0
272
       this.queryParams.need_schedule_type = 0
263
       this.fetchSignPatients()
273
       this.fetchSignPatients()
264
     },
274
     },
265
     handleCurrentChange(row, old) {
275
     handleCurrentChange(row, old) {
266
-      //     this.weigh_form = {
267
-      //     id:0,
268
-      //     choose:false,
269
-      //     name: '',
270
-      //     dry_weight: '',
271
-      //     clothes_weight: '',
272
-      //     // 透前
273
-      //     weigh_before: '',
274
-      //     dehydrated_weight: '',
275
-      //     dehydrated_percent: '',
276
-      //     weight_before: '',
277
-      //     temperature_before: '',
278
-      //     pulse_rate_before: '',  // P 脉率
279
-      //     respiratory_rate_before: '', // R 呼吸频率
280
-      //     DBP_before: '', // 舒张压
281
-      //     SBP_before: '', // 收缩压
282
-      //     // 透后
283
-      //     weigh_after: '',
284
-      //     weight_reduce_after: '',
285
-      //     weight_after: '',
286
-      //     temperature_after: '',
287
-      //     pulse_rate_after: '', // P 脉率
288
-      //     respiratory_rate_after: '', // R 呼吸频率
289
-      //     DBP_after: '', // 舒张压
290
-      //     SBP_after: '', // 收缩压
291
-      //     patient_id: 0,
292
-      //     dialysis_no:'',
293
-      // };
294
       this.disa = true
276
       this.disa = true
295
-      this.show=false
277
+      this.show = false
296
       this.weigh_form.choose = true
278
       this.weigh_form.choose = true
297
       this.weigh_form.name = row.name
279
       this.weigh_form.name = row.name
298
       this.weigh_form.dialysis_no = row.dialysis_no
280
       this.weigh_form.dialysis_no = row.dialysis_no
300
       this.querySignParams.patient_id = row.id
282
       this.querySignParams.patient_id = row.id
301
       this.dialysis_stege = row.dialysis_order.stage
283
       this.dialysis_stege = row.dialysis_order.stage
302
       this.getDialysisInforInfomation(row.id)
284
       this.getDialysisInforInfomation(row.id)
303
-      this.getDialysisAfterInfomation(row.id) 
304
-      //this.getsignweigh(row.id)    
285
+      this.getDialysisAfterInfomation(row.id)
286
+
287
+      // this.getsignweigh(row.id)
305
     },
288
     },
306
     // submitSign() {
289
     // submitSign() {
307
     //   SignWeigh(this.querySignParams, this.weigh_form).then(response => {
290
     //   SignWeigh(this.querySignParams, this.weigh_form).then(response => {
350
         if (response.data.data.patientlist != null) {
333
         if (response.data.data.patientlist != null) {
351
           var patientlist = response.data.data.patientlist
334
           var patientlist = response.data.data.patientlist
352
           this.weigh_list.dry_weight = patientlist.dry_weight
335
           this.weigh_list.dry_weight = patientlist.dry_weight
353
-          console.log("干体重:"+this.weigh_list.dry_weight)
354
-          if(this.weigh_list.dry_weight == 0){
355
-              this.weigh_list.dry_weight = ""
336
+          console.log('干体重:' + this.weigh_list.dry_weight)
337
+          if (this.weigh_list.dry_weight == 0) {
338
+            this.weigh_list.dry_weight = ''
356
           }
339
           }
357
           this.weigh_list.weight_before = patientlist.weight_before
340
           this.weigh_list.weight_before = patientlist.weight_before
358
-          if(this.weigh_list.weight_before == 0){
359
-              this.weigh_list.weight_before = ""
341
+          if (this.weigh_list.weight_before == 0) {
342
+            this.weigh_list.weight_before = ''
360
           }
343
           }
361
           this.weigh_list.temperature = patientlist.temperature
344
           this.weigh_list.temperature = patientlist.temperature
362
-          if(this.weigh_list.temperature == 0){
363
-              this.weigh_list.temperature = ""
345
+          if (this.weigh_list.temperature == 0) {
346
+            this.weigh_list.temperature = ''
364
           }
347
           }
365
           this.weigh_list.pulse_frequency = patientlist.pulse_frequency
348
           this.weigh_list.pulse_frequency = patientlist.pulse_frequency
366
-          if(this.weigh_list.pulse_frequency == 0){
367
-              this.weigh_list.pulse_frequency = ""
349
+          if (this.weigh_list.pulse_frequency == 0) {
350
+            this.weigh_list.pulse_frequency = ''
368
           }
351
           }
369
           this.weigh_list.breathing_rate = patientlist.breathing_rate
352
           this.weigh_list.breathing_rate = patientlist.breathing_rate
370
-          if(this.weigh_list.breathing_rate == 0){
371
-              this.weigh_list.breathing_rate = ""
353
+          if (this.weigh_list.breathing_rate == 0) {
354
+            this.weigh_list.breathing_rate = ''
372
           }
355
           }
373
           this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
356
           this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
374
-          if(this.weigh_list.systolic_blood_pressure == 0){
375
-             this.weigh_list.systolic_blood_pressure = ""
357
+          if (this.weigh_list.systolic_blood_pressure == 0) {
358
+            this.weigh_list.systolic_blood_pressure = ''
376
           }
359
           }
377
           this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
360
           this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
378
-          if(this.weigh_list.diastolic_blood_pressure == 0){
379
-               this.weigh_list.diastolic_blood_pressure = ""
361
+          if (this.weigh_list.diastolic_blood_pressure == 0) {
362
+            this.weigh_list.diastolic_blood_pressure = ''
380
           }
363
           }
381
         }
364
         }
382
       })
365
       })
388
           var patientinfor = response.data.data.patientinfor
371
           var patientinfor = response.data.data.patientinfor
389
           console.log(patientinfor)
372
           console.log(patientinfor)
390
           this.weigh_infor.dry_weight = patientinfor.dry_weight
373
           this.weigh_infor.dry_weight = patientinfor.dry_weight
391
-          if(this.weigh_infor.dry_weight == 0){
392
-              this.weigh_infor.dry_weight = ""
374
+          if (this.weigh_infor.dry_weight == 0) {
375
+            this.weigh_infor.dry_weight = ''
393
           }
376
           }
394
 
377
 
395
           this.weigh_infor.weight_after = patientinfor.weight_after
378
           this.weigh_infor.weight_after = patientinfor.weight_after
396
-          if(this.weigh_infor.weight_after == 0){
397
-              this.weigh_infor.weight_after = ""
379
+          if (this.weigh_infor.weight_after == 0) {
380
+            this.weigh_infor.weight_after = ''
398
           }
381
           }
399
 
382
 
400
           this.weigh_infor.temperature = patientinfor.temperature
383
           this.weigh_infor.temperature = patientinfor.temperature
401
-          if(this.weigh_infor.temperature == 0){
402
-               this.weigh_infor.temperature = ""
384
+          if (this.weigh_infor.temperature == 0) {
385
+            this.weigh_infor.temperature = ''
403
           }
386
           }
404
           this.weigh_infor.pulse_frequency = patientinfor.pulse_frequency
387
           this.weigh_infor.pulse_frequency = patientinfor.pulse_frequency
405
-          if(this.weigh_infor.pulse_frequency == 0 ){
406
-              this.weigh_infor.pulse_frequency = ""
388
+          if (this.weigh_infor.pulse_frequency == 0) {
389
+            this.weigh_infor.pulse_frequency = ''
407
           }
390
           }
408
           this.weigh_infor.breathing_rate = patientinfor.breathing_rate
391
           this.weigh_infor.breathing_rate = patientinfor.breathing_rate
409
-          if(this.weigh_infor.breathing_rate == 0){
410
-              this.weigh_infor.breathing_rate = ""
392
+          if (this.weigh_infor.breathing_rate == 0) {
393
+            this.weigh_infor.breathing_rate = ''
411
           }
394
           }
412
           this.weigh_infor.systolic_blood_pressure = patientinfor.systolic_blood_pressure
395
           this.weigh_infor.systolic_blood_pressure = patientinfor.systolic_blood_pressure
413
-          if(this.weigh_infor.systolic_blood_pressure == 0){
414
-              this.weigh_infor.systolic_blood_pressure = ""
396
+          if (this.weigh_infor.systolic_blood_pressure == 0) {
397
+            this.weigh_infor.systolic_blood_pressure = ''
415
           }
398
           }
416
 
399
 
417
           this.weigh_infor.diastolic_blood_pressure = patientinfor.diastolic_blood_pressure
400
           this.weigh_infor.diastolic_blood_pressure = patientinfor.diastolic_blood_pressure
418
-           if(this.weigh_infor.diastolic_blood_pressure == 0){
419
-              this.weigh_infor.diastolic_blood_pressure = ""
420
-           }
421
-
401
+          if (this.weigh_infor.diastolic_blood_pressure == 0) {
402
+            this.weigh_infor.diastolic_blood_pressure = ''
403
+          }
422
         }
404
         }
423
       })
405
       })
424
     },
406
     },
470
       console.log(params)
452
       console.log(params)
471
     },
453
     },
472
     sighdata() {
454
     sighdata() {
473
-      //透前数据
455
+      // 透前数据
474
       var params = new Object()
456
       var params = new Object()
475
       var data_time = this.querySignParams.date_time
457
       var data_time = this.querySignParams.date_time
476
       params.date_time = data_time
458
       params.date_time = data_time
483
       params.systolic_blood_pressure = this.weigh_list.systolic_blood_pressure
465
       params.systolic_blood_pressure = this.weigh_list.systolic_blood_pressure
484
       params.diastolic_blood_pressure = this.weigh_list.diastolic_blood_pressure
466
       params.diastolic_blood_pressure = this.weigh_list.diastolic_blood_pressure
485
 
467
 
486
-      //透后数据
468
+      // 透后数据
487
       params.weight_after = this.weigh_infor.weight_after
469
       params.weight_after = this.weigh_infor.weight_after
488
       params.temperatureafter = this.weigh_infor.temperature
470
       params.temperatureafter = this.weigh_infor.temperature
489
       params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
471
       params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
490
       params.breathing_rateafter = this.weigh_infor.breathing_rate
472
       params.breathing_rateafter = this.weigh_infor.breathing_rate
491
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
473
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
492
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
474
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
493
-       console.log("params是什么?",params)
475
+      console.log('params是什么?', params)
494
       sighdata(params).then(response => {
476
       sighdata(params).then(response => {
477
+        var signs = response.data.data.signs
478
+        // this.patients[this.table_current_index].signin.id = 1
495
         if (response.data.state === 1) {
479
         if (response.data.state === 1) {
496
-           var signs = response.data.data.signs
497
-           this.signnid = signs.id
498
-           console.log("hheh",signs.id)
499
           this.$message({
480
           this.$message({
500
             type: 'success',
481
             type: 'success',
501
             message: '成功!'
482
             message: '成功!'
502
           })
483
           })
503
-        var tlen = this.patients.length
504
-        
505
-        for(let index=0;index<tlen;index++ ){
506
-           if(this.patients[index].id == params.patient_id){
484
+          var tlen = this.patients.length
485
+
486
+          for (let index = 0; index < tlen; index++) {
487
+            if (this.patients[index].id == params.patient_id) {
507
               var signin = this.patients[index].signin
488
               var signin = this.patients[index].signin
508
-              this.patients[index].signin = response.data.data.signs              
509
-              if(this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)){
510
-                    var sl = this.schedules.length
511
-                    for(let j = 0; j < sl; j++){
512
-                         if(this.schedules[j].type == this.patients[index].schedule.schedule_type){
513
-                              if((signin.weigh_before_time == 0 && response.data.data.signs.weigh_before_time > 0)||(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)){
514
-                                    this.schedules[j].sign++
515
-                              }
516
-                              if(signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0){
517
-
518
-                                   this.schedules[j].before++
519
-                              }
520
-                              if(signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0){
521
-                                  this.schedules[j].after++
522
-                              }
523
-                         }
489
+              this.patients[index].signin = response.data.data.signs
490
+
491
+              if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
492
+                var sl = this.schedules.length
493
+                for (let j = 0; j < sl; j++) {
494
+                  if (this.schedules[j].type == this.patients[index].schedule.schedule_type) {
495
+                    if ((signin.weigh_before_time == 0 && response.data.data.signs.weigh_before_time > 0) || (signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)) {
496
+                      this.schedules[j].sign++
524
                     }
497
                     }
498
+                    if (signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0) {
499
+                      this.schedules[j].before++
500
+                    }
501
+                    if (signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0) {
502
+                      this.schedules[j].after++
503
+                    }
504
+                  }
505
+                }
525
               }
506
               }
526
               break
507
               break
527
-           }
528
-         }
529
-           this.weigh_form.id = response.data.data.signs.id
530
-        }else{
531
-           this.$message.error(response.data.msg)
532
-           return false
508
+            }
509
+          }
510
+          this.weigh_form.id = response.data.data.signs.id
511
+        } else {
512
+          this.$message.error(response.data.msg)
513
+          return false
533
         }
514
         }
534
       })
515
       })
535
-     }   
516
+    }
536
   },
517
   },
537
   watch: {
518
   watch: {
538
     'weigh_form.weigh_before': function() {
519
     'weigh_form.weigh_before': function() {

+ 24 - 24
src/xt_pages/stock/cancelStockOrder.vue View File

12
 
12
 
13
 
13
 
14
       <div class="cell clearfix" >
14
       <div class="cell clearfix" >
15
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
16
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
15
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
16
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
17
       </div>
17
       </div>
18
 
18
 
19
       <div class="cell clearfix">
19
       <div class="cell clearfix">
20
         <label class="title"><span class="name">退库时间</span> : </label>
20
         <label class="title"><span class="name">退库时间</span> : </label>
21
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
24
         <span class="cellLine"> - </span>
24
         <span class="cellLine"> - </span>
25
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
+        <el-date-picker  size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
28
       </div>
28
       </div>
131
     name: 'salesReturnOrder',
131
     name: 'salesReturnOrder',
132
     components: { BreadCrumb },
132
     components: { BreadCrumb },
133
     created() {
133
     created() {
134
-      var nowDate = new Date();
135
-      var nowYear = nowDate.getFullYear();
136
-      var nowMonth = nowDate.getMonth() + 1;
137
-      var nowDay = nowDate.getDate();
134
+      var nowDate = new Date()
135
+      var nowYear = nowDate.getFullYear()
136
+      var nowMonth = nowDate.getMonth() + 1
137
+      var nowDay = nowDate.getDate()
138
       this.end_time =
138
       this.end_time =
139
         nowYear +
139
         nowYear +
140
-        "-" +
141
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
142
-        "-" +
143
-        (nowDay < 10 ? "0" + nowDay : nowDay);
144
-      nowDate.setMonth(nowDate.getMonth() - 1);
145
-      nowYear = nowDate.getFullYear();
146
-      nowMonth = nowDate.getMonth() + 1;
147
-      nowDay = nowDate.getDate();
140
+        '-' +
141
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
142
+        '-' +
143
+        (nowDay < 10 ? '0' + nowDay : nowDay)
144
+      nowDate.setMonth(nowDate.getMonth() - 1)
145
+      nowYear = nowDate.getFullYear()
146
+      nowMonth = nowDate.getMonth() + 1
147
+      nowDay = nowDate.getDate()
148
       this.start_time =
148
       this.start_time =
149
         nowYear +
149
         nowYear +
150
-        "-" +
151
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
152
-        "-" +
153
-        (nowDay < 10 ? "0" + nowDay : nowDay);
150
+        '-' +
151
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
152
+        '-' +
153
+        (nowDay < 10 ? '0' + nowDay : nowDay)
154
 
154
 
155
       this.GetCancelStock()
155
       this.GetCancelStock()
156
       this.GetConfigInfo()
156
       this.GetConfigInfo()
162
           { path: false, name: '库存管理' },
162
           { path: false, name: '库存管理' },
163
           { path: false, name: '出库退库单' }
163
           { path: false, name: '出库退库单' }
164
         ],
164
         ],
165
-        searchKey:'',
165
+        searchKey: '',
166
         type: 1,
166
         type: 1,
167
         page: 1,
167
         page: 1,
168
         limit: 7,
168
         limit: 7,
185
       }
185
       }
186
     },
186
     },
187
     methods: {
187
     methods: {
188
-      search:function(){
188
+      search: function() {
189
         const Params = {
189
         const Params = {
190
           page: this.page,
190
           page: this.page,
191
           limit: this.limit,
191
           limit: this.limit,
192
           start_time: this.start_time,
192
           start_time: this.start_time,
193
           end_time: this.end_time,
193
           end_time: this.end_time,
194
           type: this.type,
194
           type: this.type,
195
-          keywords:this.searchKey,
195
+          keywords: this.searchKey
196
         }
196
         }
197
         this.cancelStockDate = []
197
         this.cancelStockDate = []
198
         getCancelStockList(Params).then(response => {
198
         getCancelStockList(Params).then(response => {
299
           }
299
           }
300
         }
300
         }
301
       }, handleEdit: function(index, row) {
301
       }, handleEdit: function(index, row) {
302
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
302
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
303
       }, handleDelete: function(index, row) {
303
       }, handleDelete: function(index, row) {
304
         const ids = []
304
         const ids = []
305
         ids.push(row.id)
305
         ids.push(row.id)

+ 15 - 17
src/xt_pages/stock/cancelStockOrderAdd.vue View File

21
         <div class="cell clearfix">
21
         <div class="cell clearfix">
22
           <label class="title"><span class="name">退库时间</span> : </label>
22
           <label class="title"><span class="name">退库时间</span> : </label>
23
 
23
 
24
-          <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
24
+          <el-date-picker  size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
                           type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
25
                           type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                           value-format="yyyy-MM-dd"></el-date-picker>
26
                           value-format="yyyy-MM-dd"></el-date-picker>
27
         </div>
27
         </div>
28
         <div class="cell clearfix">
28
         <div class="cell clearfix">
29
           <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
29
           <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
30
-          <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
30
+          <el-select  size="small"   v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
31
             <el-option
31
             <el-option
32
               v-for="(option, index) in manufacturer"
32
               v-for="(option, index) in manufacturer"
33
               :key="index"
33
               :key="index"
39
 
39
 
40
         <div class="cell clearfix">
40
         <div class="cell clearfix">
41
           <label class="title"><span class="name">经销商</span> : </label>
41
           <label class="title"><span class="name">经销商</span> : </label>
42
-          <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
42
+          <el-select   size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商" >
43
             <el-option
43
             <el-option
44
               v-for="(option, index) in dealer"
44
               v-for="(option, index) in dealer"
45
               :key="index"
45
               :key="index"
194
               tempForm['good_type_id'] = val.goodTypeId
194
               tempForm['good_type_id'] = val.goodTypeId
195
               tempForm['good_id'] = val.selectedGoodInfo[i].id
195
               tempForm['good_id'] = val.selectedGoodInfo[i].id
196
               tempForm['return_count'] = ''
196
               tempForm['return_count'] = ''
197
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
198
-
197
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
199
             }
198
             }
200
           }
199
           }
201
         }
200
         }
203
         this.currentIndex = -1
202
         this.currentIndex = -1
204
       }, cancle: function() {
203
       }, cancle: function() {
205
         this.$refs.dialog.hide()
204
         this.$refs.dialog.hide()
206
-
207
       }, GetConfigInfo: function() {
205
       }, GetConfigInfo: function() {
208
         const params = {
206
         const params = {
209
           type: this.$route.query.type
207
           type: this.$route.query.type
270
         tempObj['return_count'] = ''
268
         tempObj['return_count'] = ''
271
         this.recordInfo.recordData.push(tempObj)
269
         this.recordInfo.recordData.push(tempObj)
272
       }, handleDelete: function(index, row) {
270
       }, handleDelete: function(index, row) {
273
-        if( this.recordInfo.recordData.length <= 1){
271
+        if (this.recordInfo.recordData.length <= 1) {
274
           this.$message.error('只有一条记录的时候无法删除')
272
           this.$message.error('只有一条记录的时候无法删除')
275
           return
273
           return
276
-        }else{
274
+        } else {
277
           this.recordInfo.recordData.splice(index, 1)
275
           this.recordInfo.recordData.splice(index, 1)
278
         }
276
         }
279
       }, calculate: function(val) {
277
       }, calculate: function(val) {
351
             return false
349
             return false
352
           }
350
           }
353
         })
351
         })
354
-      },changeManufacturer(){
352
+      }, changeManufacturer() {
355
         this.recordInfo.recordData = []
353
         this.recordInfo.recordData = []
356
         const tempObj = {}
354
         const tempObj = {}
357
         tempObj['good_type_id'] = 0
355
         tempObj['good_type_id'] = 0
361
       }
359
       }
362
     },
360
     },
363
     created() {
361
     created() {
364
-      var nowDate = new Date();
365
-      var nowYear = nowDate.getFullYear();
366
-      var nowMonth = nowDate.getMonth() + 1;
367
-      var nowDay = nowDate.getDate();
362
+      var nowDate = new Date()
363
+      var nowYear = nowDate.getFullYear()
364
+      var nowMonth = nowDate.getMonth() + 1
365
+      var nowDay = nowDate.getDate()
368
       this.return_time =
366
       this.return_time =
369
         nowYear +
367
         nowYear +
370
-        "-" +
371
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
372
-        "-" +
373
-        (nowDay < 10 ? "0" + nowDay : nowDay);
368
+        '-' +
369
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
370
+        '-' +
371
+        (nowDay < 10 ? '0' + nowDay : nowDay)
374
 
372
 
375
       const tempObj = {}
373
       const tempObj = {}
376
       tempObj['good_type_id'] = 0
374
       tempObj['good_type_id'] = 0

+ 5 - 14
src/xt_pages/stock/cancelStockOrderEdit.vue View File

16
       <div class="cell clearfix">
16
       <div class="cell clearfix">
17
 
17
 
18
         <label class="title"><span class="name">退库时间</span> : </label>
18
         <label class="title"><span class="name">退库时间</span> : </label>
19
-        <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
19
+        <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
20
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         value-format="yyyy-MM-dd"></el-date-picker>
21
                         value-format="yyyy-MM-dd"></el-date-picker>
22
       </div>
22
       </div>
179
               tempForm['good_type_id'] = val.goodTypeId
179
               tempForm['good_type_id'] = val.goodTypeId
180
               tempForm['good_id'] = val.selectedGoodInfo[i].id
180
               tempForm['good_id'] = val.selectedGoodInfo[i].id
181
               tempForm['count'] = ''
181
               tempForm['count'] = ''
182
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
183
-
182
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
184
             }
183
             }
185
           }
184
           }
186
         }
185
         }
188
         this.currentIndex = -1
187
         this.currentIndex = -1
189
       }, cancle: function() {
188
       }, cancle: function() {
190
         this.$refs.dialog.hide()
189
         this.$refs.dialog.hide()
191
-
192
       }, GetConfigInfo: function() {
190
       }, GetConfigInfo: function() {
193
         const params = {
191
         const params = {
194
           type: this.$route.query.type
192
           type: this.$route.query.type
255
                 this.$message.error(response.data.msg)
253
                 this.$message.error(response.data.msg)
256
                 return false
254
                 return false
257
               } else {
255
               } else {
258
-
259
-                this.$message.success("删除成功")
256
+                this.$message.success('删除成功')
260
                 this.recordInfo.recordData.splice(index, 1)
257
                 this.recordInfo.recordData.splice(index, 1)
261
               }
258
               }
262
             })
259
             })
302
             const params = {
299
             const params = {
303
               'cancelStock': this.recordInfo.recordData
300
               'cancelStock': this.recordInfo.recordData
304
             }
301
             }
305
-            editCancelStockInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
302
+            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
306
               if (response.data.state == 0) {
303
               if (response.data.state == 0) {
307
                 this.$message.error(response.data.msg)
304
                 this.$message.error(response.data.msg)
308
                 return false
305
                 return false
309
               } else {
306
               } else {
310
-
311
                 this.$message.success('退库成功')
307
                 this.$message.success('退库成功')
312
 
308
 
313
                 this.$router.back(-1)
309
                 this.$router.back(-1)
335
             this.form.manufacturer = this.cancelStock.manufacturer
331
             this.form.manufacturer = this.cancelStock.manufacturer
336
             this.form.dealer = this.cancelStock.dealer
332
             this.form.dealer = this.cancelStock.dealer
337
           }
333
           }
338
-          if( this.recordInfo.recordData.length == 0){
334
+          if (this.recordInfo.recordData.length == 0) {
339
             const tempObj = {}
335
             const tempObj = {}
340
             tempObj['id'] = 0
336
             tempObj['id'] = 0
341
             tempObj['good_type_id'] = 0
337
             tempObj['good_type_id'] = 0
342
             tempObj['good_id'] = 0
338
             tempObj['good_id'] = 0
343
             tempObj['count'] = ''
339
             tempObj['count'] = ''
344
             this.recordInfo.recordData.push(tempObj)
340
             this.recordInfo.recordData.push(tempObj)
345
-
346
-
347
-
348
           }
341
           }
349
-
350
-
351
         })
342
         })
352
       }
343
       }
353
     },
344
     },

+ 35 - 38
src/xt_pages/stock/detail/cancelStockDetail.vue View File

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
       <div class="cell clearfix" >
3
       <div class="cell clearfix" >
4
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
4
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
6
       </div>
6
       </div>
7
 
7
 
8
       <div class="cell clearfix">
8
       <div class="cell clearfix">
9
         <label class="title"><span class="name">日期查询</span> : </label>
9
         <label class="title"><span class="name">日期查询</span> : </label>
10
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
10
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
         <span class="cellLine"> - </span>
13
         <span class="cellLine"> - </span>
14
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
14
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
       </div>
17
       </div>
19
 
19
 
20
       <div class="cell clearfix">
20
       <div class="cell clearfix">
21
         <label class="title"><span class="name">单据类型</span> : </label>
21
         <label class="title"><span class="name">单据类型</span> : </label>
22
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
22
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
23
           <el-option
23
           <el-option
24
             v-for="item in orderTypeArr"
24
             v-for="item in orderTypeArr"
25
             :key="item.value"
25
             :key="item.value"
31
 
31
 
32
       <div class="cell clearfix">
32
       <div class="cell clearfix">
33
         <label class="title"><span class="name">其它</span> : </label>
33
         <label class="title"><span class="name">其它</span> : </label>
34
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
34
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
35
           <el-option
35
           <el-option
36
             v-for="item in manufacturer"
36
             v-for="item in manufacturer"
37
             :key="item.id"
37
             :key="item.id"
111
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
111
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
112
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
112
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
113
 
113
 
114
-
115
   export default {
114
   export default {
116
     name: 'cancelStockDetail',
115
     name: 'cancelStockDetail',
117
 
116
 
118
     created() {
117
     created() {
119
-      var nowDate = new Date();
120
-      var nowYear = nowDate.getFullYear();
121
-      var nowMonth = nowDate.getMonth() + 1;
122
-      var nowDay = nowDate.getDate();
118
+      var nowDate = new Date()
119
+      var nowYear = nowDate.getFullYear()
120
+      var nowMonth = nowDate.getMonth() + 1
121
+      var nowDay = nowDate.getDate()
123
       this.end_time =
122
       this.end_time =
124
         nowYear +
123
         nowYear +
125
-        "-" +
126
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
127
-        "-" +
128
-        (nowDay < 10 ? "0" + nowDay : nowDay);
129
-      nowDate.setMonth(nowDate.getMonth() - 1);
130
-      nowYear = nowDate.getFullYear();
131
-      nowMonth = nowDate.getMonth() + 1;
132
-      nowDay = nowDate.getDate();
124
+        '-' +
125
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
126
+        '-' +
127
+        (nowDay < 10 ? '0' + nowDay : nowDay)
128
+      nowDate.setMonth(nowDate.getMonth() - 1)
129
+      nowYear = nowDate.getFullYear()
130
+      nowMonth = nowDate.getMonth() + 1
131
+      nowDay = nowDate.getDate()
133
       this.start_time =
132
       this.start_time =
134
         nowYear +
133
         nowYear +
135
-        "-" +
136
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
137
-        "-" +
138
-        (nowDay < 10 ? "0" + nowDay : nowDay);
134
+        '-' +
135
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
136
+        '-' +
137
+        (nowDay < 10 ? '0' + nowDay : nowDay)
139
       this.GetCancelStock()
138
       this.GetCancelStock()
140
       this.GetConfigInfo()
139
       this.GetConfigInfo()
141
       this.fetchAllAdminUsers()
140
       this.fetchAllAdminUsers()
149
         manufacturer_id: '',
148
         manufacturer_id: '',
150
         dealer_id: '',
149
         dealer_id: '',
151
         order_type: '',
150
         order_type: '',
152
-        searchKey:'',
151
+        searchKey: '',
153
         type: 4,
152
         type: 4,
154
         page: 1,
153
         page: 1,
155
         limit: 7,
154
         limit: 7,
173
     },
172
     },
174
     methods: {
173
     methods: {
175
       changeType: function(val) {
174
       changeType: function(val) {
176
-        this.order_type  = val
175
+        this.order_type = val
177
         this.GetCancelStock()
176
         this.GetCancelStock()
178
       }, changeManufacturer: function(val) {
177
       }, changeManufacturer: function(val) {
179
-        this.manufacturer_id  = val
178
+        this.manufacturer_id = val
180
         this.GetCancelStock()
179
         this.GetCancelStock()
181
       },
180
       },
182
-      getTypeName:function(row){
183
-        let name = ""
184
-        let name2 = ""
185
-        if (row.type == 1){
186
-          name = "耗材退库单"
187
-
188
-        }else if(row.type == 2){
189
-          name = "其他退库单"
181
+      getTypeName: function(row) {
182
+        let name = ''
183
+        const name2 = ''
184
+        if (row.type == 1) {
185
+          name = '耗材退库单'
186
+        } else if (row.type == 2) {
187
+          name = '其他退库单'
190
         }
188
         }
191
 
189
 
192
         return name
190
         return name
200
         }
198
         }
201
         return name
199
         return name
202
       },
200
       },
203
-      search:function(){
201
+      search: function() {
204
         const Params = {
202
         const Params = {
205
           page: this.page,
203
           page: this.page,
206
           limit: this.limit,
204
           limit: this.limit,
207
           start_time: this.start_time,
205
           start_time: this.start_time,
208
           end_time: this.end_time,
206
           end_time: this.end_time,
209
           type: this.type,
207
           type: this.type,
210
-          keywords:this.searchKey,
208
+          keywords: this.searchKey
211
         }
209
         }
212
         this.cancelStockDate = []
210
         this.cancelStockDate = []
213
         getStockDetail(Params).then(response => {
211
         getStockDetail(Params).then(response => {
303
             this.manufacturer = response.data.data.manufacturer
301
             this.manufacturer = response.data.data.manufacturer
304
             this.dealer = response.data.data.dealer
302
             this.dealer = response.data.data.dealer
305
             this.goodInfo = response.data.data.goodInfo
303
             this.goodInfo = response.data.data.goodInfo
306
-
307
           }
304
           }
308
         })
305
         })
309
       }, getManufactuerName: function(manufacturer_id) {
306
       }, getManufactuerName: function(manufacturer_id) {
319
           }
316
           }
320
         }
317
         }
321
       }, handleEdit: function(index, row) {
318
       }, handleEdit: function(index, row) {
322
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
319
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
323
       }, handleDelete: function(index, row) {
320
       }, handleDelete: function(index, row) {
324
         const ids = []
321
         const ids = []
325
         ids.push(row.id)
322
         ids.push(row.id)

+ 34 - 38
src/xt_pages/stock/detail/salesReturnDetail.vue View File

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
       <div class="cell clearfix" >
3
       <div class="cell clearfix" >
4
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
4
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
6
       </div>
6
       </div>
7
 
7
 
8
       <div class="cell clearfix">
8
       <div class="cell clearfix">
9
         <label class="title"><span class="name">日期查询</span> : </label>
9
         <label class="title"><span class="name">日期查询</span> : </label>
10
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
10
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
         <span class="cellLine"> - </span>
13
         <span class="cellLine"> - </span>
14
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
14
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
       </div>
17
       </div>
19
 
19
 
20
       <div class="cell clearfix">
20
       <div class="cell clearfix">
21
         <label class="title"><span class="name">单据类型</span> : </label>
21
         <label class="title"><span class="name">单据类型</span> : </label>
22
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
22
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
23
           <el-option
23
           <el-option
24
             v-for="item in orderTypeArr"
24
             v-for="item in orderTypeArr"
25
             :key="item.value"
25
             :key="item.value"
31
 
31
 
32
       <div class="cell clearfix">
32
       <div class="cell clearfix">
33
         <label class="title"><span class="name">其它</span> : </label>
33
         <label class="title"><span class="name">其它</span> : </label>
34
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
34
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
35
           <el-option
35
           <el-option
36
             v-for="item in manufacturer"
36
             v-for="item in manufacturer"
37
             :key="item.id"
37
             :key="item.id"
114
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
114
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
115
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
115
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
116
 
116
 
117
-
118
   export default {
117
   export default {
119
     name: 'salesReturnDetail',
118
     name: 'salesReturnDetail',
120
 
119
 
121
     created() {
120
     created() {
122
-      var nowDate = new Date();
123
-      var nowYear = nowDate.getFullYear();
124
-      var nowMonth = nowDate.getMonth() + 1;
125
-      var nowDay = nowDate.getDate();
121
+      var nowDate = new Date()
122
+      var nowYear = nowDate.getFullYear()
123
+      var nowMonth = nowDate.getMonth() + 1
124
+      var nowDay = nowDate.getDate()
126
       this.end_time =
125
       this.end_time =
127
         nowYear +
126
         nowYear +
128
-        "-" +
129
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
130
-        "-" +
131
-        (nowDay < 10 ? "0" + nowDay : nowDay);
132
-      nowDate.setMonth(nowDate.getMonth() - 1);
133
-      nowYear = nowDate.getFullYear();
134
-      nowMonth = nowDate.getMonth() + 1;
135
-      nowDay = nowDate.getDate();
127
+        '-' +
128
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
129
+        '-' +
130
+        (nowDay < 10 ? '0' + nowDay : nowDay)
131
+      nowDate.setMonth(nowDate.getMonth() - 1)
132
+      nowYear = nowDate.getFullYear()
133
+      nowMonth = nowDate.getMonth() + 1
134
+      nowDay = nowDate.getDate()
136
       this.start_time =
135
       this.start_time =
137
         nowYear +
136
         nowYear +
138
-        "-" +
139
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
140
-        "-" +
141
-        (nowDay < 10 ? "0" + nowDay : nowDay);
137
+        '-' +
138
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
139
+        '-' +
140
+        (nowDay < 10 ? '0' + nowDay : nowDay)
142
       this.GetCancelStock()
141
       this.GetCancelStock()
143
       this.GetConfigInfo()
142
       this.GetConfigInfo()
144
       this.fetchAllAdminUsers()
143
       this.fetchAllAdminUsers()
152
         manufacturer_id: '',
151
         manufacturer_id: '',
153
         dealer_id: '',
152
         dealer_id: '',
154
         order_type: '',
153
         order_type: '',
155
-        searchKey:'',
154
+        searchKey: '',
156
         type: 3,
155
         type: 3,
157
         page: 1,
156
         page: 1,
158
         limit: 7,
157
         limit: 7,
176
     },
175
     },
177
     methods: {
176
     methods: {
178
       changeType: function(val) {
177
       changeType: function(val) {
179
-        this.order_type  = val
178
+        this.order_type = val
180
         this.GetCancelStock()
179
         this.GetCancelStock()
181
       }, changeManufacturer: function(val) {
180
       }, changeManufacturer: function(val) {
182
-        this.manufacturer_id  = val
181
+        this.manufacturer_id = val
183
         this.GetCancelStock()
182
         this.GetCancelStock()
184
-
185
       },
183
       },
186
-      getTypeName:function(row){
187
-        let name = ""
188
-        if (row.type == 1){
189
-          name = "耗材退货单"
190
-
191
-        }else if(row.type == 2){
192
-          name = "其他退货单"
184
+      getTypeName: function(row) {
185
+        let name = ''
186
+        if (row.type == 1) {
187
+          name = '耗材退货单'
188
+        } else if (row.type == 2) {
189
+          name = '其他退货单'
193
         }
190
         }
194
 
191
 
195
         return name
192
         return name
203
         }
200
         }
204
         return name
201
         return name
205
       },
202
       },
206
-      search:function(){
203
+      search: function() {
207
         const Params = {
204
         const Params = {
208
           page: this.page,
205
           page: this.page,
209
           limit: this.limit,
206
           limit: this.limit,
210
           start_time: this.start_time,
207
           start_time: this.start_time,
211
           end_time: this.end_time,
208
           end_time: this.end_time,
212
           type: this.type,
209
           type: this.type,
213
-          keywords:this.searchKey,
210
+          keywords: this.searchKey
214
         }
211
         }
215
         this.cancelStockDate = []
212
         this.cancelStockDate = []
216
         getStockDetail(Params).then(response => {
213
         getStockDetail(Params).then(response => {
306
             this.manufacturer = response.data.data.manufacturer
303
             this.manufacturer = response.data.data.manufacturer
307
             this.dealer = response.data.data.dealer
304
             this.dealer = response.data.data.dealer
308
             this.goodInfo = response.data.data.goodInfo
305
             this.goodInfo = response.data.data.goodInfo
309
-
310
           }
306
           }
311
         })
307
         })
312
       }, getManufactuerName: function(manufacturer_id) {
308
       }, getManufactuerName: function(manufacturer_id) {
322
           }
318
           }
323
         }
319
         }
324
       }, handleEdit: function(index, row) {
320
       }, handleEdit: function(index, row) {
325
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
321
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
326
       }, handleDelete: function(index, row) {
322
       }, handleDelete: function(index, row) {
327
         const ids = []
323
         const ids = []
328
         ids.push(row.id)
324
         ids.push(row.id)

+ 28 - 32
src/xt_pages/stock/detail/stockInDetail.vue View File

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
       <div class="cell clearfix">
3
       <div class="cell clearfix">
4
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
4
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
6
       </div>
6
       </div>
7
 
7
 
8
       <div class="cell clearfix">
8
       <div class="cell clearfix">
9
         <label class="title"><span class="name">日期查询</span> : </label>
9
         <label class="title"><span class="name">日期查询</span> : </label>
10
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
10
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
         <span class="cellLine"> - </span>
13
         <span class="cellLine"> - </span>
14
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
14
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
       </div>
17
       </div>
18
 
18
 
19
       <div class="cell clearfix">
19
       <div class="cell clearfix">
20
         <label class="title"><span class="name">单据类型</span> : </label>
20
         <label class="title"><span class="name">单据类型</span> : </label>
21
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
21
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
22
           <el-option
22
           <el-option
23
             v-for="item in orderTypeArr"
23
             v-for="item in orderTypeArr"
24
             :key="item.value"
24
             :key="item.value"
30
 
30
 
31
       <div class="cell clearfix">
31
       <div class="cell clearfix">
32
         <label class="title"><span class="name">其它</span> : </label>
32
         <label class="title"><span class="name">其它</span> : </label>
33
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
33
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
34
           <el-option
34
           <el-option
35
             v-for="item in manufacturer"
35
             v-for="item in manufacturer"
36
             :key="item.id"
36
             :key="item.id"
124
     name: 'stockInDetail',
124
     name: 'stockInDetail',
125
 
125
 
126
     created() {
126
     created() {
127
-      var nowDate = new Date();
128
-      var nowYear = nowDate.getFullYear();
129
-      var nowMonth = nowDate.getMonth() + 1;
130
-      var nowDay = nowDate.getDate();
127
+      var nowDate = new Date()
128
+      var nowYear = nowDate.getFullYear()
129
+      var nowMonth = nowDate.getMonth() + 1
130
+      var nowDay = nowDate.getDate()
131
       this.end_time =
131
       this.end_time =
132
         nowYear +
132
         nowYear +
133
-        "-" +
134
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
135
-        "-" +
136
-        (nowDay < 10 ? "0" + nowDay : nowDay);
137
-      nowDate.setMonth(nowDate.getMonth() - 1);
138
-      nowYear = nowDate.getFullYear();
139
-      nowMonth = nowDate.getMonth() + 1;
140
-      nowDay = nowDate.getDate();
133
+        '-' +
134
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
135
+        '-' +
136
+        (nowDay < 10 ? '0' + nowDay : nowDay)
137
+      nowDate.setMonth(nowDate.getMonth() - 1)
138
+      nowYear = nowDate.getFullYear()
139
+      nowMonth = nowDate.getMonth() + 1
140
+      nowDay = nowDate.getDate()
141
       this.start_time =
141
       this.start_time =
142
         nowYear +
142
         nowYear +
143
-        "-" +
144
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
145
-        "-" +
146
-        (nowDay < 10 ? "0" + nowDay : nowDay);
143
+        '-' +
144
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
145
+        '-' +
146
+        (nowDay < 10 ? '0' + nowDay : nowDay)
147
       this.GetCancelStock()
147
       this.GetCancelStock()
148
       this.GetConfigInfo()
148
       this.GetConfigInfo()
149
       this.fetchAllAdminUsers()
149
       this.fetchAllAdminUsers()
182
     },
182
     },
183
     methods: {
183
     methods: {
184
       changeType: function(val) {
184
       changeType: function(val) {
185
-        this.order_type  = val
185
+        this.order_type = val
186
         this.GetCancelStock()
186
         this.GetCancelStock()
187
       }, changeManufacturer: function(val) {
187
       }, changeManufacturer: function(val) {
188
-        this.manufacturer_id  = val
188
+        this.manufacturer_id = val
189
         this.GetCancelStock()
189
         this.GetCancelStock()
190
-
191
       }, changeDealer: function(val) {
190
       }, changeDealer: function(val) {
192
-        this.dealer_id  = val
191
+        this.dealer_id = val
193
         this.GetCancelStock()
192
         this.GetCancelStock()
194
-
195
       }, getTypeName: function(row) {
193
       }, getTypeName: function(row) {
196
         let name = ''
194
         let name = ''
197
         if (row.type == 1) {
195
         if (row.type == 1) {
198
           name = '耗材入库单'
196
           name = '耗材入库单'
199
-
200
         } else if (row.type == 2) {
197
         } else if (row.type == 2) {
201
           name = '其他入库单'
198
           name = '其他入库单'
202
         }
199
         }
219
           start_time: this.start_time,
216
           start_time: this.start_time,
220
           end_time: this.end_time,
217
           end_time: this.end_time,
221
           type: this.type,
218
           type: this.type,
222
-          keywords: this.searchKey,
219
+          keywords: this.searchKey
223
         }
220
         }
224
         this.cancelStockDate = []
221
         this.cancelStockDate = []
225
         getStockDetail(Params).then(response => {
222
         getStockDetail(Params).then(response => {
235
         })
232
         })
236
       },
233
       },
237
       AddNewOrder: function() {
234
       AddNewOrder: function() {
238
-        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type } })
235
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
239
       },
236
       },
240
       GetCancelStock: function() {
237
       GetCancelStock: function() {
241
         const Params = {
238
         const Params = {
315
             this.manufacturer = response.data.data.manufacturer
312
             this.manufacturer = response.data.data.manufacturer
316
             this.dealer = response.data.data.dealer
313
             this.dealer = response.data.data.dealer
317
             this.goodInfo = response.data.data.goodInfo
314
             this.goodInfo = response.data.data.goodInfo
318
-
319
           }
315
           }
320
         })
316
         })
321
       }, getManufactuerName: function(manufacturer_id) {
317
       }, getManufactuerName: function(manufacturer_id) {
331
           }
327
           }
332
         }
328
         }
333
       }, handleEdit: function(index, row) {
329
       }, handleEdit: function(index, row) {
334
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type } })
330
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
335
       }, handleDelete: function(index, row) {
331
       }, handleDelete: function(index, row) {
336
         const ids = []
332
         const ids = []
337
         ids.push(row.id)
333
         ids.push(row.id)

+ 35 - 39
src/xt_pages/stock/detail/stockOutDetail.vue View File

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
       <div class="cell clearfix" >
3
       <div class="cell clearfix" >
4
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
4
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
5
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
6
       </div>
6
       </div>
7
 
7
 
8
       <div class="cell clearfix">
8
       <div class="cell clearfix">
9
         <label class="title"><span class="name">日期查询</span> : </label>
9
         <label class="title"><span class="name">日期查询</span> : </label>
10
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
10
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
11
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
12
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
         <span class="cellLine"> - </span>
13
         <span class="cellLine"> - </span>
14
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
14
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
15
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
16
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
       </div>
17
       </div>
19
 
19
 
20
       <div class="cell clearfix">
20
       <div class="cell clearfix">
21
         <label class="title"><span class="name">单据类型</span> : </label>
21
         <label class="title"><span class="name">单据类型</span> : </label>
22
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
22
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
23
           <el-option
23
           <el-option
24
             v-for="item in orderTypeArr"
24
             v-for="item in orderTypeArr"
25
             :key="item.value"
25
             :key="item.value"
31
 
31
 
32
       <div class="cell clearfix">
32
       <div class="cell clearfix">
33
         <label class="title"><span class="name">其它</span> : </label>
33
         <label class="title"><span class="name">其它</span> : </label>
34
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
34
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
35
           <el-option
35
           <el-option
36
             v-for="item in manufacturer"
36
             v-for="item in manufacturer"
37
             :key="item.id"
37
             :key="item.id"
124
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
124
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
125
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
125
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
126
 
126
 
127
-
128
   export default {
127
   export default {
129
     name: 'stockOutDetail',
128
     name: 'stockOutDetail',
130
 
129
 
131
     created() {
130
     created() {
132
-      var nowDate = new Date();
133
-      var nowYear = nowDate.getFullYear();
134
-      var nowMonth = nowDate.getMonth() + 1;
135
-      var nowDay = nowDate.getDate();
131
+      var nowDate = new Date()
132
+      var nowYear = nowDate.getFullYear()
133
+      var nowMonth = nowDate.getMonth() + 1
134
+      var nowDay = nowDate.getDate()
136
       this.end_time =
135
       this.end_time =
137
         nowYear +
136
         nowYear +
138
-        "-" +
139
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
140
-        "-" +
141
-        (nowDay < 10 ? "0" + nowDay : nowDay);
142
-      nowDate.setMonth(nowDate.getMonth() - 1);
143
-      nowYear = nowDate.getFullYear();
144
-      nowMonth = nowDate.getMonth() + 1;
145
-      nowDay = nowDate.getDate();
137
+        '-' +
138
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
139
+        '-' +
140
+        (nowDay < 10 ? '0' + nowDay : nowDay)
141
+      nowDate.setMonth(nowDate.getMonth() - 1)
142
+      nowYear = nowDate.getFullYear()
143
+      nowMonth = nowDate.getMonth() + 1
144
+      nowDay = nowDate.getDate()
146
       this.start_time =
145
       this.start_time =
147
         nowYear +
146
         nowYear +
148
-        "-" +
149
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
150
-        "-" +
151
-        (nowDay < 10 ? "0" + nowDay : nowDay);
147
+        '-' +
148
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
149
+        '-' +
150
+        (nowDay < 10 ? '0' + nowDay : nowDay)
152
       this.GetCancelStock()
151
       this.GetCancelStock()
153
       this.GetConfigInfo()
152
       this.GetConfigInfo()
154
       this.fetchAllAdminUsers()
153
       this.fetchAllAdminUsers()
163
         dealer_id: '',
162
         dealer_id: '',
164
         order_type: '',
163
         order_type: '',
165
 
164
 
166
-        searchKey:'',
165
+        searchKey: '',
167
         type: 2,
166
         type: 2,
168
         page: 1,
167
         page: 1,
169
         limit: 7,
168
         limit: 7,
187
     },
186
     },
188
     methods: {
187
     methods: {
189
       changeType: function(val) {
188
       changeType: function(val) {
190
-        this.order_type  = val
189
+        this.order_type = val
191
         this.GetCancelStock()
190
         this.GetCancelStock()
192
       }, changeManufacturer: function(val) {
191
       }, changeManufacturer: function(val) {
193
-        this.manufacturer_id  = val
192
+        this.manufacturer_id = val
194
         this.GetCancelStock()
193
         this.GetCancelStock()
195
-
196
       },
194
       },
197
-      getTypeName:function(row){
198
-        let name = ""
199
-        let name2 = ""
200
-        if (row.type == 1){
201
-          name = "耗材出库单"
202
-
203
-        }else if(row.type == 2){
204
-          name = "其他出库单"
195
+      getTypeName: function(row) {
196
+        let name = ''
197
+        const name2 = ''
198
+        if (row.type == 1) {
199
+          name = '耗材出库单'
200
+        } else if (row.type == 2) {
201
+          name = '其他出库单'
205
         }
202
         }
206
 
203
 
207
         return name
204
         return name
215
         }
212
         }
216
         return name
213
         return name
217
       },
214
       },
218
-      search:function(){
215
+      search: function() {
219
         const Params = {
216
         const Params = {
220
           page: this.page,
217
           page: this.page,
221
           limit: this.limit,
218
           limit: this.limit,
222
           start_time: this.start_time,
219
           start_time: this.start_time,
223
           end_time: this.end_time,
220
           end_time: this.end_time,
224
           type: this.type,
221
           type: this.type,
225
-          keywords:this.searchKey,
222
+          keywords: this.searchKey
226
         }
223
         }
227
         this.cancelStockDate = []
224
         this.cancelStockDate = []
228
         getStockDetail(Params).then(response => {
225
         getStockDetail(Params).then(response => {
318
             this.manufacturer = response.data.data.manufacturer
315
             this.manufacturer = response.data.data.manufacturer
319
             this.dealer = response.data.data.dealer
316
             this.dealer = response.data.data.dealer
320
             this.goodInfo = response.data.data.goodInfo
317
             this.goodInfo = response.data.data.goodInfo
321
-
322
           }
318
           }
323
         })
319
         })
324
       }, getManufactuerName: function(manufacturer_id) {
320
       }, getManufactuerName: function(manufacturer_id) {
334
           }
330
           }
335
         }
331
         }
336
       }, handleEdit: function(index, row) {
332
       }, handleEdit: function(index, row) {
337
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
333
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
338
       }, handleDelete: function(index, row) {
334
       }, handleDelete: function(index, row) {
339
         const ids = []
335
         const ids = []
340
         ids.push(row.id)
336
         ids.push(row.id)

+ 24 - 24
src/xt_pages/stock/otherCancelStockOrder.vue View File

11
     <div class="app-container">
11
     <div class="app-container">
12
 
12
 
13
       <div class="cell clearfix">
13
       <div class="cell clearfix">
14
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
15
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
14
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
15
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
16
       </div>
16
       </div>
17
 
17
 
18
       <div class="cell clearfix">
18
       <div class="cell clearfix">
19
         <label class="title"><span class="name">退库时间</span> : </label>
19
         <label class="title"><span class="name">退库时间</span> : </label>
20
 
20
 
21
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
24
         <span class="cellLine"> - </span>
24
         <span class="cellLine"> - </span>
25
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
28
       </div>
28
       </div>
128
     name: 'salesReturnOrder',
128
     name: 'salesReturnOrder',
129
     components: { BreadCrumb },
129
     components: { BreadCrumb },
130
     created() {
130
     created() {
131
-      var nowDate = new Date();
132
-      var nowYear = nowDate.getFullYear();
133
-      var nowMonth = nowDate.getMonth() + 1;
134
-      var nowDay = nowDate.getDate();
131
+      var nowDate = new Date()
132
+      var nowYear = nowDate.getFullYear()
133
+      var nowMonth = nowDate.getMonth() + 1
134
+      var nowDay = nowDate.getDate()
135
       this.end_time =
135
       this.end_time =
136
         nowYear +
136
         nowYear +
137
-        "-" +
138
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
139
-        "-" +
140
-        (nowDay < 10 ? "0" + nowDay : nowDay);
141
-      nowDate.setMonth(nowDate.getMonth() - 1);
142
-      nowYear = nowDate.getFullYear();
143
-      nowMonth = nowDate.getMonth() + 1;
144
-      nowDay = nowDate.getDate();
137
+        '-' +
138
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
139
+        '-' +
140
+        (nowDay < 10 ? '0' + nowDay : nowDay)
141
+      nowDate.setMonth(nowDate.getMonth() - 1)
142
+      nowYear = nowDate.getFullYear()
143
+      nowMonth = nowDate.getMonth() + 1
144
+      nowDay = nowDate.getDate()
145
       this.start_time =
145
       this.start_time =
146
         nowYear +
146
         nowYear +
147
-        "-" +
148
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
149
-        "-" +
150
-        (nowDay < 10 ? "0" + nowDay : nowDay);
147
+        '-' +
148
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
149
+        '-' +
150
+        (nowDay < 10 ? '0' + nowDay : nowDay)
151
       this.GetCancelStock()
151
       this.GetCancelStock()
152
       this.GetConfigInfo()
152
       this.GetConfigInfo()
153
       this.fetchAllAdminUsers()
153
       this.fetchAllAdminUsers()
158
           { path: false, name: '库存管理' },
158
           { path: false, name: '库存管理' },
159
           { path: '/stock/cancel', name: '其他出库退库单' }
159
           { path: '/stock/cancel', name: '其他出库退库单' }
160
         ],
160
         ],
161
-        searchKey:'',
161
+        searchKey: '',
162
         type: 2,
162
         type: 2,
163
         page: 1,
163
         page: 1,
164
         limit: 7,
164
         limit: 7,
181
       }
181
       }
182
     },
182
     },
183
     methods: {
183
     methods: {
184
-      search:function(){
184
+      search: function() {
185
         const Params = {
185
         const Params = {
186
           page: this.page,
186
           page: this.page,
187
           limit: this.limit,
187
           limit: this.limit,
188
           start_time: this.start_time,
188
           start_time: this.start_time,
189
           end_time: this.end_time,
189
           end_time: this.end_time,
190
           type: this.type,
190
           type: this.type,
191
-          keywords:this.searchKey,
191
+          keywords: this.searchKey
192
         }
192
         }
193
         this.cancelStockDate = []
193
         this.cancelStockDate = []
194
         getCancelStockList(Params).then(response => {
194
         getCancelStockList(Params).then(response => {
295
           }
295
           }
296
         }
296
         }
297
       }, handleEdit: function(index, row) {
297
       }, handleEdit: function(index, row) {
298
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
298
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
299
       }, handleDelete: function(index, row) {
299
       }, handleDelete: function(index, row) {
300
         const ids = []
300
         const ids = []
301
         ids.push(row.id)
301
         ids.push(row.id)

+ 23 - 23
src/xt_pages/stock/otherSalesReturnOrder.vue View File

11
     <div class="app-container">
11
     <div class="app-container">
12
 
12
 
13
       <div class="cell clearfix">
13
       <div class="cell clearfix">
14
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
15
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
14
+        <el-input  size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
15
+        <el-button size="small"  class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
16
       </div>
16
       </div>
17
 
17
 
18
       <div class="cell clearfix">
18
       <div class="cell clearfix">
19
         <label class="title"><span class="name">退货时间</span> : </label>
19
         <label class="title"><span class="name">退货时间</span> : </label>
20
 
20
 
21
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
24
         <span class="cellLine"> - </span>
24
         <span class="cellLine"> - </span>
25
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
28
       </div>
28
       </div>
140
     name: 'salesReturnOrder',
140
     name: 'salesReturnOrder',
141
     components: { BreadCrumb },
141
     components: { BreadCrumb },
142
     created() {
142
     created() {
143
-      var nowDate = new Date();
144
-      var nowYear = nowDate.getFullYear();
145
-      var nowMonth = nowDate.getMonth() + 1;
146
-      var nowDay = nowDate.getDate();
143
+      var nowDate = new Date()
144
+      var nowYear = nowDate.getFullYear()
145
+      var nowMonth = nowDate.getMonth() + 1
146
+      var nowDay = nowDate.getDate()
147
       this.end_time =
147
       this.end_time =
148
         nowYear +
148
         nowYear +
149
-        "-" +
150
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
151
-        "-" +
152
-        (nowDay < 10 ? "0" + nowDay : nowDay);
153
-      nowDate.setMonth(nowDate.getMonth() - 1);
154
-      nowYear = nowDate.getFullYear();
155
-      nowMonth = nowDate.getMonth() + 1;
156
-      nowDay = nowDate.getDate();
149
+        '-' +
150
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
151
+        '-' +
152
+        (nowDay < 10 ? '0' + nowDay : nowDay)
153
+      nowDate.setMonth(nowDate.getMonth() - 1)
154
+      nowYear = nowDate.getFullYear()
155
+      nowMonth = nowDate.getMonth() + 1
156
+      nowDay = nowDate.getDate()
157
       this.start_time =
157
       this.start_time =
158
         nowYear +
158
         nowYear +
159
-        "-" +
160
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
161
-        "-" +
162
-        (nowDay < 10 ? "0" + nowDay : nowDay);
159
+        '-' +
160
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
161
+        '-' +
162
+        (nowDay < 10 ? '0' + nowDay : nowDay)
163
       this.GetSalesReturn()
163
       this.GetSalesReturn()
164
       this.GetConfigInfo()
164
       this.GetConfigInfo()
165
       this.fetchAllAdminUsers()
165
       this.fetchAllAdminUsers()
166
     },
166
     },
167
     data() {
167
     data() {
168
       return {
168
       return {
169
-        searchKey:'',
169
+        searchKey: '',
170
         crumbs: [
170
         crumbs: [
171
           { path: false, name: '库存管理' },
171
           { path: false, name: '库存管理' },
172
           { path: false, name: '其他退货单' }
172
           { path: false, name: '其他退货单' }
193
       }
193
       }
194
     },
194
     },
195
     methods: {
195
     methods: {
196
-      search:function() {
196
+      search: function() {
197
         const Params = {
197
         const Params = {
198
           page: this.page,
198
           page: this.page,
199
           limit: this.limit,
199
           limit: this.limit,
200
           start_time: this.start_time,
200
           start_time: this.start_time,
201
           end_time: this.end_time,
201
           end_time: this.end_time,
202
           type: this.type,
202
           type: this.type,
203
-          keywords: this.searchKey,
203
+          keywords: this.searchKey
204
         }
204
         }
205
         this.saleReturnDate = []
205
         this.saleReturnDate = []
206
         getSalesReturnList(Params).then(response => {
206
         getSalesReturnList(Params).then(response => {

+ 25 - 25
src/xt_pages/stock/otherStockInOrder.vue View File

10
     <div class="app-container">
10
     <div class="app-container">
11
 
11
 
12
       <div class="cell clearfix">
12
       <div class="cell clearfix">
13
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
14
-        <el-button class="filter-item"  type="primary" icon="el-icon-search" @click="search">搜索</el-button>
13
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
14
+        <el-button size="small" class="filter-item"  type="primary" icon="el-icon-search" @click="search">搜索</el-button>
15
       </div>
15
       </div>
16
 
16
 
17
       <div class="cell clearfix">
17
       <div class="cell clearfix">
18
         <label class="title"><span class="name">入库时间</span> : </label>
18
         <label class="title"><span class="name">入库时间</span> : </label>
19
 
19
 
20
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
         <span class="cellLine"> - </span>
23
         <span class="cellLine"> - </span>
24
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
24
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
       </div>
27
       </div>
134
     name: 'stockIn',
134
     name: 'stockIn',
135
     components: { BreadCrumb },
135
     components: { BreadCrumb },
136
     created() {
136
     created() {
137
-      var nowDate = new Date();
138
-      var nowYear = nowDate.getFullYear();
139
-      var nowMonth = nowDate.getMonth() + 1;
140
-      var nowDay = nowDate.getDate();
137
+      var nowDate = new Date()
138
+      var nowYear = nowDate.getFullYear()
139
+      var nowMonth = nowDate.getMonth() + 1
140
+      var nowDay = nowDate.getDate()
141
       this.end_time =
141
       this.end_time =
142
         nowYear +
142
         nowYear +
143
-        "-" +
144
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
145
-        "-" +
146
-        (nowDay < 10 ? "0" + nowDay : nowDay);
147
-      nowDate.setMonth(nowDate.getMonth() - 1);
148
-      nowYear = nowDate.getFullYear();
149
-      nowMonth = nowDate.getMonth() + 1;
150
-      nowDay = nowDate.getDate();
143
+        '-' +
144
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
145
+        '-' +
146
+        (nowDay < 10 ? '0' + nowDay : nowDay)
147
+      nowDate.setMonth(nowDate.getMonth() - 1)
148
+      nowYear = nowDate.getFullYear()
149
+      nowMonth = nowDate.getMonth() + 1
150
+      nowDay = nowDate.getDate()
151
       this.start_time =
151
       this.start_time =
152
         nowYear +
152
         nowYear +
153
-        "-" +
154
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
155
-        "-" +
156
-        (nowDay < 10 ? "0" + nowDay : nowDay);
153
+        '-' +
154
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
155
+        '-' +
156
+        (nowDay < 10 ? '0' + nowDay : nowDay)
157
       this.GetWarehouse()
157
       this.GetWarehouse()
158
       this.GetConfigInfo()
158
       this.GetConfigInfo()
159
       this.fetchAllAdminUsers()
159
       this.fetchAllAdminUsers()
160
     },
160
     },
161
     data() {
161
     data() {
162
       return {
162
       return {
163
-        searchKey:'',
163
+        searchKey: '',
164
         crumbs: [
164
         crumbs: [
165
           { path: false, name: '库存管理' },
165
           { path: false, name: '库存管理' },
166
           { path: false, name: '其他入库单' }
166
           { path: false, name: '其他入库单' }
195
       }
195
       }
196
     },
196
     },
197
     methods: {
197
     methods: {
198
-      search:function() {
198
+      search: function() {
199
         const Params = {
199
         const Params = {
200
           page: this.page,
200
           page: this.page,
201
           limit: this.limit,
201
           limit: this.limit,
202
           start_time: this.start_time,
202
           start_time: this.start_time,
203
           end_time: this.end_time,
203
           end_time: this.end_time,
204
           type: this.type,
204
           type: this.type,
205
-          keywords: this.searchKey,
205
+          keywords: this.searchKey
206
         }
206
         }
207
         this.Warehouse.warehouseDate = []
207
         this.Warehouse.warehouseDate = []
208
         getWarehouseList(Params).then(response => {
208
         getWarehouseList(Params).then(response => {
220
         })
220
         })
221
       },
221
       },
222
 
222
 
223
-        GetWarehouse: function() {
223
+      GetWarehouse: function() {
224
         const Params = {
224
         const Params = {
225
           page: this.page,
225
           page: this.page,
226
           limit: this.limit,
226
           limit: this.limit,
400
           }
400
           }
401
         }
401
         }
402
       }, handleEdit: function(index, row) {
402
       }, handleEdit: function(index, row) {
403
-        this.$router.push({ name: 'stockInDetail', query: { id: row.id ,type:this.type}})
403
+        this.$router.push({ name: 'stockInDetail', query: { id: row.id, type: this.type }})
404
       }, handleDelete: function(index, row) {
404
       }, handleDelete: function(index, row) {
405
         const ids = []
405
         const ids = []
406
         ids.push(row.id)
406
         ids.push(row.id)

+ 122 - 123
src/xt_pages/stock/otherStockOutOrder.vue View File

9
     </div>
9
     </div>
10
     <div class="app-container">
10
     <div class="app-container">
11
       <div class="cell clearfix">
11
       <div class="cell clearfix">
12
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
13
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
12
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
13
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
14
       </div>
14
       </div>
15
 
15
 
16
       <div class="cell clearfix">
16
       <div class="cell clearfix">
17
         <label class="title"><span class="name">出库时间</span> : </label>
17
         <label class="title"><span class="name">出库时间</span> : </label>
18
 
18
 
19
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
19
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
20
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
21
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
22
         <span class="cellLine"> - </span>
22
         <span class="cellLine"> - </span>
23
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
23
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
24
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
24
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
25
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
25
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
26
       </div>
26
       </div>
118
 </template>
118
 </template>
119
 
119
 
120
 <script>
120
 <script>
121
-import { uParseTime } from "@/utils/tools";
122
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
121
+import { uParseTime } from '@/utils/tools'
122
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
123
 
123
 
124
 import {
124
 import {
125
   deleteWarehouseOut,
125
   deleteWarehouseOut,
126
   GetAllConfig,
126
   GetAllConfig,
127
   getWarehouseOutList
127
   getWarehouseOutList
128
-} from "@/api/stock";
129
-import BreadCrumb from "../components/bread-crumb";
128
+} from '@/api/stock'
129
+import BreadCrumb from '../components/bread-crumb'
130
 
130
 
131
 export default {
131
 export default {
132
-  name: "salesReturnOrder",
132
+  name: 'salesReturnOrder',
133
   components: { BreadCrumb },
133
   components: { BreadCrumb },
134
   created() {
134
   created() {
135
-    var nowDate = new Date();
136
-    var nowYear = nowDate.getFullYear();
137
-    var nowMonth = nowDate.getMonth() + 1;
138
-    var nowDay = nowDate.getDate();
135
+    var nowDate = new Date()
136
+    var nowYear = nowDate.getFullYear()
137
+    var nowMonth = nowDate.getMonth() + 1
138
+    var nowDay = nowDate.getDate()
139
     this.end_time =
139
     this.end_time =
140
       nowYear +
140
       nowYear +
141
-      "-" +
142
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
143
-      "-" +
144
-      (nowDay < 10 ? "0" + nowDay : nowDay);
145
-    nowDate.setMonth(nowDate.getMonth() - 1);
146
-    nowYear = nowDate.getFullYear();
147
-    nowMonth = nowDate.getMonth() + 1;
148
-    nowDay = nowDate.getDate();
141
+      '-' +
142
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
143
+      '-' +
144
+      (nowDay < 10 ? '0' + nowDay : nowDay)
145
+    nowDate.setMonth(nowDate.getMonth() - 1)
146
+    nowYear = nowDate.getFullYear()
147
+    nowMonth = nowDate.getMonth() + 1
148
+    nowDay = nowDate.getDate()
149
     this.start_time =
149
     this.start_time =
150
       nowYear +
150
       nowYear +
151
-      "-" +
152
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
153
-      "-" +
154
-      (nowDay < 10 ? "0" + nowDay : nowDay);
155
-    this.GetWarehouseOut();
156
-    this.GetConfigInfo();
157
-    this.fetchAllAdminUsers();
151
+      '-' +
152
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
153
+      '-' +
154
+      (nowDay < 10 ? '0' + nowDay : nowDay)
155
+    this.GetWarehouseOut()
156
+    this.GetConfigInfo()
157
+    this.fetchAllAdminUsers()
158
   },
158
   },
159
   data() {
159
   data() {
160
     return {
160
     return {
161
       crumbs: [
161
       crumbs: [
162
-        { path: false, name: "库存管理" },
163
-        { path: false, name: "其他出库单" }
162
+        { path: false, name: '库存管理' },
163
+        { path: false, name: '其他出库单' }
164
       ],
164
       ],
165
-      searchKey:'',
165
+      searchKey: '',
166
       page: 1,
166
       page: 1,
167
       limit: 7,
167
       limit: 7,
168
       checked: false,
168
       checked: false,
171
       pageSelect: 0,
171
       pageSelect: 0,
172
       adminUserOptions: [],
172
       adminUserOptions: [],
173
       multipleSelection: [],
173
       multipleSelection: [],
174
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
175
-      start_time: "",
174
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
175
+      start_time: '',
176
       warehouseOutDate: [],
176
       warehouseOutDate: [],
177
-      end_time: "",
177
+      end_time: '',
178
       goodType: [],
178
       goodType: [],
179
       goodInfo: [],
179
       goodInfo: [],
180
       manufacturer: [],
180
       manufacturer: [],
181
       selectedTableData: [],
181
       selectedTableData: [],
182
       dealer: [],
182
       dealer: [],
183
       type: 2
183
       type: 2
184
-    };
184
+    }
185
   },
185
   },
186
   methods: {
186
   methods: {
187
-    search:function(){
187
+    search: function() {
188
       const Params = {
188
       const Params = {
189
         page: this.page,
189
         page: this.page,
190
         limit: this.limit,
190
         limit: this.limit,
191
         start_time: this.start_time,
191
         start_time: this.start_time,
192
         end_time: this.end_time,
192
         end_time: this.end_time,
193
         type: this.type,
193
         type: this.type,
194
-        keywords:this.searchKey,
194
+        keywords: this.searchKey
195
       }
195
       }
196
-      this.warehouseOutDate = [];
196
+      this.warehouseOutDate = []
197
       getWarehouseOutList(Params).then(response => {
197
       getWarehouseOutList(Params).then(response => {
198
         if (response.data.state == 0) {
198
         if (response.data.state == 0) {
199
-          this.$message.error(response.data.msg);
200
-          return false;
199
+          this.$message.error(response.data.msg)
200
+          return false
201
         } else {
201
         } else {
202
-          this.total = response.data.data.total;
202
+          this.total = response.data.data.total
203
           for (let i = 0; i < response.data.data.list.length; i++) {
203
           for (let i = 0; i < response.data.data.list.length; i++) {
204
-            this.warehouseOutDate.push(response.data.data.list[i]);
204
+            this.warehouseOutDate.push(response.data.data.list[i])
205
           }
205
           }
206
         }
206
         }
207
-      });
208
-
207
+      })
209
     },
208
     },
210
     AddNewOrder: function() {
209
     AddNewOrder: function() {
211
       this.$router.push({
210
       this.$router.push({
212
-        name: "stockOutOrderAdd",
211
+        name: 'stockOutOrderAdd',
213
         query: { type: this.type }
212
         query: { type: this.type }
214
-      });
213
+      })
215
     },
214
     },
216
     GetWarehouseOut: function() {
215
     GetWarehouseOut: function() {
217
       const Params = {
216
       const Params = {
220
         start_time: this.start_time,
219
         start_time: this.start_time,
221
         end_time: this.end_time,
220
         end_time: this.end_time,
222
         type: this.type
221
         type: this.type
223
-      };
224
-      this.warehouseOutDate = [];
222
+      }
223
+      this.warehouseOutDate = []
225
       getWarehouseOutList(Params).then(response => {
224
       getWarehouseOutList(Params).then(response => {
226
         if (response.data.state == 0) {
225
         if (response.data.state == 0) {
227
-          this.$message.error(response.data.msg);
228
-          return false;
226
+          this.$message.error(response.data.msg)
227
+          return false
229
         } else {
228
         } else {
230
-          this.total = response.data.data.total;
229
+          this.total = response.data.data.total
231
           for (let i = 0; i < response.data.data.list.length; i++) {
230
           for (let i = 0; i < response.data.data.list.length; i++) {
232
-            this.warehouseOutDate.push(response.data.data.list[i]);
231
+            this.warehouseOutDate.push(response.data.data.list[i])
233
           }
232
           }
234
         }
233
         }
235
-      });
234
+      })
236
     },
235
     },
237
     getXuserName(id) {
236
     getXuserName(id) {
238
       if (id <= 0) {
237
       if (id <= 0) {
239
-        return "";
238
+        return ''
240
       }
239
       }
241
-      var name = "";
240
+      var name = ''
242
       if (
241
       if (
243
         this.adminUserOptions == null ||
242
         this.adminUserOptions == null ||
244
-        typeof this.adminUserOptions.length === "undefined"
243
+        typeof this.adminUserOptions.length === 'undefined'
245
       ) {
244
       ) {
246
-        return name;
245
+        return name
247
       }
246
       }
248
-      var leng = this.adminUserOptions.length;
247
+      var leng = this.adminUserOptions.length
249
       if (leng == 0) {
248
       if (leng == 0) {
250
-        return name;
249
+        return name
251
       }
250
       }
252
       for (let index = 0; index < leng; index++) {
251
       for (let index = 0; index < leng; index++) {
253
         if (this.adminUserOptions[index].id == id) {
252
         if (this.adminUserOptions[index].id == id) {
254
-          name = this.adminUserOptions[index].name;
255
-          break;
253
+          name = this.adminUserOptions[index].name
254
+          break
256
         }
255
         }
257
       }
256
       }
258
-      return name;
257
+      return name
259
     },
258
     },
260
     fetchAllAdminUsers() {
259
     fetchAllAdminUsers() {
261
       fetchAllAdminUsers().then(response => {
260
       fetchAllAdminUsers().then(response => {
262
-        console.log(response);
261
+        console.log(response)
263
         if (response.data.state == 1) {
262
         if (response.data.state == 1) {
264
-          this.adminUserOptions = response.data.data.users;
265
-          var alen = this.adminUserOptions.length;
263
+          this.adminUserOptions = response.data.data.users
264
+          var alen = this.adminUserOptions.length
266
           for (let index = 0; index < alen; index++) {
265
           for (let index = 0; index < alen; index++) {
267
             if (this.adminUserOptions[index].user_type == 2) {
266
             if (this.adminUserOptions[index].user_type == 2) {
268
               // this.doctorOptions.push(this.adminUserOptions[index]);
267
               // this.doctorOptions.push(this.adminUserOptions[index]);
269
             }
268
             }
270
           }
269
           }
271
         }
270
         }
272
-      });
271
+      })
273
     },
272
     },
274
     handleSelectionChange: function(val) {
273
     handleSelectionChange: function(val) {
275
-      this.multipleSelection = val;
274
+      this.multipleSelection = val
276
     },
275
     },
277
     handleSizeChange(val) {
276
     handleSizeChange(val) {
278
-      this.limit = val;
279
-      this.GetWarehouseOut();
277
+      this.limit = val
278
+      this.GetWarehouseOut()
280
     },
279
     },
281
     handleCurrentChange(val) {
280
     handleCurrentChange(val) {
282
-      this.page = val;
283
-      this.GetWarehouseOut();
281
+      this.page = val
282
+      this.GetWarehouseOut()
284
     },
283
     },
285
     startTimeChange(val) {
284
     startTimeChange(val) {
286
-      this.GetWarehouseOut();
285
+      this.GetWarehouseOut()
287
     },
286
     },
288
     endTimeChange(val) {
287
     endTimeChange(val) {
289
-      this.GetWarehouseOut();
288
+      this.GetWarehouseOut()
290
     },
289
     },
291
     calculate: function(val) {
290
     calculate: function(val) {
292
-      return Math.round(parseFloat(val) * 100) / 100;
291
+      return Math.round(parseFloat(val) * 100) / 100
293
     },
292
     },
294
     GetConfigInfo: function() {
293
     GetConfigInfo: function() {
295
       GetAllConfig().then(response => {
294
       GetAllConfig().then(response => {
296
         if (response.data.state == 0) {
295
         if (response.data.state == 0) {
297
-          this.$message.error(response.data.msg);
298
-          return false;
296
+          this.$message.error(response.data.msg)
297
+          return false
299
         } else {
298
         } else {
300
-          this.manufacturer = response.data.data.manufacturer;
301
-          this.dealer = response.data.data.dealer;
299
+          this.manufacturer = response.data.data.manufacturer
300
+          this.dealer = response.data.data.dealer
302
         }
301
         }
303
-      });
302
+      })
304
     },
303
     },
305
     getManufactuerName: function(manufacturer_id) {
304
     getManufactuerName: function(manufacturer_id) {
306
       for (let i = 0; i < this.manufacturer.length; i++) {
305
       for (let i = 0; i < this.manufacturer.length; i++) {
307
         if (this.manufacturer[i].id == manufacturer_id) {
306
         if (this.manufacturer[i].id == manufacturer_id) {
308
-          return this.manufacturer[i].manufacturer_name;
307
+          return this.manufacturer[i].manufacturer_name
309
         }
308
         }
310
       }
309
       }
311
     },
310
     },
312
     getDealerName: function(dealer_id) {
311
     getDealerName: function(dealer_id) {
313
       for (let i = 0; i < this.dealer.length; i++) {
312
       for (let i = 0; i < this.dealer.length; i++) {
314
         if (this.dealer[i].id == dealer_id) {
313
         if (this.dealer[i].id == dealer_id) {
315
-          return this.dealer[i].dealer_name;
314
+          return this.dealer[i].dealer_name
316
         }
315
         }
317
       }
316
       }
318
     },
317
     },
319
     handleEdit: function(index, row) {
318
     handleEdit: function(index, row) {
320
       this.$router.push({
319
       this.$router.push({
321
-        name: "stockOutDetail",
320
+        name: 'stockOutDetail',
322
         query: { id: row.id, type: this.type }
321
         query: { id: row.id, type: this.type }
323
-      });
322
+      })
324
     },
323
     },
325
     handleDelete: function(index, row) {
324
     handleDelete: function(index, row) {
326
-      const ids = [];
327
-      ids.push(row.id);
328
-      const idStr = ids.join(",");
325
+      const ids = []
326
+      ids.push(row.id)
327
+      const idStr = ids.join(',')
329
 
328
 
330
       const params = {
329
       const params = {
331
         ids: idStr
330
         ids: idStr
332
-      };
331
+      }
333
 
332
 
334
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
335
-        confirmButtonText: "确定",
336
-        cancelButtonText: "取消",
337
-        type: "warning"
333
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
334
+        confirmButtonText: '确定',
335
+        cancelButtonText: '取消',
336
+        type: 'warning'
338
       })
337
       })
339
         .then(() => {
338
         .then(() => {
340
           deleteWarehouseOut(params).then(response => {
339
           deleteWarehouseOut(params).then(response => {
341
             if (response.data.state == 0) {
340
             if (response.data.state == 0) {
342
-              this.$message.error(response.data.msg);
343
-              return false;
341
+              this.$message.error(response.data.msg)
342
+              return false
344
             } else {
343
             } else {
345
               this.$notify({
344
               this.$notify({
346
-                title: "成功",
347
-                message: "删除成功",
348
-                type: "success",
345
+                title: '成功',
346
+                message: '删除成功',
347
+                type: 'success',
349
                 duration: 2000
348
                 duration: 2000
350
-              });
349
+              })
351
               for (let i = 0; i < ids.length; i++) {
350
               for (let i = 0; i < ids.length; i++) {
352
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
351
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
353
                   if (ids[i] == this.warehouseOutDate[y].id) {
352
                   if (ids[i] == this.warehouseOutDate[y].id) {
354
-                    this.warehouseOutDate.splice(y, 1);
353
+                    this.warehouseOutDate.splice(y, 1)
355
                   }
354
                   }
356
                 }
355
                 }
357
               }
356
               }
358
             }
357
             }
359
-          });
358
+          })
360
         })
359
         })
361
-        .catch(() => {});
360
+        .catch(() => {})
362
     },
361
     },
363
     changeAllSelected: function(val) {
362
     changeAllSelected: function(val) {
364
       if (val) {
363
       if (val) {
365
-        this.$refs.multipleTable.toggleAllSelection();
364
+        this.$refs.multipleTable.toggleAllSelection()
366
       } else {
365
       } else {
367
-        this.$refs.multipleTable.clearSelection();
366
+        this.$refs.multipleTable.clearSelection()
368
       }
367
       }
369
     },
368
     },
370
     select(selection) {
369
     select(selection) {
371
-      this.selectedTableData = selection;
370
+      this.selectedTableData = selection
372
     },
371
     },
373
     batchDelete() {
372
     batchDelete() {
374
       if (this.selectedTableData.length <= 0) {
373
       if (this.selectedTableData.length <= 0) {
375
-        this.$message.error("请选择要删除的记录");
376
-        return;
374
+        this.$message.error('请选择要删除的记录')
375
+        return
377
       }
376
       }
378
-      const ids = [];
377
+      const ids = []
379
       for (let i = 0; i < this.selectedTableData.length; i++) {
378
       for (let i = 0; i < this.selectedTableData.length; i++) {
380
-        ids.push(this.selectedTableData[i].id);
379
+        ids.push(this.selectedTableData[i].id)
381
       }
380
       }
382
-      const idStr = ids.join(",");
381
+      const idStr = ids.join(',')
383
       const params = {
382
       const params = {
384
         ids: idStr
383
         ids: idStr
385
-      };
386
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
387
-        confirmButtonText: "确定",
388
-        cancelButtonText: "取消",
389
-        type: "warning"
384
+      }
385
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
386
+        confirmButtonText: '确定',
387
+        cancelButtonText: '取消',
388
+        type: 'warning'
390
       })
389
       })
391
         .then(() => {
390
         .then(() => {
392
           deleteWarehouseOut(params).then(response => {
391
           deleteWarehouseOut(params).then(response => {
393
             if (response.data.state == 0) {
392
             if (response.data.state == 0) {
394
-              this.$message.error(response.data.msg);
395
-              return false;
393
+              this.$message.error(response.data.msg)
394
+              return false
396
             } else {
395
             } else {
397
               this.$notify({
396
               this.$notify({
398
-                title: "成功",
399
-                message: "删除成功",
400
-                type: "success",
397
+                title: '成功',
398
+                message: '删除成功',
399
+                type: 'success',
401
                 duration: 2000
400
                 duration: 2000
402
-              });
401
+              })
403
 
402
 
404
               for (let i = 0; i < ids.length; i++) {
403
               for (let i = 0; i < ids.length; i++) {
405
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
404
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
406
                   if (ids[i] == this.warehouseOutDate[y].id) {
405
                   if (ids[i] == this.warehouseOutDate[y].id) {
407
-                    this.warehouseOutDate.splice(y, 1);
406
+                    this.warehouseOutDate.splice(y, 1)
408
                   }
407
                   }
409
                 }
408
                 }
410
               }
409
               }
411
             }
410
             }
412
-          });
411
+          })
413
         })
412
         })
414
-        .catch(() => {});
413
+        .catch(() => {})
415
     }
414
     }
416
   }
415
   }
417
-};
416
+}
418
 </script>
417
 </script>
419
 
418
 
420
 <style rel="stylesheet/scss" lang="scss" scoped>
419
 <style rel="stylesheet/scss" lang="scss" scoped>

+ 5 - 15
src/xt_pages/stock/salesReturnEdit.vue View File

17
 
17
 
18
     <div class="cell clearfix">
18
     <div class="cell clearfix">
19
             <label class="title"><span class="name">退货时间</span> : </label>
19
             <label class="title"><span class="name">退货时间</span> : </label>
20
-            <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
+            <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                             type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                             type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                             value-format="yyyy-MM-dd"></el-date-picker>
22
                             value-format="yyyy-MM-dd"></el-date-picker>
23
     </div>
23
     </div>
185
               tempForm['good_type_id'] = val.goodTypeId
185
               tempForm['good_type_id'] = val.goodTypeId
186
               tempForm['good_id'] = val.selectedGoodInfo[i].id
186
               tempForm['good_id'] = val.selectedGoodInfo[i].id
187
               tempForm['count'] = ''
187
               tempForm['count'] = ''
188
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
189
-
188
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
190
             }
189
             }
191
           }
190
           }
192
         }
191
         }
193
 
192
 
194
         this.currentIndex = -1
193
         this.currentIndex = -1
195
       }, cancle: function() {
194
       }, cancle: function() {
196
-
197
         this.$refs.dialog.hide()
195
         this.$refs.dialog.hide()
198
-
199
       }, GetConfigInfo: function() {
196
       }, GetConfigInfo: function() {
200
         const params = {
197
         const params = {
201
           type: this.$route.query.type
198
           type: this.$route.query.type
223
             }, [])
220
             }, [])
224
             console.log(this.propForm.goodInfo)
221
             console.log(this.propForm.goodInfo)
225
             console.log(this.propForm.goodType)
222
             console.log(this.propForm.goodType)
226
-
227
-
228
           }
223
           }
229
         })
224
         })
230
       }, typeName: function(good_type_id) {
225
       }, typeName: function(good_type_id) {
236
         }
231
         }
237
         return name
232
         return name
238
       }, specificationName: function(good_info_id) {
233
       }, specificationName: function(good_info_id) {
239
-
240
         let name = ''
234
         let name = ''
241
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
235
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
242
           if (this.propForm.goodInfo[i].id == good_info_id) {
236
           if (this.propForm.goodInfo[i].id == good_info_id) {
268
                 this.$message.error(response.data.msg)
262
                 this.$message.error(response.data.msg)
269
                 return false
263
                 return false
270
               } else {
264
               } else {
271
-
272
-                this.$message.success("删除成功")
265
+                this.$message.success('删除成功')
273
                 this.recordInfo.recordData.splice(index, 1)
266
                 this.recordInfo.recordData.splice(index, 1)
274
               }
267
               }
275
             })
268
             })
315
             const params = {
308
             const params = {
316
               'salesReturn': this.recordInfo.recordData
309
               'salesReturn': this.recordInfo.recordData
317
             }
310
             }
318
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
311
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
319
               if (response.data.state == 0) {
312
               if (response.data.state == 0) {
320
                 this.$message.error(response.data.msg)
313
                 this.$message.error(response.data.msg)
321
                 return false
314
                 return false
322
               } else {
315
               } else {
323
-
324
                 this.$message.success('退货成功')
316
                 this.$message.success('退货成功')
325
 
317
 
326
                 this.$router.back(-1)
318
                 this.$router.back(-1)
349
             this.form.dealer = this.salesReturn.dealer
341
             this.form.dealer = this.salesReturn.dealer
350
           }
342
           }
351
 
343
 
352
-
353
-          if( this.recordInfo.recordData.length == 0){
344
+          if (this.recordInfo.recordData.length == 0) {
354
             const tempObj = {}
345
             const tempObj = {}
355
             tempObj['id'] = 0
346
             tempObj['id'] = 0
356
             tempObj['good_type_id'] = 0
347
             tempObj['good_type_id'] = 0
358
             tempObj['count'] = ''
349
             tempObj['count'] = ''
359
             this.recordInfo.recordData.push(tempObj)
350
             this.recordInfo.recordData.push(tempObj)
360
           }
351
           }
361
-
362
         })
352
         })
363
       }
353
       }
364
     },
354
     },

+ 21 - 21
src/xt_pages/stock/salesReturnOrder.vue View File

17
 
17
 
18
       <div class="cell clearfix">
18
       <div class="cell clearfix">
19
         <label class="title"><span class="name">退货时间</span> : </label>
19
         <label class="title"><span class="name">退货时间</span> : </label>
20
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
         <span class="cellLine"> - </span>
23
         <span class="cellLine"> - </span>
24
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
24
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
       </div>
27
       </div>
135
     name: 'salesReturnOrder',
135
     name: 'salesReturnOrder',
136
     components: { BreadCrumb },
136
     components: { BreadCrumb },
137
     created() {
137
     created() {
138
-      var nowDate = new Date();
139
-      var nowYear = nowDate.getFullYear();
140
-      var nowMonth = nowDate.getMonth() + 1;
141
-      var nowDay = nowDate.getDate();
138
+      var nowDate = new Date()
139
+      var nowYear = nowDate.getFullYear()
140
+      var nowMonth = nowDate.getMonth() + 1
141
+      var nowDay = nowDate.getDate()
142
       this.end_time =
142
       this.end_time =
143
         nowYear +
143
         nowYear +
144
-        "-" +
145
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
146
-        "-" +
147
-        (nowDay < 10 ? "0" + nowDay : nowDay);
148
-      nowDate.setMonth(nowDate.getMonth() - 1);
149
-      nowYear = nowDate.getFullYear();
150
-      nowMonth = nowDate.getMonth() + 1;
151
-      nowDay = nowDate.getDate();
144
+        '-' +
145
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
146
+        '-' +
147
+        (nowDay < 10 ? '0' + nowDay : nowDay)
148
+      nowDate.setMonth(nowDate.getMonth() - 1)
149
+      nowYear = nowDate.getFullYear()
150
+      nowMonth = nowDate.getMonth() + 1
151
+      nowDay = nowDate.getDate()
152
       this.start_time =
152
       this.start_time =
153
         nowYear +
153
         nowYear +
154
-        "-" +
155
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
156
-        "-" +
157
-        (nowDay < 10 ? "0" + nowDay : nowDay);
154
+        '-' +
155
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
156
+        '-' +
157
+        (nowDay < 10 ? '0' + nowDay : nowDay)
158
 
158
 
159
       this.GetSalesReturn()
159
       this.GetSalesReturn()
160
       this.GetConfigInfo()
160
       this.GetConfigInfo()
162
     },
162
     },
163
     data() {
163
     data() {
164
       return {
164
       return {
165
-        searchKey:'',
165
+        searchKey: '',
166
         crumbs: [
166
         crumbs: [
167
           { path: false, name: '库存管理' },
167
           { path: false, name: '库存管理' },
168
           { path: false, name: '退货单' }
168
           { path: false, name: '退货单' }
189
       }
189
       }
190
     },
190
     },
191
     methods: {
191
     methods: {
192
-      search:function() {
192
+      search: function() {
193
         const Params = {
193
         const Params = {
194
           page: this.page,
194
           page: this.page,
195
           limit: this.limit,
195
           limit: this.limit,
196
           start_time: this.start_time,
196
           start_time: this.start_time,
197
           end_time: this.end_time,
197
           end_time: this.end_time,
198
           type: this.type,
198
           type: this.type,
199
-          keywords: this.searchKey,
199
+          keywords: this.searchKey
200
         }
200
         }
201
         this.saleReturnDate = []
201
         this.saleReturnDate = []
202
         getSalesReturnList(Params).then(response => {
202
         getSalesReturnList(Params).then(response => {

+ 15 - 20
src/xt_pages/stock/salesReturnOrderAdd.vue View File

15
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
15
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
16
       <div class="cell clearfix">
16
       <div class="cell clearfix">
17
         <label class="title"><span class="name">退货时间</span> : </label>
17
         <label class="title"><span class="name">退货时间</span> : </label>
18
-        <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
18
+        <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
19
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
19
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
20
                         value-format="yyyy-MM-dd"></el-date-picker>
20
                         value-format="yyyy-MM-dd"></el-date-picker>
21
       </div>
21
       </div>
24
       <div class="cell clearfix">
24
       <div class="cell clearfix">
25
         <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
25
         <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
26
 
26
 
27
-        <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
27
+        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
28
           <el-option
28
           <el-option
29
             v-for="(option, index) in manufacturer"
29
             v-for="(option, index) in manufacturer"
30
             :key="index"
30
             :key="index"
36
 
36
 
37
       <div class="cell clearfix">
37
       <div class="cell clearfix">
38
         <label class="title"><span class="name">经销商</span> : </label>
38
         <label class="title"><span class="name">经销商</span> : </label>
39
-        <el-select v-model="form.dealer" clearable placeholder="请选择经销商">
39
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商">
40
           <el-option
40
           <el-option
41
             v-for="(option, index) in dealer"
41
             v-for="(option, index) in dealer"
42
             :key="index"
42
             :key="index"
205
               tempForm['good_id'] = val.selectedGoodInfo[i].id
205
               tempForm['good_id'] = val.selectedGoodInfo[i].id
206
               tempForm['return_count'] = ''
206
               tempForm['return_count'] = ''
207
               tempForm['price'] = ''
207
               tempForm['price'] = ''
208
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
209
-
208
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
210
             }
209
             }
211
           }
210
           }
212
         }
211
         }
213
 
212
 
214
         this.currentIndex = -1
213
         this.currentIndex = -1
215
       }, cancle: function() {
214
       }, cancle: function() {
216
-
217
         this.$refs.dialog.hide()
215
         this.$refs.dialog.hide()
218
-
219
       }, GetConfigInfo: function() {
216
       }, GetConfigInfo: function() {
220
         const params = {
217
         const params = {
221
           type: this.type
218
           type: this.type
283
         tempObj['price'] = ''
280
         tempObj['price'] = ''
284
         this.recordInfo.recordData.push(tempObj)
281
         this.recordInfo.recordData.push(tempObj)
285
       }, handleDelete: function(index, row) {
282
       }, handleDelete: function(index, row) {
286
-        if( this.recordInfo.recordData.length <= 1){
283
+        if (this.recordInfo.recordData.length <= 1) {
287
           this.$message.error('只有一条记录的时候无法删除')
284
           this.$message.error('只有一条记录的时候无法删除')
288
           return
285
           return
289
-        }else{
286
+        } else {
290
           this.recordInfo.recordData.splice(index, 1)
287
           this.recordInfo.recordData.splice(index, 1)
291
         }
288
         }
292
-
293
       }, calculate: function(val) {
289
       }, calculate: function(val) {
294
         if (val == 0) {
290
         if (val == 0) {
295
           return ''
291
           return ''
351
                 this.$message.error(response.data.msg)
347
                 this.$message.error(response.data.msg)
352
                 return false
348
                 return false
353
               } else {
349
               } else {
354
-
355
                 this.$message.success('退货成功')
350
                 this.$message.success('退货成功')
356
 
351
 
357
                 this.recordInfo.recordData = []
352
                 this.recordInfo.recordData = []
362
             return false
357
             return false
363
           }
358
           }
364
         })
359
         })
365
-      },changeManufacturer(){
360
+      }, changeManufacturer() {
366
         this.recordInfo.recordData = []
361
         this.recordInfo.recordData = []
367
         const tempObj = {}
362
         const tempObj = {}
368
         tempObj['good_type_id'] = 0
363
         tempObj['good_type_id'] = 0
373
       }
368
       }
374
     },
369
     },
375
     created() {
370
     created() {
376
-      var nowDate = new Date();
377
-      var nowYear = nowDate.getFullYear();
378
-      var nowMonth = nowDate.getMonth() + 1;
379
-      var nowDay = nowDate.getDate();
371
+      var nowDate = new Date()
372
+      var nowYear = nowDate.getFullYear()
373
+      var nowMonth = nowDate.getMonth() + 1
374
+      var nowDay = nowDate.getDate()
380
       this.return_time =
375
       this.return_time =
381
         nowYear +
376
         nowYear +
382
-        "-" +
383
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
384
-        "-" +
385
-        (nowDay < 10 ? "0" + nowDay : nowDay);
377
+        '-' +
378
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
379
+        '-' +
380
+        (nowDay < 10 ? '0' + nowDay : nowDay)
386
       const tempObj = {}
381
       const tempObj = {}
387
       tempObj['good_type_id'] = 0
382
       tempObj['good_type_id'] = 0
388
       tempObj['good_id'] = 0
383
       tempObj['good_id'] = 0

+ 21 - 23
src/xt_pages/stock/stockDetail.vue View File

12
 
12
 
13
 
13
 
14
       <div class="cell clearfix" >
14
       <div class="cell clearfix" >
15
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
16
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
15
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
16
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
17
       </div>
17
       </div>
18
 
18
 
19
       <div class="cell clearfix">
19
       <div class="cell clearfix">
154
           { path: false, name: '库存管理' },
154
           { path: false, name: '库存管理' },
155
           { path: '/stock/detail', name: '出入库明细查询' }
155
           { path: '/stock/detail', name: '出入库明细查询' }
156
         ],
156
         ],
157
-        searchKey:'',
157
+        searchKey: '',
158
         type: 1,
158
         type: 1,
159
         page: 1,
159
         page: 1,
160
         limit: 7,
160
         limit: 7,
177
       }
177
       }
178
     },
178
     },
179
     methods: {
179
     methods: {
180
-      getTypeName:function(row){
181
-        let name = ""
182
-        let name2 = ""
183
-        if (row.type == 1){
184
-          name = "耗材"
185
-
186
-        }else if(row.type == 2){
187
-          name = "其他"
180
+      getTypeName: function(row) {
181
+        let name = ''
182
+        let name2 = ''
183
+        if (row.type == 1) {
184
+          name = '耗材'
185
+        } else if (row.type == 2) {
186
+          name = '其他'
188
         }
187
         }
189
-        if (row.types == 1){
190
-          name2 = "入库单"
191
-        }else if(row.types == 2){
192
-          name2 = "出库单"
193
-        }else if(row.types == 3){
194
-          name2 = "退货单"
195
-        }else if(row.types == 4){
196
-          name2 = "退库单"
188
+        if (row.types == 1) {
189
+          name2 = '入库单'
190
+        } else if (row.types == 2) {
191
+          name2 = '出库单'
192
+        } else if (row.types == 3) {
193
+          name2 = '退货单'
194
+        } else if (row.types == 4) {
195
+          name2 = '退库单'
197
         }
196
         }
198
         return name + name2
197
         return name + name2
199
       },
198
       },
206
         }
205
         }
207
         return name
206
         return name
208
       },
207
       },
209
-      search:function(){
208
+      search: function() {
210
         const Params = {
209
         const Params = {
211
           page: this.page,
210
           page: this.page,
212
           limit: this.limit,
211
           limit: this.limit,
213
           start_time: this.start_time,
212
           start_time: this.start_time,
214
           end_time: this.end_time,
213
           end_time: this.end_time,
215
           type: this.type,
214
           type: this.type,
216
-          keywords:this.searchKey,
215
+          keywords: this.searchKey
217
         }
216
         }
218
         this.cancelStockDate = []
217
         this.cancelStockDate = []
219
         getStockDetail(Params).then(response => {
218
         getStockDetail(Params).then(response => {
306
             this.manufacturer = response.data.data.manufacturer
305
             this.manufacturer = response.data.data.manufacturer
307
             this.dealer = response.data.data.dealer
306
             this.dealer = response.data.data.dealer
308
             this.goodInfo = response.data.data.goodInfo
307
             this.goodInfo = response.data.data.goodInfo
309
-
310
           }
308
           }
311
         })
309
         })
312
       }, getManufactuerName: function(manufacturer_id) {
310
       }, getManufactuerName: function(manufacturer_id) {
322
           }
320
           }
323
         }
321
         }
324
       }, handleEdit: function(index, row) {
322
       }, handleEdit: function(index, row) {
325
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
323
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
326
       }, handleDelete: function(index, row) {
324
       }, handleDelete: function(index, row) {
327
         const ids = []
325
         const ids = []
328
         ids.push(row.id)
326
         ids.push(row.id)

+ 23 - 26
src/xt_pages/stock/stockInOrder.vue View File

9
 
9
 
10
     <div class="app-container">
10
     <div class="app-container">
11
     <div class="cell clearfix">
11
     <div class="cell clearfix">
12
-      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据编码/制单人/厂商" />
13
-      <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
12
+      <el-input  size="small"  style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据编码/制单人/厂商" />
13
+      <el-button  size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
14
     </div>
14
     </div>
15
 
15
 
16
       <div class="cell clearfix">
16
       <div class="cell clearfix">
17
         <label class="title"><span class="name">入库时间</span> : </label>
17
         <label class="title"><span class="name">入库时间</span> : </label>
18
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
18
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
19
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
19
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
20
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
20
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
21
         <span class="cellLine"> - </span>
21
         <span class="cellLine"> - </span>
22
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
23
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
24
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
24
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
25
       </div>
25
       </div>
163
       // const startTime = year + '-' + month + '-' + day
163
       // const startTime = year + '-' + month + '-' + day
164
       // this.start_time = startTime
164
       // this.start_time = startTime
165
 
165
 
166
-      var nowDate = new Date();
167
-      var nowYear = nowDate.getFullYear();
168
-      var nowMonth = nowDate.getMonth() + 1;
169
-      var nowDay = nowDate.getDate();
166
+      var nowDate = new Date()
167
+      var nowYear = nowDate.getFullYear()
168
+      var nowMonth = nowDate.getMonth() + 1
169
+      var nowDay = nowDate.getDate()
170
       this.end_time =
170
       this.end_time =
171
         nowYear +
171
         nowYear +
172
-        "-" +
173
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
174
-        "-" +
175
-        (nowDay < 10 ? "0" + nowDay : nowDay);
176
-      nowDate.setMonth(nowDate.getMonth() - 1);
177
-      nowYear = nowDate.getFullYear();
178
-      nowMonth = nowDate.getMonth() + 1;
179
-      nowDay = nowDate.getDate();
172
+        '-' +
173
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
174
+        '-' +
175
+        (nowDay < 10 ? '0' + nowDay : nowDay)
176
+      nowDate.setMonth(nowDate.getMonth() - 1)
177
+      nowYear = nowDate.getFullYear()
178
+      nowMonth = nowDate.getMonth() + 1
179
+      nowDay = nowDate.getDate()
180
       this.start_time =
180
       this.start_time =
181
         nowYear +
181
         nowYear +
182
-        "-" +
183
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
184
-        "-" +
185
-        (nowDay < 10 ? "0" + nowDay : nowDay);
186
-
187
-
182
+        '-' +
183
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
184
+        '-' +
185
+        (nowDay < 10 ? '0' + nowDay : nowDay)
188
 
186
 
189
       this.GetWarehouse()
187
       this.GetWarehouse()
190
       this.GetConfigInfo()
188
       this.GetConfigInfo()
197
           { path: false, name: '库存管理' },
195
           { path: false, name: '库存管理' },
198
           { path: false, name: '入库单' }
196
           { path: false, name: '入库单' }
199
         ],
197
         ],
200
-        searchKey:'',
198
+        searchKey: '',
201
         type: 1,
199
         type: 1,
202
         page: 1,
200
         page: 1,
203
         limit: 7,
201
         limit: 7,
228
       }
226
       }
229
     },
227
     },
230
     methods: {
228
     methods: {
231
-      search:function(){
229
+      search: function() {
232
         const Params = {
230
         const Params = {
233
           page: this.page,
231
           page: this.page,
234
           limit: this.limit,
232
           limit: this.limit,
235
           start_time: this.start_time,
233
           start_time: this.start_time,
236
           end_time: this.end_time,
234
           end_time: this.end_time,
237
           type: this.type,
235
           type: this.type,
238
-          keywords:this.searchKey,
236
+          keywords: this.searchKey
239
         }
237
         }
240
         this.Warehouse.warehouseDate = []
238
         this.Warehouse.warehouseDate = []
241
         getWarehouseList(Params).then(response => {
239
         getWarehouseList(Params).then(response => {
251
             }
249
             }
252
           }
250
           }
253
         })
251
         })
254
-
255
       },
252
       },
256
       GetWarehouse: function() {
253
       GetWarehouse: function() {
257
         const Params = {
254
         const Params = {

+ 15 - 19
src/xt_pages/stock/stockInOrderAdd.vue View File

18
 
18
 
19
       <div class="cell clearfix">
19
       <div class="cell clearfix">
20
         <label class="title"><span class="name">入库时间</span> : </label>
20
         <label class="title"><span class="name">入库时间</span> : </label>
21
-        <el-date-picker v-model="warehousing_time"  prefix-icon="el-icon-date"  :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
21
+        <el-date-picker size="small" v-model="warehousing_time"  prefix-icon="el-icon-date"  :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
22
       </div>
22
       </div>
23
 
23
 
24
       <div class="cell clearfix">
24
       <div class="cell clearfix">
25
         <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
25
         <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
26
 
26
 
27
-        <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
27
+        <el-select size="small"  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
28
           <el-option
28
           <el-option
29
             v-for="(option, index) in manufacturer"
29
             v-for="(option, index) in manufacturer"
30
             :key="index"
30
             :key="index"
36
 
36
 
37
       <div class="cell clearfix">
37
       <div class="cell clearfix">
38
         <label class="title"><span class="name">经销商</span> : </label>
38
         <label class="title"><span class="name">经销商</span> : </label>
39
-        <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
39
+        <el-select  size="small" v-model="form.dealer" clearable  placeholder="请选择经销商" >
40
           <el-option
40
           <el-option
41
             v-for="(option, index) in dealer"
41
             v-for="(option, index) in dealer"
42
             :key="index"
42
             :key="index"
359
               tempForm['manufacturer'] = ''
359
               tempForm['manufacturer'] = ''
360
               // this.recordInfo.recordData.add(tempForm,this.currentIndex + i)
360
               // this.recordInfo.recordData.add(tempForm,this.currentIndex + i)
361
               // this.recordInfo.recordData.push(tempForm)
361
               // this.recordInfo.recordData.push(tempForm)
362
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
362
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
363
             }
363
             }
364
           }
364
           }
365
         }
365
         }
367
         this.currentIndex = -1
367
         this.currentIndex = -1
368
       }, cancle: function() {
368
       }, cancle: function() {
369
         this.$refs.dialog.hide()
369
         this.$refs.dialog.hide()
370
-
371
       }, GetAllGoodType: function() {
370
       }, GetAllGoodType: function() {
372
         GetAllGoodType().then(response => {
371
         GetAllGoodType().then(response => {
373
           if (response.data.state == 0) {
372
           if (response.data.state == 0) {
432
         tempObj['manufacturer'] = ''
431
         tempObj['manufacturer'] = ''
433
         this.recordInfo.recordData.push(tempObj)
432
         this.recordInfo.recordData.push(tempObj)
434
       }, handleDelete: function(index, row) {
433
       }, handleDelete: function(index, row) {
435
-        if( this.recordInfo.recordData.length <= 1){
434
+        if (this.recordInfo.recordData.length <= 1) {
436
           this.$message.error('只有一条记录的时候无法删除')
435
           this.$message.error('只有一条记录的时候无法删除')
437
           return
436
           return
438
-        }else{
437
+        } else {
439
           this.recordInfo.recordData.splice(index, 1)
438
           this.recordInfo.recordData.splice(index, 1)
440
         }
439
         }
441
       }, calculate: function(val) {
440
       }, calculate: function(val) {
476
           this.propForm.goodType = this.goodType
475
           this.propForm.goodType = this.goodType
477
           //
476
           //
478
 
477
 
479
-
480
           // GetAllGoodInfoByID(params).then(response => {
478
           // GetAllGoodInfoByID(params).then(response => {
481
           //   if (response.data.state == 0) {
479
           //   if (response.data.state == 0) {
482
           //     this.$message.error(response.data.msg)
480
           //     this.$message.error(response.data.msg)
553
                 this.$message.error(response.data.msg)
551
                 this.$message.error(response.data.msg)
554
                 return false
552
                 return false
555
               } else {
553
               } else {
556
-
557
                 this.$message.success('入库成功')
554
                 this.$message.success('入库成功')
558
 
555
 
559
                 this.$router.back(-1)
556
                 this.$router.back(-1)
563
             return false
560
             return false
564
           }
561
           }
565
         })
562
         })
566
-      },changeManufacturer(){
563
+      }, changeManufacturer() {
567
         this.recordInfo.recordData = []
564
         this.recordInfo.recordData = []
568
         const tempObj = {}
565
         const tempObj = {}
569
         tempObj['good_type_id'] = 0
566
         tempObj['good_type_id'] = 0
577
         tempObj['dealer'] = ''
574
         tempObj['dealer'] = ''
578
         tempObj['manufacturer'] = ''
575
         tempObj['manufacturer'] = ''
579
         this.recordInfo.recordData.push(tempObj)
576
         this.recordInfo.recordData.push(tempObj)
580
-
581
       }
577
       }
582
     },
578
     },
583
     created() {
579
     created() {
584
-      var nowDate = new Date();
585
-      var nowYear = nowDate.getFullYear();
586
-      var nowMonth = nowDate.getMonth() + 1;
587
-      var nowDay = nowDate.getDate();
580
+      var nowDate = new Date()
581
+      var nowYear = nowDate.getFullYear()
582
+      var nowMonth = nowDate.getMonth() + 1
583
+      var nowDay = nowDate.getDate()
588
       this.warehousing_time =
584
       this.warehousing_time =
589
         nowYear +
585
         nowYear +
590
-        "-" +
591
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
592
-        "-" +
593
-        (nowDay < 10 ? "0" + nowDay : nowDay);
586
+        '-' +
587
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
588
+        '-' +
589
+        (nowDay < 10 ? '0' + nowDay : nowDay)
594
       const tempObj = {}
590
       const tempObj = {}
595
       tempObj['good_type_id'] = 0
591
       tempObj['good_type_id'] = 0
596
       tempObj['good_id'] = 0
592
       tempObj['good_id'] = 0

+ 6 - 11
src/xt_pages/stock/stockInOrderEdit.vue View File

19
 
19
 
20
     <div class="cell clearfix">
20
     <div class="cell clearfix">
21
       <label class="title"><span class="name">入库时间</span> : </label>
21
       <label class="title"><span class="name">入库时间</span> : </label>
22
-      <el-date-picker v-model="warehousing_time"  prefix-icon="el-icon-date"  :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
22
+      <el-date-picker size="small" v-model="warehousing_time"  prefix-icon="el-icon-date"  :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
23
     </div>
23
     </div>
24
 
24
 
25
 
25
 
279
               tempForm['remark'] = ''
279
               tempForm['remark'] = ''
280
               tempForm['dealer'] = ''
280
               tempForm['dealer'] = ''
281
               tempForm['manufacturer'] = ''
281
               tempForm['manufacturer'] = ''
282
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
283
-
282
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
284
             }
283
             }
285
           }
284
           }
286
         }
285
         }
288
         this.currentIndex = -1
287
         this.currentIndex = -1
289
       }, cancle: function() {
288
       }, cancle: function() {
290
         this.$refs.dialog.hide()
289
         this.$refs.dialog.hide()
291
-
292
       }, GetConfigInfo: function() {
290
       }, GetConfigInfo: function() {
293
         GetAllConfig().then(response => {
291
         GetAllConfig().then(response => {
294
           if (response.data.state == 0) {
292
           if (response.data.state == 0) {
348
                 this.$message.error(response.data.msg)
346
                 this.$message.error(response.data.msg)
349
                 return false
347
                 return false
350
               } else {
348
               } else {
351
-
352
-                this.$message.success("删除成功")
353
-
349
+                this.$message.success('删除成功')
354
 
350
 
355
                 this.recordInfo.recordData.splice(index, 1)
351
                 this.recordInfo.recordData.splice(index, 1)
356
               }
352
               }
410
             const params = {
406
             const params = {
411
               'stockIn': this.recordInfo.recordData
407
               'stockIn': this.recordInfo.recordData
412
             }
408
             }
413
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id,this.$route.query.type).then(response => {
409
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type).then(response => {
414
               if (response.data.state == 0) {
410
               if (response.data.state == 0) {
415
                 this.$message.error(response.data.msg)
411
                 this.$message.error(response.data.msg)
416
                 return false
412
                 return false
417
               } else {
413
               } else {
418
-
419
-                this.$message.success("入库成功")
414
+                this.$message.success('入库成功')
420
 
415
 
421
                 this.$router.back(-1)
416
                 this.$router.back(-1)
422
               }
417
               }
448
             this.form.dealer = this.warehouse.dealer
443
             this.form.dealer = this.warehouse.dealer
449
             this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
444
             this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
450
 
445
 
451
-            if(this.recordInfo.recordData.length == 0){
446
+            if (this.recordInfo.recordData.length == 0) {
452
               const tempObj = {}
447
               const tempObj = {}
453
               tempObj['id'] = 0
448
               tempObj['id'] = 0
454
               tempObj['good_type_id'] = 0
449
               tempObj['good_type_id'] = 0

+ 122 - 123
src/xt_pages/stock/stockOutOrder.vue View File

7
     </div>
7
     </div>
8
     <div class="app-container">
8
     <div class="app-container">
9
       <div class="cell clearfix">
9
       <div class="cell clearfix">
10
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
11
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
10
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
11
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
12
       </div>
12
       </div>
13
 
13
 
14
       <div class="cell clearfix">
14
       <div class="cell clearfix">
15
         <label class="title"><span class="name">出库时间</span> : </label>
15
         <label class="title"><span class="name">出库时间</span> : </label>
16
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
16
+        <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
17
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
17
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
18
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
18
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
19
         <span class="cellLine"> - </span>
19
         <span class="cellLine"> - </span>
20
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
+        <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
22
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
23
       </div>
23
       </div>
117
 </template>
117
 </template>
118
 
118
 
119
 <script>
119
 <script>
120
-import { uParseTime } from "@/utils/tools";
121
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
120
+import { uParseTime } from '@/utils/tools'
121
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
122
 
122
 
123
 import {
123
 import {
124
   deleteWarehouseOut,
124
   deleteWarehouseOut,
125
   GetAllConfig,
125
   GetAllConfig,
126
   getWarehouseOutList
126
   getWarehouseOutList
127
-} from "@/api/stock";
128
-import BreadCrumb from "../components/bread-crumb";
127
+} from '@/api/stock'
128
+import BreadCrumb from '../components/bread-crumb'
129
 
129
 
130
 export default {
130
 export default {
131
-  name: "salesReturnOrder",
131
+  name: 'salesReturnOrder',
132
   components: { BreadCrumb },
132
   components: { BreadCrumb },
133
   created() {
133
   created() {
134
-    var nowDate = new Date();
135
-    var nowYear = nowDate.getFullYear();
136
-    var nowMonth = nowDate.getMonth() + 1;
137
-    var nowDay = nowDate.getDate();
134
+    var nowDate = new Date()
135
+    var nowYear = nowDate.getFullYear()
136
+    var nowMonth = nowDate.getMonth() + 1
137
+    var nowDay = nowDate.getDate()
138
     this.end_time =
138
     this.end_time =
139
       nowYear +
139
       nowYear +
140
-      "-" +
141
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
142
-      "-" +
143
-      (nowDay < 10 ? "0" + nowDay : nowDay);
144
-    nowDate.setMonth(nowDate.getMonth() - 1);
145
-    nowYear = nowDate.getFullYear();
146
-    nowMonth = nowDate.getMonth() + 1;
147
-    nowDay = nowDate.getDate();
140
+      '-' +
141
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
142
+      '-' +
143
+      (nowDay < 10 ? '0' + nowDay : nowDay)
144
+    nowDate.setMonth(nowDate.getMonth() - 1)
145
+    nowYear = nowDate.getFullYear()
146
+    nowMonth = nowDate.getMonth() + 1
147
+    nowDay = nowDate.getDate()
148
     this.start_time =
148
     this.start_time =
149
       nowYear +
149
       nowYear +
150
-      "-" +
151
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
152
-      "-" +
153
-      (nowDay < 10 ? "0" + nowDay : nowDay);
154
-    this.GetWarehouseOut();
155
-    this.GetConfigInfo();
156
-    this.fetchAllAdminUsers();
150
+      '-' +
151
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
152
+      '-' +
153
+      (nowDay < 10 ? '0' + nowDay : nowDay)
154
+    this.GetWarehouseOut()
155
+    this.GetConfigInfo()
156
+    this.fetchAllAdminUsers()
157
   },
157
   },
158
   data() {
158
   data() {
159
     return {
159
     return {
160
-      searchKey:"",
160
+      searchKey: '',
161
       crumbs: [
161
       crumbs: [
162
-        { path: false, name: "库存管理" },
163
-        { path: false, name: "出库单" }
162
+        { path: false, name: '库存管理' },
163
+        { path: false, name: '出库单' }
164
       ],
164
       ],
165
       page: 1,
165
       page: 1,
166
       limit: 7,
166
       limit: 7,
170
       pageSelect: 0,
170
       pageSelect: 0,
171
       adminUserOptions: [],
171
       adminUserOptions: [],
172
       multipleSelection: [],
172
       multipleSelection: [],
173
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
174
-      start_time: "",
173
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
174
+      start_time: '',
175
       warehouseOutDate: [],
175
       warehouseOutDate: [],
176
-      end_time: "",
176
+      end_time: '',
177
       goodType: [],
177
       goodType: [],
178
       goodInfo: [],
178
       goodInfo: [],
179
       manufacturer: [],
179
       manufacturer: [],
180
       selectedTableData: [],
180
       selectedTableData: [],
181
       dealer: [],
181
       dealer: [],
182
       type: 1
182
       type: 1
183
-    };
183
+    }
184
   },
184
   },
185
   methods: {
185
   methods: {
186
-    search:function(){
186
+    search: function() {
187
       const Params = {
187
       const Params = {
188
         page: this.page,
188
         page: this.page,
189
         limit: this.limit,
189
         limit: this.limit,
190
         start_time: this.start_time,
190
         start_time: this.start_time,
191
         end_time: this.end_time,
191
         end_time: this.end_time,
192
         type: this.type,
192
         type: this.type,
193
-        keywords:this.searchKey,
193
+        keywords: this.searchKey
194
       }
194
       }
195
-      this.warehouseOutDate = [];
195
+      this.warehouseOutDate = []
196
       getWarehouseOutList(Params).then(response => {
196
       getWarehouseOutList(Params).then(response => {
197
         if (response.data.state == 0) {
197
         if (response.data.state == 0) {
198
-          this.$message.error(response.data.msg);
199
-          return false;
198
+          this.$message.error(response.data.msg)
199
+          return false
200
         } else {
200
         } else {
201
-          this.total = response.data.data.total;
201
+          this.total = response.data.data.total
202
           for (let i = 0; i < response.data.data.list.length; i++) {
202
           for (let i = 0; i < response.data.data.list.length; i++) {
203
-            this.warehouseOutDate.push(response.data.data.list[i]);
203
+            this.warehouseOutDate.push(response.data.data.list[i])
204
           }
204
           }
205
         }
205
         }
206
-      });
207
-
206
+      })
208
     },
207
     },
209
     AddNewOrder: function() {
208
     AddNewOrder: function() {
210
       this.$router.push({
209
       this.$router.push({
211
-        name: "stockOutOrderAdd",
210
+        name: 'stockOutOrderAdd',
212
         query: { type: this.type }
211
         query: { type: this.type }
213
-      });
212
+      })
214
     },
213
     },
215
     GetWarehouseOut: function() {
214
     GetWarehouseOut: function() {
216
       const Params = {
215
       const Params = {
219
         start_time: this.start_time,
218
         start_time: this.start_time,
220
         end_time: this.end_time,
219
         end_time: this.end_time,
221
         type: this.type
220
         type: this.type
222
-      };
223
-      this.warehouseOutDate = [];
221
+      }
222
+      this.warehouseOutDate = []
224
       getWarehouseOutList(Params).then(response => {
223
       getWarehouseOutList(Params).then(response => {
225
         if (response.data.state == 0) {
224
         if (response.data.state == 0) {
226
-          this.$message.error(response.data.msg);
227
-          return false;
225
+          this.$message.error(response.data.msg)
226
+          return false
228
         } else {
227
         } else {
229
-          this.total = response.data.data.total;
228
+          this.total = response.data.data.total
230
           for (let i = 0; i < response.data.data.list.length; i++) {
229
           for (let i = 0; i < response.data.data.list.length; i++) {
231
-            this.warehouseOutDate.push(response.data.data.list[i]);
230
+            this.warehouseOutDate.push(response.data.data.list[i])
232
           }
231
           }
233
         }
232
         }
234
-      });
233
+      })
235
     },
234
     },
236
     getXuserName(id) {
235
     getXuserName(id) {
237
       if (id <= 0) {
236
       if (id <= 0) {
238
-        return "";
237
+        return ''
239
       }
238
       }
240
-      var name = "";
239
+      var name = ''
241
       if (
240
       if (
242
         this.adminUserOptions == null ||
241
         this.adminUserOptions == null ||
243
-        typeof this.adminUserOptions.length === "undefined"
242
+        typeof this.adminUserOptions.length === 'undefined'
244
       ) {
243
       ) {
245
-        return name;
244
+        return name
246
       }
245
       }
247
-      var leng = this.adminUserOptions.length;
246
+      var leng = this.adminUserOptions.length
248
       if (leng == 0) {
247
       if (leng == 0) {
249
-        return name;
248
+        return name
250
       }
249
       }
251
       for (let index = 0; index < leng; index++) {
250
       for (let index = 0; index < leng; index++) {
252
         if (this.adminUserOptions[index].id == id) {
251
         if (this.adminUserOptions[index].id == id) {
253
-          name = this.adminUserOptions[index].name;
254
-          break;
252
+          name = this.adminUserOptions[index].name
253
+          break
255
         }
254
         }
256
       }
255
       }
257
-      return name;
256
+      return name
258
     },
257
     },
259
     fetchAllAdminUsers() {
258
     fetchAllAdminUsers() {
260
       fetchAllAdminUsers().then(response => {
259
       fetchAllAdminUsers().then(response => {
261
-        console.log(response);
260
+        console.log(response)
262
         if (response.data.state == 1) {
261
         if (response.data.state == 1) {
263
-          this.adminUserOptions = response.data.data.users;
264
-          var alen = this.adminUserOptions.length;
262
+          this.adminUserOptions = response.data.data.users
263
+          var alen = this.adminUserOptions.length
265
           for (let index = 0; index < alen; index++) {
264
           for (let index = 0; index < alen; index++) {
266
             if (this.adminUserOptions[index].user_type == 2) {
265
             if (this.adminUserOptions[index].user_type == 2) {
267
               // this.doctorOptions.push(this.adminUserOptions[index]);
266
               // this.doctorOptions.push(this.adminUserOptions[index]);
268
             }
267
             }
269
           }
268
           }
270
         }
269
         }
271
-      });
270
+      })
272
     },
271
     },
273
     handleSelectionChange: function(val) {
272
     handleSelectionChange: function(val) {
274
-      this.multipleSelection = val;
273
+      this.multipleSelection = val
275
     },
274
     },
276
     handleSizeChange(val) {
275
     handleSizeChange(val) {
277
-      this.limit = val;
278
-      this.GetWarehouseOut();
276
+      this.limit = val
277
+      this.GetWarehouseOut()
279
     },
278
     },
280
     handleCurrentChange(val) {
279
     handleCurrentChange(val) {
281
-      this.page = val;
282
-      this.GetWarehouseOut();
280
+      this.page = val
281
+      this.GetWarehouseOut()
283
     },
282
     },
284
     startTimeChange(val) {
283
     startTimeChange(val) {
285
-      this.GetWarehouseOut();
284
+      this.GetWarehouseOut()
286
     },
285
     },
287
     endTimeChange(val) {
286
     endTimeChange(val) {
288
-      this.GetWarehouseOut();
287
+      this.GetWarehouseOut()
289
     },
288
     },
290
     calculate: function(val) {
289
     calculate: function(val) {
291
-      return Math.round(parseFloat(val) * 100) / 100;
290
+      return Math.round(parseFloat(val) * 100) / 100
292
     },
291
     },
293
     GetConfigInfo: function() {
292
     GetConfigInfo: function() {
294
       GetAllConfig().then(response => {
293
       GetAllConfig().then(response => {
295
         if (response.data.state == 0) {
294
         if (response.data.state == 0) {
296
-          this.$message.error(response.data.msg);
297
-          return false;
295
+          this.$message.error(response.data.msg)
296
+          return false
298
         } else {
297
         } else {
299
-          this.manufacturer = response.data.data.manufacturer;
300
-          this.dealer = response.data.data.dealer;
298
+          this.manufacturer = response.data.data.manufacturer
299
+          this.dealer = response.data.data.dealer
301
         }
300
         }
302
-      });
301
+      })
303
     },
302
     },
304
     getManufactuerName: function(manufacturer_id) {
303
     getManufactuerName: function(manufacturer_id) {
305
       for (let i = 0; i < this.manufacturer.length; i++) {
304
       for (let i = 0; i < this.manufacturer.length; i++) {
306
         if (this.manufacturer[i].id == manufacturer_id) {
305
         if (this.manufacturer[i].id == manufacturer_id) {
307
-          return this.manufacturer[i].manufacturer_name;
306
+          return this.manufacturer[i].manufacturer_name
308
         }
307
         }
309
       }
308
       }
310
     },
309
     },
311
     getDealerName: function(dealer_id) {
310
     getDealerName: function(dealer_id) {
312
       for (let i = 0; i < this.dealer.length; i++) {
311
       for (let i = 0; i < this.dealer.length; i++) {
313
         if (this.dealer[i].id == dealer_id) {
312
         if (this.dealer[i].id == dealer_id) {
314
-          return this.dealer[i].dealer_name;
313
+          return this.dealer[i].dealer_name
315
         }
314
         }
316
       }
315
       }
317
     },
316
     },
318
     handleEdit: function(index, row) {
317
     handleEdit: function(index, row) {
319
       this.$router.push({
318
       this.$router.push({
320
-        name: "stockOutDetail",
319
+        name: 'stockOutDetail',
321
         query: { id: row.id, type: this.type }
320
         query: { id: row.id, type: this.type }
322
-      });
321
+      })
323
     },
322
     },
324
     handleDelete: function(index, row) {
323
     handleDelete: function(index, row) {
325
-      const ids = [];
326
-      ids.push(row.id);
327
-      const idStr = ids.join(",");
324
+      const ids = []
325
+      ids.push(row.id)
326
+      const idStr = ids.join(',')
328
 
327
 
329
       const params = {
328
       const params = {
330
         ids: idStr
329
         ids: idStr
331
-      };
330
+      }
332
 
331
 
333
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
334
-        confirmButtonText: "确定",
335
-        cancelButtonText: "取消",
336
-        type: "warning"
332
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
333
+        confirmButtonText: '确定',
334
+        cancelButtonText: '取消',
335
+        type: 'warning'
337
       })
336
       })
338
         .then(() => {
337
         .then(() => {
339
           deleteWarehouseOut(params).then(response => {
338
           deleteWarehouseOut(params).then(response => {
340
             if (response.data.state == 0) {
339
             if (response.data.state == 0) {
341
-              this.$message.error(response.data.msg);
342
-              return false;
340
+              this.$message.error(response.data.msg)
341
+              return false
343
             } else {
342
             } else {
344
               this.$notify({
343
               this.$notify({
345
-                title: "成功",
346
-                message: "删除成功",
347
-                type: "success",
344
+                title: '成功',
345
+                message: '删除成功',
346
+                type: 'success',
348
                 duration: 2000
347
                 duration: 2000
349
-              });
348
+              })
350
               for (let i = 0; i < ids.length; i++) {
349
               for (let i = 0; i < ids.length; i++) {
351
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
350
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
352
                   if (ids[i] == this.warehouseOutDate[y].id) {
351
                   if (ids[i] == this.warehouseOutDate[y].id) {
353
-                    this.warehouseOutDate.splice(y, 1);
352
+                    this.warehouseOutDate.splice(y, 1)
354
                   }
353
                   }
355
                 }
354
                 }
356
               }
355
               }
357
             }
356
             }
358
-          });
357
+          })
359
         })
358
         })
360
-        .catch(() => {});
359
+        .catch(() => {})
361
     },
360
     },
362
     changeAllSelected: function(val) {
361
     changeAllSelected: function(val) {
363
       if (val) {
362
       if (val) {
364
-        this.$refs.multipleTable.toggleAllSelection();
363
+        this.$refs.multipleTable.toggleAllSelection()
365
       } else {
364
       } else {
366
-        this.$refs.multipleTable.clearSelection();
365
+        this.$refs.multipleTable.clearSelection()
367
       }
366
       }
368
     },
367
     },
369
     select(selection) {
368
     select(selection) {
370
-      this.selectedTableData = selection;
369
+      this.selectedTableData = selection
371
     },
370
     },
372
     batchDelete() {
371
     batchDelete() {
373
       if (this.selectedTableData.length <= 0) {
372
       if (this.selectedTableData.length <= 0) {
374
-        this.$message.error("请选择要删除的记录");
375
-        return;
373
+        this.$message.error('请选择要删除的记录')
374
+        return
376
       }
375
       }
377
-      const ids = [];
376
+      const ids = []
378
       for (let i = 0; i < this.selectedTableData.length; i++) {
377
       for (let i = 0; i < this.selectedTableData.length; i++) {
379
-        ids.push(this.selectedTableData[i].id);
378
+        ids.push(this.selectedTableData[i].id)
380
       }
379
       }
381
-      const idStr = ids.join(",");
380
+      const idStr = ids.join(',')
382
       const params = {
381
       const params = {
383
         ids: idStr
382
         ids: idStr
384
-      };
385
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
386
-        confirmButtonText: "确定",
387
-        cancelButtonText: "取消",
388
-        type: "warning"
383
+      }
384
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
385
+        confirmButtonText: '确定',
386
+        cancelButtonText: '取消',
387
+        type: 'warning'
389
       })
388
       })
390
         .then(() => {
389
         .then(() => {
391
           deleteWarehouseOut(params).then(response => {
390
           deleteWarehouseOut(params).then(response => {
392
             if (response.data.state == 0) {
391
             if (response.data.state == 0) {
393
-              this.$message.error(response.data.msg);
394
-              return false;
392
+              this.$message.error(response.data.msg)
393
+              return false
395
             } else {
394
             } else {
396
               this.$notify({
395
               this.$notify({
397
-                title: "成功",
398
-                message: "删除成功",
399
-                type: "success",
396
+                title: '成功',
397
+                message: '删除成功',
398
+                type: 'success',
400
                 duration: 2000
399
                 duration: 2000
401
-              });
400
+              })
402
 
401
 
403
               for (let i = 0; i < ids.length; i++) {
402
               for (let i = 0; i < ids.length; i++) {
404
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
403
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
405
                   if (ids[i] == this.warehouseOutDate[y].id) {
404
                   if (ids[i] == this.warehouseOutDate[y].id) {
406
-                    this.warehouseOutDate.splice(y, 1);
405
+                    this.warehouseOutDate.splice(y, 1)
407
                   }
406
                   }
408
                 }
407
                 }
409
               }
408
               }
410
             }
409
             }
411
-          });
410
+          })
412
         })
411
         })
413
-        .catch(() => {});
412
+        .catch(() => {})
414
     }
413
     }
415
   }
414
   }
416
-};
415
+}
417
 </script>
416
 </script>
418
 
417
 
419
 <style rel="stylesheet/scss" lang="scss" scoped>
418
 <style rel="stylesheet/scss" lang="scss" scoped>

+ 16 - 19
src/xt_pages/stock/stockOutOrderAdd.vue View File

18
 
18
 
19
     <div class="cell clearfix">
19
     <div class="cell clearfix">
20
         <label class="title"><span class="name">出库时间</span> : </label>
20
         <label class="title"><span class="name">出库时间</span> : </label>
21
-          <el-date-picker v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
+          <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                           type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                           type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                           value-format="yyyy-MM-dd"></el-date-picker>
23
                           value-format="yyyy-MM-dd"></el-date-picker>
24
         </div>
24
         </div>
27
     <div class="cell clearfix">
27
     <div class="cell clearfix">
28
       <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
28
       <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
29
 
29
 
30
-      <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
30
+      <el-select size="small"  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
31
         <el-option
31
         <el-option
32
           v-for="(option, index) in manufacturer"
32
           v-for="(option, index) in manufacturer"
33
           :key="index"
33
           :key="index"
39
 
39
 
40
     <div class="cell clearfix">
40
     <div class="cell clearfix">
41
       <label class="title"><span class="name">经销商</span> : </label>
41
       <label class="title"><span class="name">经销商</span> : </label>
42
-      <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
42
+      <el-select size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商" >
43
         <el-option
43
         <el-option
44
           v-for="(option, index) in dealer"
44
           v-for="(option, index) in dealer"
45
           :key="index"
45
           :key="index"
225
               tempForm['count'] = ''
225
               tempForm['count'] = ''
226
               tempForm['price'] = ''
226
               tempForm['price'] = ''
227
               tempForm['remark'] = ''
227
               tempForm['remark'] = ''
228
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
229
-
228
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
230
             }
229
             }
231
           }
230
           }
232
         }
231
         }
234
         this.currentIndex = -1
233
         this.currentIndex = -1
235
       }, cancle: function() {
234
       }, cancle: function() {
236
         this.$refs.dialog.hide()
235
         this.$refs.dialog.hide()
237
-
238
       }, GetConfigInfo: function() {
236
       }, GetConfigInfo: function() {
239
         const params = {
237
         const params = {
240
           type: this.$route.query.type
238
           type: this.$route.query.type
303
 
301
 
304
         this.recordInfo.recordData.push(tempObj)
302
         this.recordInfo.recordData.push(tempObj)
305
       }, handleDelete: function(index, row) {
303
       }, handleDelete: function(index, row) {
306
-        if( this.recordInfo.recordData.length <= 1){
304
+        if (this.recordInfo.recordData.length <= 1) {
307
           this.$message.error('只有一条记录的时候无法删除')
305
           this.$message.error('只有一条记录的时候无法删除')
308
           return
306
           return
309
-        }else{
307
+        } else {
310
           this.recordInfo.recordData.splice(index, 1)
308
           this.recordInfo.recordData.splice(index, 1)
311
         }
309
         }
312
       }, calculate: function(val) {
310
       }, calculate: function(val) {
375
                 this.$message.error(response.data.msg)
373
                 this.$message.error(response.data.msg)
376
                 return false
374
                 return false
377
               } else {
375
               } else {
378
-
379
-                this.$message.success("退货成功")
376
+                this.$message.success('退货成功')
380
                 this.recordInfo.recordData = []
377
                 this.recordInfo.recordData = []
381
                 this.$router.back(-1)
378
                 this.$router.back(-1)
382
               }
379
               }
385
             return false
382
             return false
386
           }
383
           }
387
         })
384
         })
388
-      },changeManufacturer(){
385
+      }, changeManufacturer() {
389
         this.recordInfo.recordData = []
386
         this.recordInfo.recordData = []
390
         const tempObj = {}
387
         const tempObj = {}
391
         tempObj['good_type_id'] = 0
388
         tempObj['good_type_id'] = 0
397
       }
394
       }
398
     },
395
     },
399
     created() {
396
     created() {
400
-      var nowDate = new Date();
401
-      var nowYear = nowDate.getFullYear();
402
-      var nowMonth = nowDate.getMonth() + 1;
403
-      var nowDay = nowDate.getDate();
397
+      var nowDate = new Date()
398
+      var nowYear = nowDate.getFullYear()
399
+      var nowMonth = nowDate.getMonth() + 1
400
+      var nowDay = nowDate.getDate()
404
       this.warehouse_out_time =
401
       this.warehouse_out_time =
405
         nowYear +
402
         nowYear +
406
-        "-" +
407
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
408
-        "-" +
409
-        (nowDay < 10 ? "0" + nowDay : nowDay);
403
+        '-' +
404
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
405
+        '-' +
406
+        (nowDay < 10 ? '0' + nowDay : nowDay)
410
       const tempObj = {}
407
       const tempObj = {}
411
       tempObj['good_type_id'] = 0
408
       tempObj['good_type_id'] = 0
412
       tempObj['good_id'] = 0
409
       tempObj['good_id'] = 0

+ 6 - 13
src/xt_pages/stock/stockOutOrderEdit.vue View File

17
 
17
 
18
     <div class="cell clearfix">
18
     <div class="cell clearfix">
19
       <label class="title"><span class="name">出库时间</span> : </label>
19
       <label class="title"><span class="name">出库时间</span> : </label>
20
-      <el-date-picker v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
+      <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                             type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                             type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                             value-format="yyyy-MM-dd"></el-date-picker>
22
                             value-format="yyyy-MM-dd"></el-date-picker>
23
     </div>
23
     </div>
208
               tempForm['count'] = ''
208
               tempForm['count'] = ''
209
               tempForm['price'] = ''
209
               tempForm['price'] = ''
210
               tempForm['remark'] = ''
210
               tempForm['remark'] = ''
211
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
212
-
211
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
213
             }
212
             }
214
           }
213
           }
215
         }
214
         }
285
                 this.$message.error(response.data.msg)
284
                 this.$message.error(response.data.msg)
286
                 return false
285
                 return false
287
               } else {
286
               } else {
288
-
289
-                this.$message.success("删除成功")
287
+                this.$message.success('删除成功')
290
 
288
 
291
                 this.recordInfo.recordData.splice(index, 1)
289
                 this.recordInfo.recordData.splice(index, 1)
292
               }
290
               }
303
       }, showDialog(index, row) {
301
       }, showDialog(index, row) {
304
         this.currentIndex = index
302
         this.currentIndex = index
305
 
303
 
306
-
307
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
304
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
308
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
305
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
309
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
306
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
315
           return cur
312
           return cur
316
         }, [])
313
         }, [])
317
         this.$refs.dialog.show()
314
         this.$refs.dialog.show()
318
-
319
       }, back() {
315
       }, back() {
320
         this.$router.go(-1)
316
         this.$router.go(-1)
321
       }, submit() {
317
       }, submit() {
336
             const params = {
332
             const params = {
337
               'stockOut': this.recordInfo.recordData
333
               'stockOut': this.recordInfo.recordData
338
             }
334
             }
339
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id,this.$route.query.type).then(response => {
335
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type).then(response => {
340
               if (response.data.state == 0) {
336
               if (response.data.state == 0) {
341
                 this.$message.error(response.data.msg)
337
                 this.$message.error(response.data.msg)
342
                 return false
338
                 return false
343
               } else {
339
               } else {
344
-
345
-                this.$message.success("退货成功")
340
+                this.$message.success('退货成功')
346
                 this.$router.back(-1)
341
                 this.$router.back(-1)
347
               }
342
               }
348
             })
343
             })
368
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
363
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
369
           }
364
           }
370
 
365
 
371
-          if( this.recordInfo.recordData.length == 0){
366
+          if (this.recordInfo.recordData.length == 0) {
372
             const tempObj = {}
367
             const tempObj = {}
373
             tempObj['id'] = 0
368
             tempObj['id'] = 0
374
             tempObj['good_type_id'] = 0
369
             tempObj['good_type_id'] = 0
378
             tempObj['remark'] = ''
373
             tempObj['remark'] = ''
379
             this.recordInfo.recordData.push(tempObj)
374
             this.recordInfo.recordData.push(tempObj)
380
           }
375
           }
381
-
382
-
383
         })
376
         })
384
       }, calculate: function(val) {
377
       }, calculate: function(val) {
385
         if (val == 0) {
378
         if (val == 0) {

+ 3 - 3
src/xt_permission.js View File

9
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
9
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
10
 
10
 
11
 router.beforeEach((to, from, next) => {
11
 router.beforeEach((to, from, next) => {
12
-  //线上注释
12
+  // 线上注释
13
   if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
13
   if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
14
     store.dispatch('VerifyConfigList', []).then(() => {
14
     store.dispatch('VerifyConfigList', []).then(() => {
15
       next()
15
       next()
23
     next()
23
     next()
24
   }
24
   }
25
   return
25
   return
26
- //线上注释
27
- 
26
+  // 线上注释
27
+
28
   NProgress.start()
28
   NProgress.start()
29
   // console.log(store.getters.current_role_urls.indexOf(to.path))
29
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // alert('path:' + to.path)
30
   // alert('path:' + to.path)