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

.idea/codeStyles/Project.xml

@@ -0,0 +1,27 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JSCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+      <option name="SPACE_BEFORE_ASYNC_ARROW_LPAREN" value="false" />
+    </JSCodeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/encodings.xml

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

.idea/misc.xml

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

.idea/modules.xml

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

.idea/vcs.xml

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

.idea/xt_vue.iml

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

src/router/index.js

@@ -548,400 +548,400 @@ export default new Router({
 
 export const xt_asyncRouterMap = [
 // //////////////////////////////////线在开始
-  // {
-  //   path: '/patients',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'User',
-  //   alwaysShow: true,
-  //   meta: {
-  //     title: 'user',
-  //     icon: 'bingren'
-  //   },
-  //   children: [
-  //     {
-  //       path: '/patients/patients',
-  //       component: () => import('@/xt_pages/user/patients'),
-  //       name: 'Patient',
-  //       meta: { title: 'patient', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/create',
-  //       component: () => import('@/xt_pages/user/createPatient'),
-  //       name: 'createPatient',
-  //       meta: { title: 'createPatient', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id',
-  //       component: () => import('@/xt_pages/user/patientInfo'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'patient Page',
-  //       meta: { title: 'patientPage', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/edit',
-  //       component: () => import('@/xt_pages/user/editPatient'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'Edit Patient',
-  //       meta: { title: 'editPatient', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/dialysisSolution',
-  //       component: () => import('@/xt_pages/user/dialysisSolution'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysisSolution',
-  //       meta: { title: 'dialysisSolution', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/weight',
-  //       component: () => import('@/xt_pages/user/weight'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'weight',
-  //       meta: { title: 'weight', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/dialysisRecord',
-  //       component: () => import('@/xt_pages/user/dialysisRecord'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysisRecord',
-  //       meta: { title: 'dialysisRecord', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/scheduling',
-  //       component: () => import('@/xt_pages/user/scheduling'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'scheduling',
-  //       meta: { title: 'scheduling', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/doctorAdvice',
-  //       component: () => import('@/xt_pages/user/doctorAdvice'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'doctorAdvice',
-  //       meta: { title: 'doctorAdvice', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/inspection',
-  //       component: () => import('@/xt_pages/user/inspection'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'Inspection',
-  //       meta: { title: 'inspection', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/course',
-  //       component: () => import('@/xt_pages/user/courseOfDisease'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'CourseOfDiseaseManage',
-  //       meta: { title: 'CourseOfDiseaseManage', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/rescue',
-  //       component: () => import('@/xt_pages/user/rescueRecord'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'RescueRecord',
-  //       meta: { title: 'RescueRecord', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/proeducation',
-  //       component: () => import('@/xt_pages/user/proeducation'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'proeducation',
-  //       meta: { title: 'proeducation', noCache: true }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/workforce',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'workforce',
-  //   alwaysShow: true,
-  //   meta: {
-  //     title: 'workforce',
-  //     icon: 'paiban'
-  //   },
-  //   children: [
-  //     {
-  //       path: '/workforce/appointment',
-  //       component: () => import('@/xt_pages/workforce/appointment'),
-  //       name: 'appointment',
-  //       meta: { title: 'appointment', noCache: true }
-  //     },
-  //     {
-  //       path: '/workforce/sign',
-  //       component: () => import('@/xt_pages/workforce/sign'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'workforcesign',
-  //       meta: { title: 'sign', noCache: true }
-  //     },
-  //     {
-  //       path: '/workforce/remind',
-  //       component: () => import('@/xt_pages/workforce/remind'),
-  //       name: 'remind',
-  //       meta: { title: 'remind', noCache: true }
-  //     },
-  //     {
-  //       path: "/workforce/template",
-  //       component: () => import("@/xt_pages/workforce/template"),
-  //       name: "workforce_template",
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'workforce_template', noCache: true }
-  //     },
-  //     {
-  //       path: "/workforce/schedule/print",
-  //       component: () => import("@/xt_pages/workforce/schedule_print"),
-  //       name: "schedule_print",
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'schedule_print', noCache: true }
-  //     },
-  //   ]
-  // },
-  // {
-  //   path: '/sign',
-  //   component: Layout,
-  //   redirct: '/sign/index',
-  //   children: [{
-  //     path: '/sign',
-  //     component: () => import('@/xt_pages/sign/index'),
-  //     name: 'sign',
-  //     meta: { title: 'signWeight', icon: 'sign', noCache: true }
-  //   }]
-  // },
-  // {
-  //   path: '/dialysis/',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'dialysis',
-  //   alwaysShow: true,
-  //   meta: {
-  //     title: 'dialysis',
-  //     icon: 'touxi'
-  //   },
-  //   children: [
-  //     { path: '/dialysis/dialysisrecord', component: () => import('@/xt_pages/dialysis/schedualPatient'), name: '透析记录', meta: { title: '透析记录' }},
-  //     {
-  //       path: '/dialysis/record/:id',
-  //       component: () => import('@/xt_pages/dialysis/dialysisPage'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'paper',
-  //       meta: { title: 'paper', noCache: true }
-  //     },
-  //     {
-  //       path: '/dialysis/print',
-  //       component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysisPrintOrder',
-  //       meta: { title: 'dialysisPrintOrder', noCache: true }
-  //     },
+  {
+    path: '/patients',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'User',
+    alwaysShow: true,
+    meta: {
+      title: 'user',
+      icon: 'bingren'
+    },
+    children: [
+      {
+        path: '/patients/patients',
+        component: () => import('@/xt_pages/user/patients'),
+        name: 'Patient',
+        meta: { title: 'patient', noCache: true }
+      },
+      {
+        path: '/patients/create',
+        component: () => import('@/xt_pages/user/createPatient'),
+        name: 'createPatient',
+        meta: { title: 'createPatient', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id',
+        component: () => import('@/xt_pages/user/patientInfo'),
+        hidden: true,
+        is_menu: false,
+        name: 'patient Page',
+        meta: { title: 'patientPage', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/edit',
+        component: () => import('@/xt_pages/user/editPatient'),
+        hidden: true,
+        is_menu: false,
+        name: 'Edit Patient',
+        meta: { title: 'editPatient', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/dialysisSolution',
+        component: () => import('@/xt_pages/user/dialysisSolution'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysisSolution',
+        meta: { title: 'dialysisSolution', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/weight',
+        component: () => import('@/xt_pages/user/weight'),
+        hidden: true,
+        is_menu: false,
+        name: 'weight',
+        meta: { title: 'weight', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/dialysisRecord',
+        component: () => import('@/xt_pages/user/dialysisRecord'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysisRecord',
+        meta: { title: 'dialysisRecord', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/scheduling',
+        component: () => import('@/xt_pages/user/scheduling'),
+        hidden: true,
+        is_menu: false,
+        name: 'scheduling',
+        meta: { title: 'scheduling', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/doctorAdvice',
+        component: () => import('@/xt_pages/user/doctorAdvice'),
+        hidden: true,
+        is_menu: false,
+        name: 'doctorAdvice',
+        meta: { title: 'doctorAdvice', noCache: true }
+      },
+      {
+        path: '/patients/inspection',
+        component: () => import('@/xt_pages/user/inspection'),
+        hidden: true,
+        is_menu: false,
+        name: 'Inspection',
+        meta: { title: 'inspection', noCache: true }
+      },
+      {
+        path: '/patients/course',
+        component: () => import('@/xt_pages/user/courseOfDisease'),
+        hidden: true,
+        is_menu: false,
+        name: 'CourseOfDiseaseManage',
+        meta: { title: 'CourseOfDiseaseManage', noCache: true }
+      },
+      {
+        path: '/patients/rescue',
+        component: () => import('@/xt_pages/user/rescueRecord'),
+        hidden: true,
+        is_menu: false,
+        name: 'RescueRecord',
+        meta: { title: 'RescueRecord', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/proeducation',
+        component: () => import('@/xt_pages/user/proeducation'),
+        hidden: true,
+        is_menu: false,
+        name: 'proeducation',
+        meta: { title: 'proeducation', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/workforce',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'workforce',
+    alwaysShow: true,
+    meta: {
+      title: 'workforce',
+      icon: 'paiban'
+    },
+    children: [
+      {
+        path: '/workforce/appointment',
+        component: () => import('@/xt_pages/workforce/appointment'),
+        name: 'appointment',
+        meta: { title: 'appointment', noCache: true }
+      },
+      {
+        path: '/workforce/sign',
+        component: () => import('@/xt_pages/workforce/sign'),
+        hidden: true,
+        is_menu: false,
+        name: 'workforcesign',
+        meta: { title: 'sign', noCache: true }
+      },
+      {
+        path: '/workforce/remind',
+        component: () => import('@/xt_pages/workforce/remind'),
+        name: 'remind',
+        meta: { title: 'remind', noCache: true }
+      },
+      {
+        path: "/workforce/template",
+        component: () => import("@/xt_pages/workforce/template"),
+        name: "workforce_template",
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'workforce_template', noCache: true }
+      },
+      {
+        path: "/workforce/schedule/print",
+        component: () => import("@/xt_pages/workforce/schedule_print"),
+        name: "schedule_print",
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'schedule_print', noCache: true }
+      },
+    ]
+  },
+  {
+    path: '/sign',
+    component: Layout,
+    redirct: '/sign/index',
+    children: [{
+      path: '/sign',
+      component: () => import('@/xt_pages/sign/index'),
+      name: 'sign',
+      meta: { title: 'signWeight', icon: 'sign', noCache: true }
+    }]
+  },
+  {
+    path: '/dialysis/',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'dialysis',
+    alwaysShow: true,
+    meta: {
+      title: 'dialysis',
+      icon: 'touxi'
+    },
+    children: [
+      { path: '/dialysis/dialysisrecord', component: () => import('@/xt_pages/dialysis/schedualPatient'), name: '透析记录', meta: { title: '透析记录' }},
+      {
+        path: '/dialysis/record/:id',
+        component: () => import('@/xt_pages/dialysis/dialysisPage'),
+        hidden: true,
+        is_menu: false,
+        name: 'paper',
+        meta: { title: 'paper', noCache: true }
+      },
+      {
+        path: '/dialysis/print',
+        component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysisPrintOrder',
+        meta: { title: 'dialysisPrintOrder', noCache: true }
+      },
 
-  //     // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
-  //     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
-  //     { path: '/dialysis/watch', component: () => import('@/xt_pages/dialysis/bloodPresssWatch'), name: 'watch', meta: { title: 'watch' }},
-  //     { path: '/dialysis/details', component: () => import('@/xt_pages/dialysis/details'), name: 'details', meta: { title: 'details' }, is_menu: false,},
-  //     {
-  //       path: '/dialysis/print/batch',
-  //       component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysis_batch_print',
-  //       meta: { title: '批量打印', noCache: true }
-  //     },
-  //     { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
-  //   ]
-  // },
-  // {
-  //   path: '/stock/',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'stockManage',
-  //   meta: { title: 'stockManage', icon: 'stock' },
-  //   children: [
-  //     {
-  //       path: '/stock/in',
-  //       component: () => import('@/xt_pages/stock/stockInOrder'),
-  //       name: 'stockInOrder',
-  //       meta: { title: 'stockInOrder', noCache: true }
-  //     }, {
-  //       path: '/stock/return',
-  //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
-  //       name: 'salesReturnOrder',
-  //       meta: { title: 'salesReturnOrder', noCache: true }
-  //     },
-  //     {
-  //       path: '/stock/out',
-  //       component: () => import('@/xt_pages/stock/stockOutOrder'),
-  //       name: 'stockOutOrder',
-  //       meta: { title: 'stockOutOrder', noCache: true }
-  //     }, {
-  //       path: '/stock/cancel',
-  //       component: () => import('@/xt_pages/stock/cancelStockOrder'),
-  //       name: 'cancelStockOrder',
-  //       meta: { title: 'cancelStockOrder', noCache: true }
-  //     }, {
-  //       path: '/stock/in/other',
-  //       component: () => import('@/xt_pages/stock/otherStockInOrder'),
-  //       name: 'otherStockInOrder',
-  //       meta: { title: 'otherStockInOrder', noCache: true }
-  //     }, {
-  //       path: '/stock/return/other',
-  //       component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
-  //       name: 'otherSalesReturnOrder',
-  //       meta: { title: 'otherSalesReturnOrder', noCache: true }
-  //     },{
-  //       path: '/stock/out/other',
-  //       component: () => import('@/xt_pages/stock/otherStockOutOrder'),
-  //       name: 'otherStockOutOrder',
-  //       meta: { title: 'otherStockOutOrder', noCache: true }
-  //     }, {
-  //       path: '/stock/cancel/other',
-  //       component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
-  //       name: 'otherCancelStockOrder',
-  //       meta: { title: 'otherCancelStockOrder', noCache: true }
-  //     }, {
-  //       path: '/stock/query',
-  //       component: () => import('@/xt_pages/stock/stockQuery'),
-  //       name: 'stockQuery',
-  //       meta: { title: 'stockQuery' }
-  //     }, {
-  //       path: '/stock/detail',
-  //       component: () => import('@/xt_pages/stock/stockDetailIndex'),
-  //       name: 'stockDetail',
-  //       meta: { title: 'stockDetail' }
-  //     },{
-  //       path: '/stock/in/add',
-  //       component: () => import('@/xt_pages/stock/stockInOrderAdd'),
-  //       name: 'stockInOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockInOrderAdd' }
-  //     }, {
-  //       path: '/stock/in/detail',
-  //       component: () => import('@/xt_pages/stock/stockInDetail'),
-  //       name: 'stockInDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockInDetail' }
-  //     }, {
-  //       path: '/stock/return/detail',
-  //       component: () => import('@/xt_pages/stock/salesReturnDetail'),
-  //       name: 'salesReturnDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'salesReturnDetail' }
-  //     }, {
-  //       path: '/stock/return/add',
-  //       component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
-  //       name: 'salesReturnOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'salesReturnOrderAdd' }
-  //     }, {
-  //       path: '/stock/out/add',
-  //       component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
-  //       name: 'stockOutOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockOutOrderAdd', noCache: true }
-  //     }, {
-  //       path: '/stock/out/detail',
-  //       component: () => import('@/xt_pages/stock/stockOutDetail'),
-  //       name: 'stockOutDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockOutDetail', noCache: true }
-  //     }, {
-  //       path: '/stock/cancel/add',
-  //       component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
-  //       name: 'cancelStockOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'cancelStockOrderAdd', noCache: true }
-  //     }, {
-  //       path: '/stock/cancel/detail',
-  //       component: () => import('@/xt_pages/stock/cancelStockDetail'),
-  //       name: 'cancelStockDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'cancelStockDetail', noCache: true }
-  //     },
-  //     {
-  //       path: '/stock/config',
-  //       component: () => import('@/xt_pages/stock/index'),
-  //       name: 'config',
-  //       meta: { title: 'config' }
-  //     }
+      // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
+      // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
+      { path: '/dialysis/watch', component: () => import('@/xt_pages/dialysis/bloodPresssWatch'), name: 'watch', meta: { title: 'watch' }},
+      { path: '/dialysis/details', component: () => import('@/xt_pages/dialysis/details'), name: 'details', meta: { title: 'details' }, is_menu: false,},
+      {
+        path: '/dialysis/print/batch',
+        component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysis_batch_print',
+        meta: { title: '批量打印', noCache: true }
+      },
+      { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
+    ]
+  },
+  {
+    path: '/stock/',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'stockManage',
+    meta: { title: 'stockManage', icon: 'stock' },
+    children: [
+      {
+        path: '/stock/config',
+        component: () => import('@/xt_pages/stock/index'),
+        name: 'config',
+        meta: { title: 'config' }
+      },
+      {
+        path: '/stock/in',
+        component: () => import('@/xt_pages/stock/stockInOrder'),
+        name: 'stockInOrder',
+        meta: { title: 'stockInOrder', noCache: true }
+      }, {
+        path: '/stock/return',
+        component: () => import('@/xt_pages/stock/salesReturnOrder'),
+        name: 'salesReturnOrder',
+        meta: { title: 'salesReturnOrder', noCache: true }
+      },
+      {
+        path: '/stock/out',
+        component: () => import('@/xt_pages/stock/stockOutOrder'),
+        name: 'stockOutOrder',
+        meta: { title: 'stockOutOrder', noCache: true }
+      }, {
+        path: '/stock/cancel',
+        component: () => import('@/xt_pages/stock/cancelStockOrder'),
+        name: 'cancelStockOrder',
+        meta: { title: 'cancelStockOrder', noCache: true }
+      }, {
+        path: '/stock/in/other',
+        component: () => import('@/xt_pages/stock/otherStockInOrder'),
+        name: 'otherStockInOrder',
+        meta: { title: 'otherStockInOrder', noCache: true }
+      }, {
+        path: '/stock/return/other',
+        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+        name: 'otherSalesReturnOrder',
+        meta: { title: 'otherSalesReturnOrder', noCache: true }
+      },{
+        path: '/stock/out/other',
+        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+        name: 'otherStockOutOrder',
+        meta: { title: 'otherStockOutOrder', noCache: true }
+      }, {
+        path: '/stock/cancel/other',
+        component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
+        name: 'otherCancelStockOrder',
+        meta: { title: 'otherCancelStockOrder', noCache: true }
+      }, {
+        path: '/stock/query',
+        component: () => import('@/xt_pages/stock/stockQuery'),
+        name: 'stockQuery',
+        meta: { title: 'stockQuery' }
+      }, {
+        path: '/stock/detail',
+        component: () => import('@/xt_pages/stock/stockDetailIndex'),
+        name: 'stockDetail',
+        meta: { title: 'stockDetail' }
+      },{
+        path: '/stock/in/add',
+        component: () => import('@/xt_pages/stock/stockInOrderAdd'),
+        name: 'stockInOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockInOrderAdd' }
+      }, {
+        path: '/stock/in/detail',
+        component: () => import('@/xt_pages/stock/stockInDetail'),
+        name: 'stockInDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockInDetail' }
+      }, {
+        path: '/stock/return/detail',
+        component: () => import('@/xt_pages/stock/salesReturnDetail'),
+        name: 'salesReturnDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'salesReturnDetail' }
+      }, {
+        path: '/stock/return/add',
+        component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
+        name: 'salesReturnOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'salesReturnOrderAdd' }
+      }, {
+        path: '/stock/out/add',
+        component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
+        name: 'stockOutOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockOutOrderAdd', noCache: true }
+      }, {
+        path: '/stock/out/detail',
+        component: () => import('@/xt_pages/stock/stockOutDetail'),
+        name: 'stockOutDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockOutDetail', noCache: true }
+      }, {
+        path: '/stock/cancel/add',
+        component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+        name: 'cancelStockOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'cancelStockOrderAdd', noCache: true }
+      }, {
+        path: '/stock/cancel/detail',
+        component: () => import('@/xt_pages/stock/cancelStockDetail'),
+        name: 'cancelStockDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'cancelStockDetail', noCache: true }
+      }
 
-  //   ]
-  //  },
-  //  {
-  //    path: '/qcd',
-  //    component: Layout,
-  //    redirect: '/qcd/dialysistotal',
-  //    name: 'qcd',
-  //    alwaysShow: true,
-  //    meta: { title: '科室质控', icon: 'table' },
-  //    children: [
-  //      { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
-  //      { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
-  //      { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
-  //      { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
-  //      { path: '/qcd/outcomeIndicators/query', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
-  //      { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '患者分析' }},
-  //      { path: '/qcd/patientanalysis/weight',hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
-  //      { path: '/qcd/patientanalysis/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
-  //      { path: '/qcd/patientanalysis/dialysisage', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
-  //      { path: '/qcd/patientanalysis/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
-  //      { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
-  //      { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
-  //      { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
-  //      { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
-  //      { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
-  //      { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
-  //      { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }},
-  //    ]
-  //  },
-  //  {
-  //   path: '/data/',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'data',
-  //   meta: { title: 'data_dictionary', icon: 'excel' },
-  //   children: [
-  //     { path: '/data/dictionary', component: () => import('@/xt_pages/data/index'), name: 'dictionary', meta: { title: 'field_config' }},
-  //     { path: '/data/template', component: () => import('@/xt_pages/data/template'), name: 'template', meta: { title: 'template' }},
-  //     { path: '/data/druguse', component: () => import('@/xt_pages/data/druguseTemplate'), name: 'druguse', meta: { title: 'druguse' }}
-  //   ]
-  // },
-  // {
-  //   path: '/device',
-  //   component: Layout,
-  //   redirect: '/device/main',
-  //   name: 'device',
-  //   alwaysShow: true,
-  //   meta: { title: 'deviceManage', icon: 'shebei' },
-  //   children: [
-  //     { path: '/device/zones', component: () => import('@/xt_pages/device/zone_main'), name: 'deviceZoneManage', meta: { title: 'deviceZoneManage' }},
-  //     { path: '/device/groups', component: () => import('@/xt_pages/device/group_main'), name: 'deviceGroupManage', meta: { title: 'deviceGroupManage' }},
-  //     { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
-  //     { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
-  //   ]
-  // },
+    ]
+   },
+   {
+     path: '/qcd',
+     component: Layout,
+     redirect: '/qcd/dialysistotal',
+     name: 'qcd',
+     alwaysShow: true,
+     meta: { title: '科室质控', icon: 'table' },
+     children: [
+       { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
+       { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
+       { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
+       { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
+       { path: '/qcd/outcomeIndicators/query', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
+       { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '患者分析' }},
+       { path: '/qcd/patientanalysis/weight',hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
+       { path: '/qcd/patientanalysis/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
+       { path: '/qcd/patientanalysis/dialysisage', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
+       { path: '/qcd/patientanalysis/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
+       { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
+       { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
+       { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
+       { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
+       { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
+       { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
+       { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }},
+     ]
+   },
+   {
+    path: '/data/',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'data',
+    meta: { title: 'data_dictionary', icon: 'excel' },
+    children: [
+      { path: '/data/dictionary', component: () => import('@/xt_pages/data/index'), name: 'dictionary', meta: { title: 'field_config' }},
+      { path: '/data/template', component: () => import('@/xt_pages/data/template'), name: 'template', meta: { title: 'template' }},
+      { path: '/data/druguse', component: () => import('@/xt_pages/data/druguseTemplate'), name: 'druguse', meta: { title: 'druguse' }}
+    ]
+  },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device/main',
+    name: 'device',
+    alwaysShow: true,
+    meta: { title: 'deviceManage', icon: 'shebei' },
+    children: [
+      { path: '/device/zones', component: () => import('@/xt_pages/device/zone_main'), name: 'deviceZoneManage', meta: { title: 'deviceZoneManage' }},
+      { path: '/device/groups', component: () => import('@/xt_pages/device/group_main'), name: 'deviceGroupManage', meta: { title: 'deviceGroupManage' }},
+      { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
+      { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
+    ]
+  },
   // /////////////////////////////////////线在end
   {
     path: '/role',

src/views/layout/components/Navbar.vue

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

src/views/layout/components/Sidebar/index.vue

@@ -5,7 +5,7 @@
     </div>
     <el-menu
       mode="vertical"
-      unique-opened="ture"
+      :unique-opened="uniqueOpened"
       :show-timeout="200"
       :default-active="$route.path"
       :collapse="isCollapse"
@@ -32,6 +32,11 @@ export default {
       return !this.sidebar.opened;
     }
   },
+  data(){
+    return{
+      uniqueOpened:true,
+    }
+  },
   methods:{
     toggleSideBar() {
       this.$store.dispatch("toggleSideBar");

src/xt_pages/home/modify_user_info_dialog.vue

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

src/xt_pages/sign/index.vue

@@ -10,13 +10,13 @@
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
-                    <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</el-button>
+                    <el-button type="primary" @change="changeSearch">搜索</el-button>
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
                 </div>
 
-                <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">
+                <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">
                     <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
                     <el-table-column prop="name" label="姓名" min-width="20" align="center">
                        <template slot-scope="scope">
@@ -39,7 +39,11 @@
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
                         <template slot-scope="scope">
+<<<<<<< .mine
                            {{scope.row.before}} / {{scope.row.after}}
+=======
+                            {{scope.row.before}} / {{scope.row.after}}
+>>>>>>> .theirs
                         </template>
                     </el-table-column>
                 </el-table>
@@ -47,33 +51,34 @@
 
             <el-col :span="16">
                 <div class="dataTitle">患者信息</div>
-                <el-form class="information">
+                <el-form class="information" label-position="left">
                   <div class="inforTitle">
                   <el-button  @click="change()" style="float:right;">修改</el-button>
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
                    </div>
-                    <div class="border"></div>       
+                    <div class="border"></div>
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
-                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
-                     <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
-                     血压(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;
-                     脉率(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
-                    </div> 
-                     <div class="border"></div> 
-                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
+                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     血压(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>
+                    </div>
+                    <div class="border"></div>
+                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                      透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                      干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
-                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
-                      <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
-                      血压(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;
-                      脉率(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
-                    </div>      
+                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      血压(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>
+                    </div>
+
                     <div class="border"></div>
                     <div v-if="show">
                     <el-row :gutter="20">
@@ -91,7 +96,7 @@
 </template>
 
 <script>
-import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata,sighdata} from '@/api/signandweigh'
+import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata, sighdata } from '@/api/signandweigh'
 import BreadCrumb from '../components/bread-crumb'
 export default {
   name: 'sign',
@@ -99,8 +104,8 @@ export default {
   data() {
     return {
       crumbs: [
-          { path: '/sign/index', name: '签到称重' }
-        ],
+        { path: '/sign/index', name: '签到称重' }
+      ],
       patientlist: [],
       signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
       queryParams: {
@@ -137,7 +142,7 @@ export default {
         DBP_after: '', // 舒张压
         SBP_after: '', // 收缩压
         dialysis_no: ''
-       
+
       },
       weigh_list: {
         weight_before: '', // 透前体重
@@ -188,30 +193,35 @@ export default {
       patients: [],
       dialysis_stege: 0,
       show: false,
-      disa:true,
-      signnid:"",
+      disa: true
     }
   },
   methods: {
     fetchSignPatients() {
       fetchSignPatients(this.queryParams).then(response => {
-        this.patients = []      
+        this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
-          // console.log("病人信息",this.patients[0].schedule)           
-            //将没有排班的信息排除
-            console.log("病人信息",this.patients)
-            for(let i = this.patients.length-1;i>=0;i--){    
-             if(this.patients[i].schedule.id == 0){
-                 this.patients.splice(i,1)
-             }   
+          console.log('病人信息', this.patients[0].schedule)
+          // 将没有排班的信息排除
+          for (let i = this.patients.length - 1; i >= 0; i--) {
+            if (this.patients[i].schedule.id == 0) {
+              this.patients.splice(i, 1)
+            }
           }
+
+          for (let i = this.patients.length - 1; ; i--) {
+            if (this.patients[i].schedule.id == 0) {
+              this.patients.splice(i, 1)
+            }
+          }
+
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
 
           if (this.queryParams.need_schedule_type === 1) {
             var sl = this.schedules.length
-            console.log("s1是什么东西")
+            console.log('s1是什么东西')
             console.log(sl)
             for (let index = 0; index < sl; index++) {
               if (this.schedules[index].type in response.data.data.panel) {
@@ -227,72 +237,44 @@ export default {
         }
       })
     },
-      // getPatientSign(){
-      //     getPatientSign(this.querySignParams).then(response=>{
-      //         if (response.data.state==1) {
-      //             if (response.data.data.sign != null) {
-      //                 var sign = response.data.data.sign;
-      //                 this.weigh_form.dry_weight = sign.dry_weight;
-      //                 this.weigh_form.clothes_weight = sign.clothes_weight;
-      //                   // 透前
-      //                 this.weigh_form.weigh_before = sign.weigh_before;
-      //                 this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
-      //                 this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
-      //                 this.weigh_form.weight_before = sign.weight_before;
-      //                 this.weigh_form.temperature_before = sign.temperature_before;
-      //                 this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
-      //                 this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
-      //                 this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
-      //                 this.weigh_form.SBP_before = sign.SBP_before // 收缩压
-      //                   // 透后
-      //                 this.weigh_form.weigh_after = sign.weigh_after;
-      //                 this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
-      //                 this.weigh_form.weight_after = sign.weight_after
-      //                 this.weigh_form.temperature_after = sign.temperature_after;
-      //                 this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
-      //                 this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
-      //                 this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
-      //                 this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
-      //                 this.weigh_form.id=sign.id;
-      //             }
-      //         }
-      //     });
-      // },
+    // getPatientSign(){
+    //     getPatientSign(this.querySignParams).then(response=>{
+    //         if (response.data.state==1) {
+    //             if (response.data.data.sign != null) {
+    //                 var sign = response.data.data.sign;
+    //                 this.weigh_form.dry_weight = sign.dry_weight;
+    //                 this.weigh_form.clothes_weight = sign.clothes_weight;
+    //                   // 透前
+    //                 this.weigh_form.weigh_before = sign.weigh_before;
+    //                 this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
+    //                 this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
+    //                 this.weigh_form.weight_before = sign.weight_before;
+    //                 this.weigh_form.temperature_before = sign.temperature_before;
+    //                 this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
+    //                 this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
+    //                 this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
+    //                 this.weigh_form.SBP_before = sign.SBP_before // 收缩压
+    //                   // 透后
+    //                 this.weigh_form.weigh_after = sign.weigh_after;
+    //                 this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
+    //                 this.weigh_form.weight_after = sign.weight_after
+    //                 this.weigh_form.temperature_after = sign.temperature_after;
+    //                 this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
+    //                 this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
+    //                 this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
+    //                 this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
+    //                 this.weigh_form.id=sign.id;
+    //             }
+    //         }
+    //     });
+    // },
     changeSearch() {
       this.queryParams.need_schedule_type = 0
       this.fetchSignPatients()
     },
     handleCurrentChange(row, old) {
-      //     this.weigh_form = {
-      //     id:0,
-      //     choose:false,
-      //     name: '',
-      //     dry_weight: '',
-      //     clothes_weight: '',
-      //     // 透前
-      //     weigh_before: '',
-      //     dehydrated_weight: '',
-      //     dehydrated_percent: '',
-      //     weight_before: '',
-      //     temperature_before: '',
-      //     pulse_rate_before: '',  // P 脉率
-      //     respiratory_rate_before: '', // R 呼吸频率
-      //     DBP_before: '', // 舒张压
-      //     SBP_before: '', // 收缩压
-      //     // 透后
-      //     weigh_after: '',
-      //     weight_reduce_after: '',
-      //     weight_after: '',
-      //     temperature_after: '',
-      //     pulse_rate_after: '', // P 脉率
-      //     respiratory_rate_after: '', // R 呼吸频率
-      //     DBP_after: '', // 舒张压
-      //     SBP_after: '', // 收缩压
-      //     patient_id: 0,
-      //     dialysis_no:'',
-      // };
       this.disa = true
-      this.show=false
+      this.show = false
       this.weigh_form.choose = true
       this.weigh_form.name = row.name
       this.weigh_form.dialysis_no = row.dialysis_no
@@ -300,8 +282,9 @@ export default {
       this.querySignParams.patient_id = row.id
       this.dialysis_stege = row.dialysis_order.stage
       this.getDialysisInforInfomation(row.id)
-      this.getDialysisAfterInfomation(row.id) 
-      //this.getsignweigh(row.id)    
+      this.getDialysisAfterInfomation(row.id)
+
+      // this.getsignweigh(row.id)
     },
     // submitSign() {
     //   SignWeigh(this.querySignParams, this.weigh_form).then(response => {
@@ -350,33 +333,33 @@ export default {
         if (response.data.data.patientlist != null) {
           var patientlist = response.data.data.patientlist
           this.weigh_list.dry_weight = patientlist.dry_weight
-          console.log("干体重:"+this.weigh_list.dry_weight)
-          if(this.weigh_list.dry_weight == 0){
-              this.weigh_list.dry_weight = ""
+          console.log('干体重:' + this.weigh_list.dry_weight)
+          if (this.weigh_list.dry_weight == 0) {
+            this.weigh_list.dry_weight = ''
           }
           this.weigh_list.weight_before = patientlist.weight_before
-          if(this.weigh_list.weight_before == 0){
-              this.weigh_list.weight_before = ""
+          if (this.weigh_list.weight_before == 0) {
+            this.weigh_list.weight_before = ''
           }
           this.weigh_list.temperature = patientlist.temperature
-          if(this.weigh_list.temperature == 0){
-              this.weigh_list.temperature = ""
+          if (this.weigh_list.temperature == 0) {
+            this.weigh_list.temperature = ''
           }
           this.weigh_list.pulse_frequency = patientlist.pulse_frequency
-          if(this.weigh_list.pulse_frequency == 0){
-              this.weigh_list.pulse_frequency = ""
+          if (this.weigh_list.pulse_frequency == 0) {
+            this.weigh_list.pulse_frequency = ''
           }
           this.weigh_list.breathing_rate = patientlist.breathing_rate
-          if(this.weigh_list.breathing_rate == 0){
-              this.weigh_list.breathing_rate = ""
+          if (this.weigh_list.breathing_rate == 0) {
+            this.weigh_list.breathing_rate = ''
           }
           this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
-          if(this.weigh_list.systolic_blood_pressure == 0){
-             this.weigh_list.systolic_blood_pressure = ""
+          if (this.weigh_list.systolic_blood_pressure == 0) {
+            this.weigh_list.systolic_blood_pressure = ''
           }
           this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
-          if(this.weigh_list.diastolic_blood_pressure == 0){
-               this.weigh_list.diastolic_blood_pressure = ""
+          if (this.weigh_list.diastolic_blood_pressure == 0) {
+            this.weigh_list.diastolic_blood_pressure = ''
           }
         }
       })
@@ -388,37 +371,36 @@ export default {
           var patientinfor = response.data.data.patientinfor
           console.log(patientinfor)
           this.weigh_infor.dry_weight = patientinfor.dry_weight
-          if(this.weigh_infor.dry_weight == 0){
-              this.weigh_infor.dry_weight = ""
+          if (this.weigh_infor.dry_weight == 0) {
+            this.weigh_infor.dry_weight = ''
           }
 
           this.weigh_infor.weight_after = patientinfor.weight_after
-          if(this.weigh_infor.weight_after == 0){
-              this.weigh_infor.weight_after = ""
+          if (this.weigh_infor.weight_after == 0) {
+            this.weigh_infor.weight_after = ''
           }
 
           this.weigh_infor.temperature = patientinfor.temperature
-          if(this.weigh_infor.temperature == 0){
-               this.weigh_infor.temperature = ""
+          if (this.weigh_infor.temperature == 0) {
+            this.weigh_infor.temperature = ''
           }
           this.weigh_infor.pulse_frequency = patientinfor.pulse_frequency
-          if(this.weigh_infor.pulse_frequency == 0 ){
-              this.weigh_infor.pulse_frequency = ""
+          if (this.weigh_infor.pulse_frequency == 0) {
+            this.weigh_infor.pulse_frequency = ''
           }
           this.weigh_infor.breathing_rate = patientinfor.breathing_rate
-          if(this.weigh_infor.breathing_rate == 0){
-              this.weigh_infor.breathing_rate = ""
+          if (this.weigh_infor.breathing_rate == 0) {
+            this.weigh_infor.breathing_rate = ''
           }
           this.weigh_infor.systolic_blood_pressure = patientinfor.systolic_blood_pressure
-          if(this.weigh_infor.systolic_blood_pressure == 0){
-              this.weigh_infor.systolic_blood_pressure = ""
+          if (this.weigh_infor.systolic_blood_pressure == 0) {
+            this.weigh_infor.systolic_blood_pressure = ''
           }
 
           this.weigh_infor.diastolic_blood_pressure = patientinfor.diastolic_blood_pressure
-           if(this.weigh_infor.diastolic_blood_pressure == 0){
-              this.weigh_infor.diastolic_blood_pressure = ""
-           }
-
+          if (this.weigh_infor.diastolic_blood_pressure == 0) {
+            this.weigh_infor.diastolic_blood_pressure = ''
+          }
         }
       })
     },
@@ -470,7 +452,7 @@ export default {
       console.log(params)
     },
     sighdata() {
-      //透前数据
+      // 透前数据
       var params = new Object()
       var data_time = this.querySignParams.date_time
       params.date_time = data_time
@@ -483,56 +465,55 @@ export default {
       params.systolic_blood_pressure = this.weigh_list.systolic_blood_pressure
       params.diastolic_blood_pressure = this.weigh_list.diastolic_blood_pressure
 
-      //透后数据
+      // 透后数据
       params.weight_after = this.weigh_infor.weight_after
       params.temperatureafter = this.weigh_infor.temperature
       params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
       params.breathing_rateafter = this.weigh_infor.breathing_rate
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
-       console.log("params是什么?",params)
+      console.log('params是什么?', params)
       sighdata(params).then(response => {
+        var signs = response.data.data.signs
+        // this.patients[this.table_current_index].signin.id = 1
         if (response.data.state === 1) {
-           var signs = response.data.data.signs
-           this.signnid = signs.id
-           console.log("hheh",signs.id)
           this.$message({
             type: 'success',
             message: '成功!'
           })
-        var tlen = this.patients.length
-        
-        for(let index=0;index<tlen;index++ ){
-           if(this.patients[index].id == params.patient_id){
+          var tlen = this.patients.length
+
+          for (let index = 0; index < tlen; index++) {
+            if (this.patients[index].id == params.patient_id) {
               var signin = this.patients[index].signin
-              this.patients[index].signin = response.data.data.signs              
-              if(this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)){
-                    var sl = this.schedules.length
-                    for(let j = 0; j < sl; j++){
-                         if(this.schedules[j].type == this.patients[index].schedule.schedule_type){
-                              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)){
-                                    this.schedules[j].sign++
-                              }
-                              if(signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0){
-
-                                   this.schedules[j].before++
-                              }
-                              if(signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0){
-                                  this.schedules[j].after++
-                              }
-                         }
+              this.patients[index].signin = response.data.data.signs
+
+              if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
+                var sl = this.schedules.length
+                for (let j = 0; j < sl; j++) {
+                  if (this.schedules[j].type == this.patients[index].schedule.schedule_type) {
+                    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)) {
+                      this.schedules[j].sign++
                     }
+                    if (signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0) {
+                      this.schedules[j].before++
+                    }
+                    if (signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0) {
+                      this.schedules[j].after++
+                    }
+                  }
+                }
               }
               break
-           }
-         }
-           this.weigh_form.id = response.data.data.signs.id
-        }else{
-           this.$message.error(response.data.msg)
-           return false
+            }
+          }
+          this.weigh_form.id = response.data.data.signs.id
+        } else {
+          this.$message.error(response.data.msg)
+          return false
         }
       })
-     }   
+    }
   },
   watch: {
     'weigh_form.weigh_before': function() {

src/xt_pages/stock/cancelStockOrder.vue

@@ -12,17 +12,17 @@
 
 
       <div class="cell clearfix" >
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">退库时间</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker  size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -131,26 +131,26 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
 
       this.GetCancelStock()
       this.GetConfigInfo()
@@ -162,7 +162,7 @@
           { path: false, name: '库存管理' },
           { path: false, name: '出库退库单' }
         ],
-        searchKey:'',
+        searchKey: '',
         type: 1,
         page: 1,
         limit: 7,
@@ -185,14 +185,14 @@
       }
     },
     methods: {
-      search:function(){
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords:this.searchKey,
+          keywords: this.searchKey
         }
         this.cancelStockDate = []
         getCancelStockList(Params).then(response => {
@@ -299,7 +299,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -21,13 +21,13 @@
         <div class="cell clearfix">
           <label class="title"><span class="name">退库时间</span> : </label>
 
-          <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+          <el-date-picker  size="small" v-model="return_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>
         </div>
         <div class="cell clearfix">
           <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
-          <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
+          <el-select  size="small"   v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
             <el-option
               v-for="(option, index) in manufacturer"
               :key="index"
@@ -39,7 +39,7 @@
 
         <div class="cell clearfix">
           <label class="title"><span class="name">经销商</span> : </label>
-          <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
+          <el-select   size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商" >
             <el-option
               v-for="(option, index) in dealer"
               :key="index"
@@ -194,8 +194,7 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
-
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
@@ -203,7 +202,6 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -270,10 +268,10 @@
         tempObj['return_count'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        if( this.recordInfo.recordData.length <= 1){
+        if (this.recordInfo.recordData.length <= 1) {
           this.$message.error('只有一条记录的时候无法删除')
           return
-        }else{
+        } else {
           this.recordInfo.recordData.splice(index, 1)
         }
       }, calculate: function(val) {
@@ -351,7 +349,7 @@
             return false
           }
         })
-      },changeManufacturer(){
+      }, changeManufacturer() {
         this.recordInfo.recordData = []
         const tempObj = {}
         tempObj['good_type_id'] = 0
@@ -361,16 +359,16 @@
       }
     },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.return_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
 
       const tempObj = {}
       tempObj['good_type_id'] = 0

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -16,7 +16,7 @@
       <div class="cell clearfix">
 
         <label class="title"><span class="name">退库时间</span> : </label>
-        <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="return_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>
       </div>
@@ -179,8 +179,7 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
-
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
@@ -188,7 +187,6 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -255,8 +253,7 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
-                this.$message.success("删除成功")
+                this.$message.success('删除成功')
                 this.recordInfo.recordData.splice(index, 1)
               }
             })
@@ -302,12 +299,11 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
+            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
                 this.$message.success('退库成功')
 
                 this.$router.back(-1)
@@ -335,19 +331,14 @@
             this.form.manufacturer = this.cancelStock.manufacturer
             this.form.dealer = this.cancelStock.dealer
           }
-          if( this.recordInfo.recordData.length == 0){
+          if (this.recordInfo.recordData.length == 0) {
             const tempObj = {}
             tempObj['id'] = 0
             tempObj['good_type_id'] = 0
             tempObj['good_id'] = 0
             tempObj['count'] = ''
             this.recordInfo.recordData.push(tempObj)
-
-
-
           }
-
-
         })
       }
     },

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -1,17 +1,17 @@
 <template>
     <div>
       <div class="cell clearfix" >
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">日期查询</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -19,7 +19,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">单据类型</span> : </label>
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
           <el-option
             v-for="item in orderTypeArr"
             :key="item.value"
@@ -31,7 +31,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">其它</span> : </label>
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
           <el-option
             v-for="item in manufacturer"
             :key="item.id"
@@ -111,31 +111,30 @@
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
 
-
   export default {
     name: 'cancelStockDetail',
 
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()
@@ -149,7 +148,7 @@
         manufacturer_id: '',
         dealer_id: '',
         order_type: '',
-        searchKey:'',
+        searchKey: '',
         type: 4,
         page: 1,
         limit: 7,
@@ -173,20 +172,19 @@
     },
     methods: {
       changeType: function(val) {
-        this.order_type  = val
+        this.order_type = val
         this.GetCancelStock()
       }, changeManufacturer: function(val) {
-        this.manufacturer_id  = val
+        this.manufacturer_id = val
         this.GetCancelStock()
       },
-      getTypeName:function(row){
-        let name = ""
-        let name2 = ""
-        if (row.type == 1){
-          name = "耗材退库单"
-
-        }else if(row.type == 2){
-          name = "其他退库单"
+      getTypeName: function(row) {
+        let name = ''
+        const name2 = ''
+        if (row.type == 1) {
+          name = '耗材退库单'
+        } else if (row.type == 2) {
+          name = '其他退库单'
         }
 
         return name
@@ -200,14 +198,14 @@
         }
         return name
       },
-      search:function(){
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords:this.searchKey,
+          keywords: this.searchKey
         }
         this.cancelStockDate = []
         getStockDetail(Params).then(response => {
@@ -303,7 +301,6 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
-
           }
         })
       }, getManufactuerName: function(manufacturer_id) {
@@ -319,7 +316,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -1,17 +1,17 @@
 <template>
     <div>
       <div class="cell clearfix" >
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">日期查询</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -19,7 +19,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">单据类型</span> : </label>
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
           <el-option
             v-for="item in orderTypeArr"
             :key="item.value"
@@ -31,7 +31,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">其它</span> : </label>
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
           <el-option
             v-for="item in manufacturer"
             :key="item.id"
@@ -114,31 +114,30 @@
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
 
-
   export default {
     name: 'salesReturnDetail',
 
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()
@@ -152,7 +151,7 @@
         manufacturer_id: '',
         dealer_id: '',
         order_type: '',
-        searchKey:'',
+        searchKey: '',
         type: 3,
         page: 1,
         limit: 7,
@@ -176,20 +175,18 @@
     },
     methods: {
       changeType: function(val) {
-        this.order_type  = val
+        this.order_type = val
         this.GetCancelStock()
       }, changeManufacturer: function(val) {
-        this.manufacturer_id  = val
+        this.manufacturer_id = val
         this.GetCancelStock()
-
       },
-      getTypeName:function(row){
-        let name = ""
-        if (row.type == 1){
-          name = "耗材退货单"
-
-        }else if(row.type == 2){
-          name = "其他退货单"
+      getTypeName: function(row) {
+        let name = ''
+        if (row.type == 1) {
+          name = '耗材退货单'
+        } else if (row.type == 2) {
+          name = '其他退货单'
         }
 
         return name
@@ -203,14 +200,14 @@
         }
         return name
       },
-      search:function(){
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords:this.searchKey,
+          keywords: this.searchKey
         }
         this.cancelStockDate = []
         getStockDetail(Params).then(response => {
@@ -306,7 +303,6 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
-
           }
         })
       }, getManufactuerName: function(manufacturer_id) {
@@ -322,7 +318,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/detail/stockInDetail.vue

@@ -1,24 +1,24 @@
 <template>
     <div>
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">日期查询</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">单据类型</span> : </label>
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
           <el-option
             v-for="item in orderTypeArr"
             :key="item.value"
@@ -30,7 +30,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">其它</span> : </label>
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
           <el-option
             v-for="item in manufacturer"
             :key="item.id"
@@ -124,26 +124,26 @@
     name: 'stockInDetail',
 
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()
@@ -182,21 +182,18 @@
     },
     methods: {
       changeType: function(val) {
-        this.order_type  = val
+        this.order_type = val
         this.GetCancelStock()
       }, changeManufacturer: function(val) {
-        this.manufacturer_id  = val
+        this.manufacturer_id = val
         this.GetCancelStock()
-
       }, changeDealer: function(val) {
-        this.dealer_id  = val
+        this.dealer_id = val
         this.GetCancelStock()
-
       }, getTypeName: function(row) {
         let name = ''
         if (row.type == 1) {
           name = '耗材入库单'
-
         } else if (row.type == 2) {
           name = '其他入库单'
         }
@@ -219,7 +216,7 @@
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords: this.searchKey,
+          keywords: this.searchKey
         }
         this.cancelStockDate = []
         getStockDetail(Params).then(response => {
@@ -235,7 +232,7 @@
         })
       },
       AddNewOrder: function() {
-        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type } })
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
       },
       GetCancelStock: function() {
         const Params = {
@@ -315,7 +312,6 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
-
           }
         })
       }, getManufactuerName: function(manufacturer_id) {
@@ -331,7 +327,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type } })
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -1,17 +1,17 @@
 <template>
     <div>
       <div class="cell clearfix" >
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">日期查询</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -19,7 +19,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">单据类型</span> : </label>
-        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+        <el-select size="small" v-model="order_type" clearable placeholder="单据类型" @change="changeType">
           <el-option
             v-for="item in orderTypeArr"
             :key="item.value"
@@ -31,7 +31,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">其它</span> : </label>
-        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+        <el-select size="small" v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
           <el-option
             v-for="item in manufacturer"
             :key="item.id"
@@ -124,31 +124,30 @@
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
   import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
 
-
   export default {
     name: 'stockOutDetail',
 
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()
@@ -163,7 +162,7 @@
         dealer_id: '',
         order_type: '',
 
-        searchKey:'',
+        searchKey: '',
         type: 2,
         page: 1,
         limit: 7,
@@ -187,21 +186,19 @@
     },
     methods: {
       changeType: function(val) {
-        this.order_type  = val
+        this.order_type = val
         this.GetCancelStock()
       }, changeManufacturer: function(val) {
-        this.manufacturer_id  = val
+        this.manufacturer_id = val
         this.GetCancelStock()
-
       },
-      getTypeName:function(row){
-        let name = ""
-        let name2 = ""
-        if (row.type == 1){
-          name = "耗材出库单"
-
-        }else if(row.type == 2){
-          name = "其他出库单"
+      getTypeName: function(row) {
+        let name = ''
+        const name2 = ''
+        if (row.type == 1) {
+          name = '耗材出库单'
+        } else if (row.type == 2) {
+          name = '其他出库单'
         }
 
         return name
@@ -215,14 +212,14 @@
         }
         return name
       },
-      search:function(){
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords:this.searchKey,
+          keywords: this.searchKey
         }
         this.cancelStockDate = []
         getStockDetail(Params).then(response => {
@@ -318,7 +315,6 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
-
           }
         })
       }, getManufactuerName: function(manufacturer_id) {
@@ -334,7 +330,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -11,18 +11,18 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">退库时间</span> : </label>
 
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -128,26 +128,26 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()
@@ -158,7 +158,7 @@
           { path: false, name: '库存管理' },
           { path: '/stock/cancel', name: '其他出库退库单' }
         ],
-        searchKey:'',
+        searchKey: '',
         type: 2,
         page: 1,
         limit: 7,
@@ -181,14 +181,14 @@
       }
     },
     methods: {
-      search:function(){
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords:this.searchKey,
+          keywords: this.searchKey
         }
         this.cancelStockDate = []
         getCancelStockList(Params).then(response => {
@@ -295,7 +295,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -11,18 +11,18 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input  size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button size="small"  class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">退货时间</span> : </label>
 
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -140,33 +140,33 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       this.GetSalesReturn()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()
     },
     data() {
       return {
-        searchKey:'',
+        searchKey: '',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: false, name: '其他退货单' }
@@ -193,14 +193,14 @@
       }
     },
     methods: {
-      search:function() {
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords: this.searchKey,
+          keywords: this.searchKey
         }
         this.saleReturnDate = []
         getSalesReturnList(Params).then(response => {

src/xt_pages/stock/otherStockInOrder.vue

@@ -10,18 +10,18 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button class="filter-item"  type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button size="small" class="filter-item"  type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">入库时间</span> : </label>
 
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -134,33 +134,33 @@
     name: 'stockIn',
     components: { BreadCrumb },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       this.GetWarehouse()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()
     },
     data() {
       return {
-        searchKey:'',
+        searchKey: '',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: false, name: '其他入库单' }
@@ -195,14 +195,14 @@
       }
     },
     methods: {
-      search:function() {
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords: this.searchKey,
+          keywords: this.searchKey
         }
         this.Warehouse.warehouseDate = []
         getWarehouseList(Params).then(response => {
@@ -220,7 +220,7 @@
         })
       },
 
-        GetWarehouse: function() {
+      GetWarehouse: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
@@ -400,7 +400,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockInDetail', query: { id: row.id ,type:this.type}})
+        this.$router.push({ name: 'stockInDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/otherStockOutOrder.vue

@@ -9,18 +9,18 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
 
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -118,51 +118,51 @@
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { uParseTime } from '@/utils/tools'
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
 
 import {
   deleteWarehouseOut,
   GetAllConfig,
   getWarehouseOutList
-} from "@/api/stock";
-import BreadCrumb from "../components/bread-crumb";
+} from '@/api/stock'
+import BreadCrumb from '../components/bread-crumb'
 
 export default {
-  name: "salesReturnOrder",
+  name: 'salesReturnOrder',
   components: { BreadCrumb },
   created() {
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
+    var nowDate = new Date()
+    var nowYear = nowDate.getFullYear()
+    var nowMonth = nowDate.getMonth() + 1
+    var nowDay = nowDate.getDate()
     this.end_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    nowDate.setMonth(nowDate.getMonth() - 1)
+    nowYear = nowDate.getFullYear()
+    nowMonth = nowDate.getMonth() + 1
+    nowDay = nowDate.getDate()
     this.start_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    this.GetWarehouseOut();
-    this.GetConfigInfo();
-    this.fetchAllAdminUsers();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    this.GetWarehouseOut()
+    this.GetConfigInfo()
+    this.fetchAllAdminUsers()
   },
   data() {
     return {
       crumbs: [
-        { path: false, name: "库存管理" },
-        { path: false, name: "其他出库单" }
+        { path: false, name: '库存管理' },
+        { path: false, name: '其他出库单' }
       ],
-      searchKey:'',
+      searchKey: '',
       page: 1,
       limit: 7,
       checked: false,
@@ -171,47 +171,46 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+      start_time: '',
       warehouseOutDate: [],
-      end_time: "",
+      end_time: '',
       goodType: [],
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
       type: 2
-    };
+    }
   },
   methods: {
-    search:function(){
+    search: function() {
       const Params = {
         page: this.page,
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords:this.searchKey,
+        keywords: this.searchKey
       }
-      this.warehouseOutDate = [];
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
-
+      })
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: "stockOutOrderAdd",
+        name: 'stockOutOrderAdd',
         query: { type: this.type }
-      });
+      })
     },
     GetWarehouseOut: function() {
       const Params = {
@@ -220,201 +219,201 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      };
-      this.warehouseOutDate = [];
+      }
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     getXuserName(id) {
       if (id <= 0) {
-        return "";
+        return ''
       }
-      var name = "";
+      var name = ''
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === "undefined"
+        typeof this.adminUserOptions.length === 'undefined'
       ) {
-        return name;
+        return name
       }
-      var leng = this.adminUserOptions.length;
+      var leng = this.adminUserOptions.length
       if (leng == 0) {
-        return name;
+        return name
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name;
-          break;
+          name = this.adminUserOptions[index].name
+          break
         }
       }
-      return name;
+      return name
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+        console.log(response)
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users;
-          var alen = this.adminUserOptions.length;
+          this.adminUserOptions = response.data.data.users
+          var alen = this.adminUserOptions.length
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      });
+      })
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     handleSizeChange(val) {
-      this.limit = val;
-      this.GetWarehouseOut();
+      this.limit = val
+      this.GetWarehouseOut()
     },
     handleCurrentChange(val) {
-      this.page = val;
-      this.GetWarehouseOut();
+      this.page = val
+      this.GetWarehouseOut()
     },
     startTimeChange(val) {
-      this.GetWarehouseOut();
+      this.GetWarehouseOut()
     },
     endTimeChange(val) {
-      this.GetWarehouseOut();
+      this.GetWarehouseOut()
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100;
+      return Math.round(parseFloat(val) * 100) / 100
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.manufacturer = response.data.data.manufacturer;
-          this.dealer = response.data.data.dealer;
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
         }
-      });
+      })
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name;
+          return this.manufacturer[i].manufacturer_name
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name;
+          return this.dealer[i].dealer_name
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "stockOutDetail",
+        name: 'stockOutDetail',
         query: { id: row.id, type: this.type }
-      });
+      })
     },
     handleDelete: function(index, row) {
-      const ids = [];
-      ids.push(row.id);
-      const idStr = ids.join(",");
+      const ids = []
+      ids.push(row.id)
+      const idStr = ids.join(',')
 
       const params = {
         ids: idStr
-      };
+      }
 
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection();
+        this.$refs.multipleTable.toggleAllSelection()
       } else {
-        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.clearSelection()
       }
     },
     select(selection) {
-      this.selectedTableData = selection;
+      this.selectedTableData = selection
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error("请选择要删除的记录");
-        return;
+        this.$message.error('请选择要删除的记录')
+        return
       }
-      const ids = [];
+      const ids = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+        ids.push(this.selectedTableData[i].id)
       }
-      const idStr = ids.join(",");
+      const idStr = ids.join(',')
       const params = {
         ids: idStr
-      };
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      }
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/xt_pages/stock/salesReturnEdit.vue

@@ -17,7 +17,7 @@
 
     <div class="cell clearfix">
             <label class="title"><span class="name">退货时间</span> : </label>
-            <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+            <el-date-picker size="small" v-model="return_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>
     </div>
@@ -185,17 +185,14 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
-
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-
         this.$refs.dialog.hide()
-
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -223,8 +220,6 @@
             }, [])
             console.log(this.propForm.goodInfo)
             console.log(this.propForm.goodType)
-
-
           }
         })
       }, typeName: function(good_type_id) {
@@ -236,7 +231,6 @@
         }
         return name
       }, specificationName: function(good_info_id) {
-
         let name = ''
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].id == good_info_id) {
@@ -268,8 +262,7 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
-                this.$message.success("删除成功")
+                this.$message.success('删除成功')
                 this.recordInfo.recordData.splice(index, 1)
               }
             })
@@ -315,12 +308,11 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
                 this.$message.success('退货成功')
 
                 this.$router.back(-1)
@@ -349,8 +341,7 @@
             this.form.dealer = this.salesReturn.dealer
           }
 
-
-          if( this.recordInfo.recordData.length == 0){
+          if (this.recordInfo.recordData.length == 0) {
             const tempObj = {}
             tempObj['id'] = 0
             tempObj['good_type_id'] = 0
@@ -358,7 +349,6 @@
             tempObj['count'] = ''
             this.recordInfo.recordData.push(tempObj)
           }
-
         })
       }
     },

src/xt_pages/stock/salesReturnOrder.vue

@@ -17,11 +17,11 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">退货时间</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -135,26 +135,26 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
 
       this.GetSalesReturn()
       this.GetConfigInfo()
@@ -162,7 +162,7 @@
     },
     data() {
       return {
-        searchKey:'',
+        searchKey: '',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: false, name: '退货单' }
@@ -189,14 +189,14 @@
       }
     },
     methods: {
-      search:function() {
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords: this.searchKey,
+          keywords: this.searchKey
         }
         this.saleReturnDate = []
         getSalesReturnList(Params).then(response => {

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -15,7 +15,7 @@
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
       <div class="cell clearfix">
         <label class="title"><span class="name">退货时间</span> : </label>
-        <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="return_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>
       </div>
@@ -24,7 +24,7 @@
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
 
-        <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
+        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -36,7 +36,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select v-model="form.dealer" clearable placeholder="请选择经销商">
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商">
           <el-option
             v-for="(option, index) in dealer"
             :key="index"
@@ -205,17 +205,14 @@
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
               tempForm['price'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
-
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-
         this.$refs.dialog.hide()
-
       }, GetConfigInfo: function() {
         const params = {
           type: this.type
@@ -283,13 +280,12 @@
         tempObj['price'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        if( this.recordInfo.recordData.length <= 1){
+        if (this.recordInfo.recordData.length <= 1) {
           this.$message.error('只有一条记录的时候无法删除')
           return
-        }else{
+        } else {
           this.recordInfo.recordData.splice(index, 1)
         }
-
       }, calculate: function(val) {
         if (val == 0) {
           return ''
@@ -351,7 +347,6 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
                 this.$message.success('退货成功')
 
                 this.recordInfo.recordData = []
@@ -362,7 +357,7 @@
             return false
           }
         })
-      },changeManufacturer(){
+      }, changeManufacturer() {
         this.recordInfo.recordData = []
         const tempObj = {}
         tempObj['good_type_id'] = 0
@@ -373,16 +368,16 @@
       }
     },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.return_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/stockDetail.vue

@@ -12,8 +12,8 @@
 
 
       <div class="cell clearfix" >
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
@@ -154,7 +154,7 @@
           { path: false, name: '库存管理' },
           { path: '/stock/detail', name: '出入库明细查询' }
         ],
-        searchKey:'',
+        searchKey: '',
         type: 1,
         page: 1,
         limit: 7,
@@ -177,23 +177,22 @@
       }
     },
     methods: {
-      getTypeName:function(row){
-        let name = ""
-        let name2 = ""
-        if (row.type == 1){
-          name = "耗材"
-
-        }else if(row.type == 2){
-          name = "其他"
+      getTypeName: function(row) {
+        let name = ''
+        let name2 = ''
+        if (row.type == 1) {
+          name = '耗材'
+        } else if (row.type == 2) {
+          name = '其他'
         }
-        if (row.types == 1){
-          name2 = "入库单"
-        }else if(row.types == 2){
-          name2 = "出库单"
-        }else if(row.types == 3){
-          name2 = "退货单"
-        }else if(row.types == 4){
-          name2 = "退库单"
+        if (row.types == 1) {
+          name2 = '入库单'
+        } else if (row.types == 2) {
+          name2 = '出库单'
+        } else if (row.types == 3) {
+          name2 = '退货单'
+        } else if (row.types == 4) {
+          name2 = '退库单'
         }
         return name + name2
       },
@@ -206,14 +205,14 @@
         }
         return name
       },
-      search:function(){
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords:this.searchKey,
+          keywords: this.searchKey
         }
         this.cancelStockDate = []
         getStockDetail(Params).then(response => {
@@ -306,7 +305,6 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
-
           }
         })
       }, getManufactuerName: function(manufacturer_id) {
@@ -322,7 +320,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/stockInOrder.vue

@@ -9,17 +9,17 @@
 
     <div class="app-container">
     <div class="cell clearfix">
-      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据编码/制单人/厂商" />
-      <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
+      <el-input  size="small"  style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据编码/制单人/厂商" />
+      <el-button  size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
     </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">入库时间</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -163,28 +163,26 @@
       // const startTime = year + '-' + month + '-' + day
       // this.start_time = startTime
 
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-
-
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
 
       this.GetWarehouse()
       this.GetConfigInfo()
@@ -197,7 +195,7 @@
           { path: false, name: '库存管理' },
           { path: false, name: '入库单' }
         ],
-        searchKey:'',
+        searchKey: '',
         type: 1,
         page: 1,
         limit: 7,
@@ -228,14 +226,14 @@
       }
     },
     methods: {
-      search:function(){
+      search: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.type,
-          keywords:this.searchKey,
+          keywords: this.searchKey
         }
         this.Warehouse.warehouseDate = []
         getWarehouseList(Params).then(response => {
@@ -251,7 +249,6 @@
             }
           }
         })
-
       },
       GetWarehouse: function() {
         const Params = {

src/xt_pages/stock/stockInOrderAdd.vue

@@ -18,13 +18,13 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">入库时间</span> : </label>
-        <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>
+        <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>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
 
-        <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
+        <el-select size="small"  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -36,7 +36,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
+        <el-select  size="small" v-model="form.dealer" clearable  placeholder="请选择经销商" >
           <el-option
             v-for="(option, index) in dealer"
             :key="index"
@@ -359,7 +359,7 @@
               tempForm['manufacturer'] = ''
               // this.recordInfo.recordData.add(tempForm,this.currentIndex + i)
               // this.recordInfo.recordData.push(tempForm)
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
@@ -367,7 +367,6 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-
       }, GetAllGoodType: function() {
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
@@ -432,10 +431,10 @@
         tempObj['manufacturer'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        if( this.recordInfo.recordData.length <= 1){
+        if (this.recordInfo.recordData.length <= 1) {
           this.$message.error('只有一条记录的时候无法删除')
           return
-        }else{
+        } else {
           this.recordInfo.recordData.splice(index, 1)
         }
       }, calculate: function(val) {
@@ -476,7 +475,6 @@
           this.propForm.goodType = this.goodType
           //
 
-
           // GetAllGoodInfoByID(params).then(response => {
           //   if (response.data.state == 0) {
           //     this.$message.error(response.data.msg)
@@ -553,7 +551,6 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
                 this.$message.success('入库成功')
 
                 this.$router.back(-1)
@@ -563,7 +560,7 @@
             return false
           }
         })
-      },changeManufacturer(){
+      }, changeManufacturer() {
         this.recordInfo.recordData = []
         const tempObj = {}
         tempObj['good_type_id'] = 0
@@ -577,20 +574,19 @@
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
         this.recordInfo.recordData.push(tempObj)
-
       }
     },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.warehousing_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/stockInOrderEdit.vue

@@ -19,7 +19,7 @@
 
     <div class="cell clearfix">
       <label class="title"><span class="name">入库时间</span> : </label>
-      <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>
+      <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>
     </div>
 
 
@@ -279,8 +279,7 @@ export default {
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
-
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
@@ -288,7 +287,6 @@ export default {
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-
       }, GetConfigInfo: function() {
         GetAllConfig().then(response => {
           if (response.data.state == 0) {
@@ -348,9 +346,7 @@ export default {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
-                this.$message.success("删除成功")
-
+                this.$message.success('删除成功')
 
                 this.recordInfo.recordData.splice(index, 1)
               }
@@ -410,13 +406,12 @@ export default {
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id,this.$route.query.type).then(response => {
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
-                this.$message.success("入库成功")
+                this.$message.success('入库成功')
 
                 this.$router.back(-1)
               }
@@ -448,7 +443,7 @@ export default {
             this.form.dealer = this.warehouse.dealer
             this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
 
-            if(this.recordInfo.recordData.length == 0){
+            if (this.recordInfo.recordData.length == 0) {
               const tempObj = {}
               tempObj['id'] = 0
               tempObj['good_type_id'] = 0

src/xt_pages/stock/stockOutOrder.vue

@@ -7,17 +7,17 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="start_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" @change="startTimeChange"></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+        <el-date-picker size="small" v-model="end_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" @change="endTimeChange"></el-date-picker>
       </div>
@@ -117,50 +117,50 @@
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { uParseTime } from '@/utils/tools'
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
 
 import {
   deleteWarehouseOut,
   GetAllConfig,
   getWarehouseOutList
-} from "@/api/stock";
-import BreadCrumb from "../components/bread-crumb";
+} from '@/api/stock'
+import BreadCrumb from '../components/bread-crumb'
 
 export default {
-  name: "salesReturnOrder",
+  name: 'salesReturnOrder',
   components: { BreadCrumb },
   created() {
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
+    var nowDate = new Date()
+    var nowYear = nowDate.getFullYear()
+    var nowMonth = nowDate.getMonth() + 1
+    var nowDay = nowDate.getDate()
     this.end_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    nowDate.setMonth(nowDate.getMonth() - 1)
+    nowYear = nowDate.getFullYear()
+    nowMonth = nowDate.getMonth() + 1
+    nowDay = nowDate.getDate()
     this.start_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    this.GetWarehouseOut();
-    this.GetConfigInfo();
-    this.fetchAllAdminUsers();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    this.GetWarehouseOut()
+    this.GetConfigInfo()
+    this.fetchAllAdminUsers()
   },
   data() {
     return {
-      searchKey:"",
+      searchKey: '',
       crumbs: [
-        { path: false, name: "库存管理" },
-        { path: false, name: "出库单" }
+        { path: false, name: '库存管理' },
+        { path: false, name: '出库单' }
       ],
       page: 1,
       limit: 7,
@@ -170,47 +170,46 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+      start_time: '',
       warehouseOutDate: [],
-      end_time: "",
+      end_time: '',
       goodType: [],
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
       type: 1
-    };
+    }
   },
   methods: {
-    search:function(){
+    search: function() {
       const Params = {
         page: this.page,
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords:this.searchKey,
+        keywords: this.searchKey
       }
-      this.warehouseOutDate = [];
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
-
+      })
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: "stockOutOrderAdd",
+        name: 'stockOutOrderAdd',
         query: { type: this.type }
-      });
+      })
     },
     GetWarehouseOut: function() {
       const Params = {
@@ -219,201 +218,201 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      };
-      this.warehouseOutDate = [];
+      }
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     getXuserName(id) {
       if (id <= 0) {
-        return "";
+        return ''
       }
-      var name = "";
+      var name = ''
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === "undefined"
+        typeof this.adminUserOptions.length === 'undefined'
       ) {
-        return name;
+        return name
       }
-      var leng = this.adminUserOptions.length;
+      var leng = this.adminUserOptions.length
       if (leng == 0) {
-        return name;
+        return name
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name;
-          break;
+          name = this.adminUserOptions[index].name
+          break
         }
       }
-      return name;
+      return name
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+        console.log(response)
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users;
-          var alen = this.adminUserOptions.length;
+          this.adminUserOptions = response.data.data.users
+          var alen = this.adminUserOptions.length
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      });
+      })
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     handleSizeChange(val) {
-      this.limit = val;
-      this.GetWarehouseOut();
+      this.limit = val
+      this.GetWarehouseOut()
     },
     handleCurrentChange(val) {
-      this.page = val;
-      this.GetWarehouseOut();
+      this.page = val
+      this.GetWarehouseOut()
     },
     startTimeChange(val) {
-      this.GetWarehouseOut();
+      this.GetWarehouseOut()
     },
     endTimeChange(val) {
-      this.GetWarehouseOut();
+      this.GetWarehouseOut()
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100;
+      return Math.round(parseFloat(val) * 100) / 100
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.manufacturer = response.data.data.manufacturer;
-          this.dealer = response.data.data.dealer;
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
         }
-      });
+      })
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name;
+          return this.manufacturer[i].manufacturer_name
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name;
+          return this.dealer[i].dealer_name
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "stockOutDetail",
+        name: 'stockOutDetail',
         query: { id: row.id, type: this.type }
-      });
+      })
     },
     handleDelete: function(index, row) {
-      const ids = [];
-      ids.push(row.id);
-      const idStr = ids.join(",");
+      const ids = []
+      ids.push(row.id)
+      const idStr = ids.join(',')
 
       const params = {
         ids: idStr
-      };
+      }
 
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection();
+        this.$refs.multipleTable.toggleAllSelection()
       } else {
-        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.clearSelection()
       }
     },
     select(selection) {
-      this.selectedTableData = selection;
+      this.selectedTableData = selection
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error("请选择要删除的记录");
-        return;
+        this.$message.error('请选择要删除的记录')
+        return
       }
-      const ids = [];
+      const ids = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+        ids.push(this.selectedTableData[i].id)
       }
-      const idStr = ids.join(",");
+      const idStr = ids.join(',')
       const params = {
         ids: idStr
-      };
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      }
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -18,7 +18,7 @@
 
     <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
-          <el-date-picker v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+          <el-date-picker size="small" v-model="warehouse_out_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>
         </div>
@@ -27,7 +27,7 @@
     <div class="cell clearfix">
       <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
 
-      <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
+      <el-select size="small"  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
         <el-option
           v-for="(option, index) in manufacturer"
           :key="index"
@@ -39,7 +39,7 @@
 
     <div class="cell clearfix">
       <label class="title"><span class="name">经销商</span> : </label>
-      <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
+      <el-select size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商" >
         <el-option
           v-for="(option, index) in dealer"
           :key="index"
@@ -225,8 +225,7 @@
               tempForm['count'] = ''
               tempForm['price'] = ''
               tempForm['remark'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
-
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
@@ -234,7 +233,6 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -303,10 +301,10 @@
 
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        if( this.recordInfo.recordData.length <= 1){
+        if (this.recordInfo.recordData.length <= 1) {
           this.$message.error('只有一条记录的时候无法删除')
           return
-        }else{
+        } else {
           this.recordInfo.recordData.splice(index, 1)
         }
       }, calculate: function(val) {
@@ -375,8 +373,7 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
-                this.$message.success("退货成功")
+                this.$message.success('退货成功')
                 this.recordInfo.recordData = []
                 this.$router.back(-1)
               }
@@ -385,7 +382,7 @@
             return false
           }
         })
-      },changeManufacturer(){
+      }, changeManufacturer() {
         this.recordInfo.recordData = []
         const tempObj = {}
         tempObj['good_type_id'] = 0
@@ -397,16 +394,16 @@
       }
     },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.warehouse_out_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -17,7 +17,7 @@
 
     <div class="cell clearfix">
       <label class="title"><span class="name">出库时间</span> : </label>
-      <el-date-picker v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+      <el-date-picker size="small" v-model="warehouse_out_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>
     </div>
@@ -208,8 +208,7 @@
               tempForm['count'] = ''
               tempForm['price'] = ''
               tempForm['remark'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
-
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
         }
@@ -285,8 +284,7 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
-                this.$message.success("删除成功")
+                this.$message.success('删除成功')
 
                 this.recordInfo.recordData.splice(index, 1)
               }
@@ -303,7 +301,6 @@
       }, showDialog(index, row) {
         this.currentIndex = index
 
-
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -315,7 +312,6 @@
           return cur
         }, [])
         this.$refs.dialog.show()
-
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -336,13 +332,12 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id,this.$route.query.type).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-
-                this.$message.success("退货成功")
+                this.$message.success('退货成功')
                 this.$router.back(-1)
               }
             })
@@ -368,7 +363,7 @@
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
           }
 
-          if( this.recordInfo.recordData.length == 0){
+          if (this.recordInfo.recordData.length == 0) {
             const tempObj = {}
             tempObj['id'] = 0
             tempObj['good_type_id'] = 0
@@ -378,8 +373,6 @@
             tempObj['remark'] = ''
             this.recordInfo.recordData.push(tempObj)
           }
-
-
         })
       }, calculate: function(val) {
         if (val == 0) {

src/xt_permission.js

@@ -9,7 +9,7 @@ const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
-  //线上注释
+  // 线上注释
   if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
     store.dispatch('VerifyConfigList', []).then(() => {
       next()
@@ -23,8 +23,8 @@ router.beforeEach((to, from, next) => {
     next()
   }
   return
- //线上注释
- 
+  // 线上注释
+
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)