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

config/dev.env.js

@@ -7,4 +7,10 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   BASE_API: '"http://api.xt.test.sgjyun.com"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+
+  SSO_HOST: '"http://testsso.sgjyun.com"',
+  SRCM_HOST: '"http://test1.sgjyun.com"',
+  XT_HOST: '"http://xt.test.sgjyun.com"',
+  MIRCO_MALL_HOST: '"http://mall.sgjyun.com"',
+  CDM_HOST: '"http://cdm.sgjyun.com"',
 }

config/prod.env.js

@@ -1,5 +1,11 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
-  BASE_API: '"http://api.xt.kuyicloud.com"'
+  BASE_API: '"http://api.xt.kuyicloud.com"',
+
+  SSO_HOST: '"http://sso.kuyicloud.com"',
+  SRCM_HOST: '"http://jk.kuyicloud.com"',
+  XT_HOST: '"http://xt.kuyicloud.com"',
+  MIRCO_MALL_HOST: '"http://mall.kuyicloud.com"',
+  CDM_HOST: '"http://cdm.kuyicloud.com"',
 }

config/sit.env.js

@@ -1,5 +1,11 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+
+  SSO_HOST: '"http://testsso.sgjyun.com"',
+  SRCM_HOST: '"http://test1.sgjyun.com"',
+  XT_HOST: '"http://xt.test.sgjyun.com"',
+  MIRCO_MALL_HOST: '"http://mall.sgjyun.com"',
+  CDM_HOST: '"http://cdm.sgjyun.com"',
 }

src/api/stock.js

@@ -385,9 +385,9 @@ export function DeleteWarehouseInfoItem(params) {
   })
 }
 
-export function EditWarehouse(params, warehousing_time, id,type,manufacturer_id) {
+export function EditWarehouse(params, warehousing_time, id,type,manufacturer_id,dealer_id) {
   return request({
-    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
     method: 'post',
     data: params
   })
@@ -433,9 +433,9 @@ export function deleteSalesReturnInfo(params) {
   })
 }
 
-export function editSalesReturnInfo(params, return_time, id,type,manufacturer_id) {
+export function editSalesReturnInfo(params, return_time, id,type,manufacturer_id,dealer_id) {
   return request({
-    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
     method: 'post',
     data: params
   })
@@ -473,9 +473,9 @@ export function getWarehouseOutInfo(params) {
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id,dealer_id) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
     method: 'post',
     data: params
   })
@@ -489,9 +489,9 @@ export function getCancelStockList(params) {
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id) {
+export function editCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id,dealer_id) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id=" + dealer_id,
     method: 'post',
     data: params
   })

src/router/index_路由未分离前.js

@@ -0,0 +1,962 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+Vue.use(Router)
+
+/* Layout */
+import Layout from '@/views/layout/Layout'
+
+/** note: submenu only apppear when children.length>=1
+*   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
+**/
+
+/**
+* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
+* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
+*                                if not set alwaysShow, only more than one route under the children
+*                                it will becomes nested mode, otherwise not show the root menu
+* redirect: noredirect           if `redirect:noredirect` will no redirct in the breadcrumb
+* name:'router-name'             the name is used by <keep-alive> (must set!!!)
+* meta : {
+    roles: ['admin','editor']     will control the page roles (you can set multiple roles)
+    title: 'title'               the name show in submenu and breadcrumb (recommend set)
+    icon: 'svg-name'             the icon show in the sidebar,
+    noCache: true                if true ,the page will no be cached(default is false)
+  }
+**/
+export const xt_constantRouterMap = [
+  // { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/token/verify', component: () => import('@/xt_pages/index/verify_token'), hidden: true },
+  { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  {
+    path: '',
+    component: Layout,
+    redirect: '/home',
+    children: [{
+      path: '/home',
+      component: () => import('@/xt_pages/home/index'),
+      name: 'home',
+      meta: { title: 'home', icon: 'dashboard', noCache: true }
+    }]
+  },
+  {
+    path: '/service',
+    component: Layout,
+    // redirect: '/service',
+    hidden: true,
+    is_menu: false,
+
+    meta: { title: 'service', icon: 'shebei' },
+    children: [{
+      path: '/service',
+      component: () => import('@/xt_pages/service/index'),
+      hidden: true,
+      is_menu: false,
+      name: 'service',
+      meta: { title: 'service', icon: 'shebei', noCache: true }
+    }, {
+      path: '/service/invoice',
+      component: () => import('@/xt_pages/service/invoice'),
+      hidden: true,
+      is_menu: false,
+      name: 'invoice',
+      meta: { title: 'invoice', icon: 'shebei', noCache: true }
+    }, {
+      path: '/service/invoice/apply',
+      component: () => import('@/xt_pages/service/invoiceApply'),
+      hidden: true,
+      is_menu: false,
+      name: 'invoiceApply',
+      meta: { title: 'invoiceApply', icon: 'shebei', noCache: true }
+    },
+    {
+      path: '/servicePay',
+      component: () => import('@/xt_pages/service/servicePay'),
+      hidden: true,
+      name: 'servicePay',
+      meta: { title: 'servicePay' }
+    },
+    {
+      path: '/payType',
+      component: () => import('@/xt_pages/service/payType'),
+      hidden: true,
+      name: 'payType',
+      meta: { title: 'payType' }
+    },
+    {
+      path: '/weChatPay',
+      component: () => import('@/xt_pages/service/weChatPay'),
+      hidden: true,
+      name: 'weChatPay',
+      meta: { title: 'weChatPay' }
+    },
+    {
+      path: '/service/completeOrder',
+      component: () => import('@/xt_pages/service/completeOrder'),
+      hidden: true,
+      name: 'completeOrder',
+      meta: { title: 'completeOrder' }
+    }, {
+      path: '/service/buy',
+      component: () => import('@/xt_pages/service/serviceOrder'),
+      hidden: true,
+      is_menu: false,
+      name: 'serviceOrder',
+      meta: { title: 'serviceOrder', icon: 'shebei', noCache: true }
+    }, {
+      path: '/order',
+      component: () => import('@/xt_pages/service/orderRecord'),
+      hidden: true,
+      is_menu: false,
+      name: 'orderRecord',
+      meta: { title: 'orderRecord', icon: 'shebei', noCache: true }
+    }, {
+      path: '/service/recordList',
+      component: () => import('@/xt_pages/service/serviceRecord'),
+      hidden: true,
+      is_menu: false,
+      name: 'recordList',
+      meta: { title: 'recordList', icon: 'shebei', noCache: true }
+    }
+    ]
+  },
+
+  // ////////////////////////////
+  // 本地开始
+  // ///////////////////////////
+  {
+    path: '/patients',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'User',
+    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',
+    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',
+    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' }, hidden: true, 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/in/other',
+        component: () => import('@/xt_pages/stock/otherStockInOrder'),
+        name: 'otherStockInOrder',
+        meta: { title: 'otherStockInOrder', noCache: true }
+      }, {
+        path: '/stock/return',
+        component: () => import('@/xt_pages/stock/salesReturnOrder'),
+        name: 'salesReturnOrder',
+        meta: { title: 'salesReturnOrder', noCache: true }
+      }, {
+        path: '/stock/return/other',
+        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+        name: 'otherSalesReturnOrder',
+        meta: { title: 'otherSalesReturnOrder', noCache: true }
+      },
+      {
+        path: '/stock/out',
+        component: () => import('@/xt_pages/stock/stockOutOrder'),
+        name: 'stockOutOrder',
+        meta: { title: 'stockOutOrder', noCache: true }
+      }, {
+        path: '/stock/out/other',
+        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+        name: 'otherStockOutOrder',
+        meta: { title: 'otherStockOutOrder', noCache: true }
+      }, {
+        path: '/stock/cancel',
+        component: () => import('@/xt_pages/stock/cancelStockOrder'),
+        name: 'cancelStockOrder',
+        meta: { title: 'cancelStockOrder', 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' }
+      }, {
+        path: '/stock/out/detail',
+        component: () => import('@/xt_pages/stock/stockOutDetail'),
+        name: 'stockOutDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockOutDetail' }
+      }, {
+        path: '/stock/cancel/add',
+        component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+        name: 'cancelStockOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'cancelStockOrderAdd' }
+      }, {
+        path: '/stock/cancel/detail',
+        component: () => import('@/xt_pages/stock/cancelStockDetail'),
+        name: 'cancelStockDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'cancelStockDetail' }
+      }
+    ]
+  },
+
+  {
+    path: '/qcd',
+    component: Layout,
+    redirect: '/qcd/dialysistotal',
+    name: 'qcd',
+    alwaysShow: true,
+    meta: { title: '科室质控', icon: 'statistics' },
+    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: '/role',
+    component: Layout,
+    redirect: '/role/admin/manage',
+    name: 'role',
+    alwaysShow: true,
+    meta: { title: 'permissionManage', icon: 'role' },
+    children: [
+      { path: '/role/admin/manage', component: () => import('@/xt_pages/role/admin'), name: 'adminManage', meta: { title: 'adminManage' }},
+      { path: '/role/manage', component: () => import('@/xt_pages/role/role'), name: 'roleManage', meta: { title: 'roleManage' }},
+      { path: '/role/admin/create', component: () => import('@/xt_pages/role/CreateAdmin'), name: 'addAdmin', meta: { title: 'addAdmin', noCache: true }, hidden: true, is_menu: false },
+      { path: '/role/admin/edit', component: () => import('@/xt_pages/role/EditAdmin'), name: 'editAdmin', meta: { title: 'editAdmin', noCache: true }, hidden: true, is_menu: false },
+      { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
+      { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
+    ]
+  },
+  {
+    path: '/fullscreenboard',
+    component: () => import('@/xt_pages/fullscreenboard/index'),
+    hidden: true
+  }
+  // /////////////本地要end/
+]
+
+export default new Router({
+  // mode: 'history', // require service support
+  scrollBehavior: () => ({ y: 0 }),
+  routes: xt_constantRouterMap
+})
+
+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: '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/in/other',
+  //       component: () => import('@/xt_pages/stock/otherStockInOrder'),
+  //       name: 'otherStockInOrder',
+  //       meta: { title: 'otherStockInOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/return',
+  //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
+  //       name: 'salesReturnOrder',
+  //       meta: { title: 'salesReturnOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/return/other',
+  //       component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+  //       name: 'otherSalesReturnOrder',
+  //       meta: { title: 'otherSalesReturnOrder', noCache: true }
+  //     },
+  //     {
+  //       path: '/stock/out',
+  //       component: () => import('@/xt_pages/stock/stockOutOrder'),
+  //       name: 'stockOutOrder',
+  //       meta: { title: 'stockOutOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/out/other',
+  //       component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+  //       name: 'otherStockOutOrder',
+  //       meta: { title: 'otherStockOutOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/cancel',
+  //       component: () => import('@/xt_pages/stock/cancelStockOrder'),
+  //       name: 'cancelStockOrder',
+  //       meta: { title: 'cancelStockOrder', 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: '/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',
+    component: Layout,
+    redirect: '/role/admin/manage',
+    name: 'role',
+    alwaysShow: true,
+    meta: { title: 'permissionManage', icon: 'role' },
+    children: [
+      { path: '/role/admin/manage', component: () => import('@/xt_pages/role/admin'), name: 'adminManage', meta: { title: 'adminManage' }},
+      { path: '/role/manage', component: () => import('@/xt_pages/role/role'), name: 'roleManage', meta: { title: 'roleManage' }},
+      { path: '/role/admin/create', component: () => import('@/xt_pages/role/CreateAdmin'), name: 'addAdmin', meta: { title: 'addAdmin', noCache: true }, hidden: true, is_menu: false },
+      { path: '/role/admin/edit', component: () => import('@/xt_pages/role/EditAdmin'), name: 'editAdmin', meta: { title: 'editAdmin', noCache: true }, hidden: true, is_menu: false },
+      { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
+      { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
+    ]
+  }
+]

src/router/modules/data_dict.js

@@ -0,0 +1,38 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/data/',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'data',
+  alwaysShow: true,
+  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'
+    }
+  }
+  ]
+}

src/router/modules/device.js

@@ -0,0 +1,46 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  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'
+    }
+  }
+  ]
+}

src/router/modules/dialysis.js

@@ -0,0 +1,84 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  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'
+    },
+    hidden: true,
+    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: '数据看板'
+    }
+  }
+  ]
+}

src/router/modules/patient.js

@@ -0,0 +1,153 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  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
+    }
+  }
+  ]
+}

src/router/modules/qcd.js

@@ -0,0 +1,174 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/qcd',
+  component: Layout,
+  redirect: '/qcd/dialysistotal',
+  name: 'qcd',
+  alwaysShow: true,
+  meta: {
+    title: '科室质控',
+    icon: 'statistics'
+  },
+  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: '口服药'
+    }
+  }
+  ]
+}

src/router/modules/role.js

@@ -0,0 +1,71 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/role',
+  component: Layout,
+  redirect: '/role/admin/manage',
+  name: 'role',
+  alwaysShow: true,
+  meta: {
+    title: 'permissionManage',
+    icon: 'role'
+  },
+  children: [{
+    path: '/role/admin/manage',
+    component: () => import('@/xt_pages/role/admin'),
+    name: 'adminManage',
+    meta: {
+      title: 'adminManage'
+    }
+  },
+  {
+    path: '/role/manage',
+    component: () => import('@/xt_pages/role/role'),
+    name: 'roleManage',
+    meta: {
+      title: 'roleManage'
+    }
+  },
+  {
+    path: '/role/admin/create',
+    component: () => import('@/xt_pages/role/CreateAdmin'),
+    name: 'addAdmin',
+    meta: {
+      title: 'addAdmin',
+      noCache: true
+    },
+    hidden: true,
+    is_menu: false
+  },
+  {
+    path: '/role/admin/edit',
+    component: () => import('@/xt_pages/role/EditAdmin'),
+    name: 'editAdmin',
+    meta: {
+      title: 'editAdmin',
+      noCache: true
+    },
+    hidden: true,
+    is_menu: false
+  },
+  {
+    path: '/role/perview',
+    component: () => import('@/xt_pages/role/EditPerview'),
+    name: 'setupPerview',
+    meta: {
+      title: 'setupPerview',
+      noCache: true
+    },
+    hidden: true,
+    is_menu: false
+  },
+  {
+    path: '/role/admin/specialpermission',
+    component: () => import('@/xt_pages/role/special_permission'),
+    name: 'special_permission_manage',
+    meta: {
+      title: 'special_permission_manage'
+    }
+  }
+  ]
+}

src/router/modules/service.js

@@ -0,0 +1,117 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/service',
+  component: Layout,
+  hidden: true,
+  is_menu: false,
+
+  meta: {
+    title: 'service',
+    icon: 'shebei'
+  },
+  children: [{
+    path: '/service',
+    component: () => import('@/xt_pages/service/index'),
+    hidden: true,
+    is_menu: false,
+    name: 'service',
+    meta: {
+      title: 'service',
+      icon: 'shebei',
+      noCache: true
+    }
+  }, {
+    path: '/service/invoice',
+    component: () => import('@/xt_pages/service/invoice'),
+    hidden: true,
+    is_menu: false,
+    name: 'invoice',
+    meta: {
+      title: 'invoice',
+      icon: 'shebei',
+      noCache: true
+    }
+  }, {
+    path: '/service/invoice/apply',
+    component: () => import('@/xt_pages/service/invoiceApply'),
+    hidden: true,
+    is_menu: false,
+    name: 'invoiceApply',
+    meta: {
+      title: 'invoiceApply',
+      icon: 'shebei',
+      noCache: true
+    }
+  },
+  {
+    path: '/servicePay',
+    component: () => import('@/xt_pages/service/servicePay'),
+    hidden: true,
+    name: 'servicePay',
+    meta: {
+      title: 'servicePay'
+    }
+  },
+  {
+    path: '/payType',
+    component: () => import('@/xt_pages/service/payType'),
+    hidden: true,
+    name: 'payType',
+    meta: {
+      title: 'payType'
+    }
+  },
+  {
+    path: '/weChatPay',
+    component: () => import('@/xt_pages/service/weChatPay'),
+    hidden: true,
+    name: 'weChatPay',
+    meta: {
+      title: 'weChatPay'
+    }
+  },
+  {
+    path: '/service/completeOrder',
+    component: () => import('@/xt_pages/service/completeOrder'),
+    hidden: true,
+    name: 'completeOrder',
+    meta: {
+      title: 'completeOrder'
+    }
+  }, {
+    path: '/service/buy',
+    component: () => import('@/xt_pages/service/serviceOrder'),
+    hidden: true,
+    is_menu: false,
+    name: 'serviceOrder',
+    meta: {
+      title: 'serviceOrder',
+      icon: 'shebei',
+      noCache: true
+    }
+  }, {
+    path: '/order',
+    component: () => import('@/xt_pages/service/orderRecord'),
+    hidden: true,
+    is_menu: false,
+    name: 'orderRecord',
+    meta: {
+      title: 'orderRecord',
+      icon: 'shebei',
+      noCache: true
+    }
+  }, {
+    path: '/service/recordList',
+    component: () => import('@/xt_pages/service/serviceRecord'),
+    hidden: true,
+    is_menu: false,
+    name: 'recordList',
+    meta: {
+      title: 'recordList',
+      icon: 'shebei',
+      noCache: true
+    }
+  }
+  ]
+}

src/router/modules/stock.js

@@ -0,0 +1,175 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/stock/',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'stockManage',
+  alwaysShow: true,
+  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/in/other',
+    component: () => import('@/xt_pages/stock/otherStockInOrder'),
+    name: 'otherStockInOrder',
+    meta: {
+      title: 'otherStockInOrder',
+      noCache: true
+    }
+  }, {
+    path: '/stock/return',
+    component: () => import('@/xt_pages/stock/salesReturnOrder'),
+    name: 'salesReturnOrder',
+    meta: {
+      title: 'salesReturnOrder',
+      noCache: true
+    }
+  }, {
+    path: '/stock/return/other',
+    component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+    name: 'otherSalesReturnOrder',
+    meta: {
+      title: 'otherSalesReturnOrder',
+      noCache: true
+    }
+  },
+  {
+    path: '/stock/out',
+    component: () => import('@/xt_pages/stock/stockOutOrder'),
+    name: 'stockOutOrder',
+    meta: {
+      title: 'stockOutOrder',
+      noCache: true
+    }
+  }, {
+    path: '/stock/out/other',
+    component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+    name: 'otherStockOutOrder',
+    meta: {
+      title: 'otherStockOutOrder',
+      noCache: true
+    }
+  }, {
+    path: '/stock/cancel',
+    component: () => import('@/xt_pages/stock/cancelStockOrder'),
+    name: 'cancelStockOrder',
+    meta: {
+      title: 'cancelStockOrder',
+      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'
+    }
+  }, {
+    path: '/stock/out/detail',
+    component: () => import('@/xt_pages/stock/stockOutDetail'),
+    name: 'stockOutDetail',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'stockOutDetail'
+    }
+  }, {
+    path: '/stock/cancel/add',
+    component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+    name: 'cancelStockOrderAdd',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'cancelStockOrderAdd'
+    }
+  }, {
+    path: '/stock/cancel/detail',
+    component: () => import('@/xt_pages/stock/cancelStockDetail'),
+    name: 'cancelStockDetail',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'cancelStockDetail'
+    }
+  }
+  ]
+}

src/router/modules/weight_sign.js

@@ -0,0 +1,17 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  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
+    }
+  }]
+}

src/router/modules/workforce.js

@@ -0,0 +1,64 @@
+import Layout from '@/views/layout/Layout'
+export default {
+  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
+    }
+  }
+  ]
+}

src/router/origin_index.js

@@ -1,331 +0,0 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-Vue.use(Router)
-
-/* Layout */
-import Layout from '@/views/layout/Layout'
-
-/** note: submenu only apppear when children.length>=1
-*   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
-**/
-
-/**
-* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
-* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
-*                                if not set alwaysShow, only more than one route under the children
-*                                it will becomes nested mode, otherwise not show the root menu
-* redirect: noredirect           if `redirect:noredirect` will no redirct in the breadcrumb
-* name:'router-name'             the name is used by <keep-alive> (must set!!!)
-* meta : {
-    roles: ['admin','editor']     will control the page roles (you can set multiple roles)
-    title: 'title'               the name show in submenu and breadcrumb (recommend set)
-    icon: 'svg-name'             the icon show in the sidebar,
-    noCache: true                if true ,the page will no be cached(default is false)
-  }
-**/
-export const constantRouterMap = [
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
-  { path: '/authredirect', component: () => import('@/views/login/authredirect'), hidden: true },
-  { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  {
-    path: '',
-    component: Layout,
-    redirect: 'dashboard',
-    children: [{
-      path: 'dashboard',
-      component: () => import('@/views/dashboard/index'),
-      name: 'dashboard',
-      meta: { title: 'dashboard', icon: 'dashboard', noCache: true }
-    }]
-  },
-  {
-    path: '/documentation',
-    component: Layout,
-    redirect: '/documentation/index',
-    children: [{
-      path: 'index',
-      component: () => import('@/views/documentation/index'),
-      name: 'documentation',
-      meta: { title: 'documentation', icon: 'documentation', noCache: true }
-    }]
-  },
-  {
-    path: '/guide',
-    component: Layout,
-    redirect: '/guide/index',
-    children: [{
-      path: 'index',
-      component: () => import('@/views/guide/index'),
-      name: 'guide',
-      meta: { title: 'guide', icon: 'guide', noCache: true }
-    }]
-  }
-]
-
-export default new Router({
-  // mode: 'history', // require service support
-  scrollBehavior: () => ({ y: 0 }),
-  routes: constantRouterMap
-})
-
-export const asyncRouterMap = [
-  {
-    path: '/permission',
-    component: Layout,
-    redirect: '/permission/index',
-    alwaysShow: true, // will always show the root menu
-    meta: {
-      title: 'permission',
-      icon: 'lock',
-      roles: ['admin', 'editor'] // you can set roles in root nav
-    },
-    children: [{
-      path: 'page',
-      component: () => import('@/views/permission/page'),
-      name: 'pagePermission',
-      meta: {
-        title: 'pagePermission',
-        roles: ['admin'] // or you can only set roles in sub nav
-      }
-    }, {
-      path: 'directive',
-      component: () => import('@/views/permission/directive'),
-      name: 'directivePermission',
-      meta: {
-        title: 'directivePermission'
-        // if do not set roles, means: this page does not require permission
-      }
-    }]
-  },
-
-  {
-    path: '/icon',
-    component: Layout,
-    children: [{
-      path: 'index',
-      component: () => import('@/views/svg-icons/index'),
-      name: 'icons',
-      meta: { title: 'icons', icon: 'icon', noCache: true }
-    }]
-  },
-
-  {
-    path: '/components',
-    component: Layout,
-    redirect: 'noredirect',
-    name: 'component-demo',
-    meta: {
-      title: 'components',
-      icon: 'component'
-    },
-    children: [
-      { path: 'tinymce', component: () => import('@/views/components-demo/tinymce'), name: 'tinymce-demo', meta: { title: 'tinymce' }},
-      { path: 'markdown', component: () => import('@/views/components-demo/markdown'), name: 'markdown-demo', meta: { title: 'markdown' }},
-      { path: 'json-editor', component: () => import('@/views/components-demo/jsonEditor'), name: 'jsonEditor-demo', meta: { title: 'jsonEditor' }},
-      { path: 'splitpane', component: () => import('@/views/components-demo/splitpane'), name: 'splitpane-demo', meta: { title: 'splitPane' }},
-      { path: 'avatar-upload', component: () => import('@/views/components-demo/avatarUpload'), name: 'avatarUpload-demo', meta: { title: 'avatarUpload' }},
-      { path: 'dropzone', component: () => import('@/views/components-demo/dropzone'), name: 'dropzone-demo', meta: { title: 'dropzone' }},
-      { path: 'sticky', component: () => import('@/views/components-demo/sticky'), name: 'sticky-demo', meta: { title: 'sticky' }},
-      { path: 'count-to', component: () => import('@/views/components-demo/countTo'), name: 'countTo-demo', meta: { title: 'countTo' }},
-      { path: 'mixin', component: () => import('@/views/components-demo/mixin'), name: 'componentMixin-demo', meta: { title: 'componentMixin' }},
-      { path: 'back-to-top', component: () => import('@/views/components-demo/backToTop'), name: 'backToTop-demo', meta: { title: 'backToTop' }},
-      { path: 'drag-dialog', component: () => import('@/views/components-demo/dragDialog'), name: 'dragDialog-demo', meta: { title: 'dragDialog' }},
-      { path: 'dnd-list', component: () => import('@/views/components-demo/dndList'), name: 'dndList-demo', meta: { title: 'dndList' }},
-      { path: 'drag-kanban', component: () => import('@/views/components-demo/dragKanban'), name: 'dragKanban-demo', meta: { title: 'dragKanban' }}
-    ]
-  },
-
-  {
-    path: '/charts',
-    component: Layout,
-    redirect: 'noredirect',
-    name: 'charts',
-    meta: {
-      title: 'charts',
-      icon: 'chart'
-    },
-    children: [
-      { path: 'keyboard', component: () => import('@/views/charts/keyboard'), name: 'keyboardChart', meta: { title: 'keyboardChart', noCache: true }},
-      { path: 'line', component: () => import('@/views/charts/line'), name: 'lineChart', meta: { title: 'lineChart', noCache: true }},
-      { path: 'mixchart', component: () => import('@/views/charts/mixChart'), name: 'mixChart', meta: { title: 'mixChart', noCache: true }}
-    ]
-  },
-
-  {
-    path: '/tab',
-    component: Layout,
-    children: [{
-      path: 'index',
-      component: () => import('@/views/tab/index'),
-      name: 'tab',
-      meta: { title: 'tab', icon: 'tab' }
-    }]
-  },
-
-  {
-    path: '/table',
-    component: Layout,
-    redirect: '/table/complex-table',
-    name: 'table',
-    meta: {
-      title: 'Table',
-      icon: 'table'
-    },
-    children: [
-      { path: 'dynamic-table', component: () => import('@/views/table/dynamicTable/index'), name: 'dynamicTable', meta: { title: 'dynamicTable' }},
-      { path: 'drag-table', component: () => import('@/views/table/dragTable'), name: 'dragTable', meta: { title: 'dragTable' }},
-      { path: 'inline-edit-table', component: () => import('@/views/table/inlineEditTable'), name: 'inlineEditTable', meta: { title: 'inlineEditTable' }},
-      { path: 'tree-table', component: () => import('@/views/table/treeTable/treeTable'), name: 'treeTableDemo', meta: { title: 'treeTable' }},
-      { path: 'custom-tree-table', component: () => import('@/views/table/treeTable/customTreeTable'), name: 'customTreeTableDemo', meta: { title: 'customTreeTable' }},
-      { path: 'complex-table', component: () => import('@/views/table/complexTable'), name: 'complexTable', meta: { title: 'complexTable' }}
-    ]
-  },
-
-  {
-    path: '/example',
-    component: Layout,
-    redirect: '/example/list',
-    name: 'example',
-    meta: {
-      title: 'example',
-      icon: 'example'
-    },
-    children: [
-      { path: 'create', component: () => import('@/views/example/create'), name: 'createArticle', meta: { title: 'createArticle', icon: 'edit' }},
-      { path: 'edit/:id(\\d+)', component: () => import('@/views/example/edit'), name: 'editArticle', meta: { title: 'editArticle', noCache: true }, hidden: true },
-      { path: 'list', component: () => import('@/views/example/list'), name: 'articleList', meta: { title: 'articleList', icon: 'list' }}
-    ]
-  },
-
-  {
-    path: '/nested',
-    component: Layout,
-    redirect: '/nested/menu1/menu1-1',
-    name: 'nested',
-    meta: {
-      title: 'nested',
-      icon: 'nested'
-    },
-    children: [
-      {
-        path: 'menu1',
-        component: () => import('@/views/nested/menu1/index'), // Parent router-view
-        name: 'menu1',
-        meta: { title: 'menu1' },
-        redirect: '/nested/menu1/menu1-1',
-        children: [
-          {
-            path: 'menu1-1',
-            component: () => import('@/views/nested/menu1/menu1-1'),
-            name: 'menu1-1',
-            meta: { title: 'menu1-1' }
-          },
-          {
-            path: 'menu1-2',
-            component: () => import('@/views/nested/menu1/menu1-2'),
-            name: 'menu1-2',
-            redirect: '/nested/menu1/menu1-2/menu1-2-1',
-            meta: { title: 'menu1-2' },
-            children: [
-              {
-                path: 'menu1-2-1',
-                component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'),
-                name: 'menu1-2-1',
-                meta: { title: 'menu1-2-1' }
-              },
-              {
-                path: 'menu1-2-2',
-                component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'),
-                name: 'menu1-2-2',
-                meta: { title: 'menu1-2-2' }
-              }
-            ]
-          },
-          {
-            path: 'menu1-3',
-            component: () => import('@/views/nested/menu1/menu1-3'),
-            name: 'menu1-3',
-            meta: { title: 'menu1-3' }
-          }
-        ]
-      },
-      {
-        path: 'menu2',
-        name: 'menu2',
-        component: () => import('@/views/nested/menu2/index'),
-        meta: { title: 'menu2' }
-      }
-    ]
-  },
-
-  {
-    path: '/error',
-    component: Layout,
-    redirect: 'noredirect',
-    name: 'errorPages',
-    meta: {
-      title: 'errorPages',
-      icon: '404'
-    },
-    children: [
-      { path: '401', component: () => import('@/views/errorPage/401'), name: 'page401', meta: { title: 'page401', noCache: true }},
-      { path: '404', component: () => import('@/views/errorPage/404'), name: 'page404', meta: { title: 'page404', noCache: true }}
-    ]
-  },
-
-  {
-    path: '/error-log',
-    component: Layout,
-    redirect: 'noredirect',
-    children: [{ path: 'log', component: () => import('@/views/errorLog/index'), name: 'errorLog', meta: { title: 'errorLog', icon: 'bug' }}]
-  },
-
-  {
-    path: '/excel',
-    component: Layout,
-    redirect: '/excel/export-excel',
-    name: 'excel',
-    meta: {
-      title: 'excel',
-      icon: 'excel'
-    },
-    children: [
-      { path: 'export-excel', component: () => import('@/views/excel/exportExcel'), name: 'exportExcel', meta: { title: 'exportExcel' }},
-      { path: 'export-selected-excel', component: () => import('@/views/excel/selectExcel'), name: 'selectExcel', meta: { title: 'selectExcel' }},
-      { path: 'upload-excel', component: () => import('@/views/excel/uploadExcel'), name: 'uploadExcel', meta: { title: 'uploadExcel' }}
-    ]
-  },
-
-  {
-    path: '/zip',
-    component: Layout,
-    redirect: '/zip/download',
-    alwaysShow: true,
-    meta: { title: 'zip', icon: 'zip' },
-    children: [{ path: 'download', component: () => import('@/views/zip/index'), name: 'exportZip', meta: { title: 'exportZip' }}]
-  },
-
-  {
-    path: '/theme',
-    component: Layout,
-    redirect: 'noredirect',
-    children: [{ path: 'index', component: () => import('@/views/theme/index'), name: 'theme', meta: { title: 'theme', icon: 'theme' }}]
-  },
-
-  {
-    path: '/clipboard',
-    component: Layout,
-    redirect: 'noredirect',
-    children: [{ path: 'index', component: () => import('@/views/clipboard/index'), name: 'clipboardDemo', meta: { title: 'clipboardDemo', icon: 'clipboard' }}]
-  },
-
-  {
-    path: '/i18n',
-    component: Layout,
-    children: [{ path: 'index', component: () => import('@/views/i18n-demo/index'), name: 'i18n', meta: { title: 'i18n', icon: 'international' }}]
-  },
-
-  { path: '*', redirect: '/404', hidden: true }
-]

src/router/xt_index.js

@@ -1,215 +0,0 @@
-// import Vue from 'vue'
-// import Router from 'vue-router'
-
-// Vue.use(Router)
-
-// /* Layout */
-// import Layout from '@/views/layout/Layout'
-
-// /** note: submenu only apppear when children.length>=1
-// *   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
-// **/
-
-// /**
-// * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
-// * alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
-// *                                if not set alwaysShow, only more than one route under the children
-// *                                it will becomes nested mode, otherwise not show the root menu
-// * redirect: noredirect           if `redirect:noredirect` will no redirct in the breadcrumb
-// * name:'router-name'             the name is used by <keep-alive> (must set!!!)
-// * meta : {
-//     roles: ['admin','editor']     will control the page roles (you can set multiple roles)
-//     title: 'title'               the name show in submenu and breadcrumb (recommend set)
-//     icon: 'svg-name'             the icon show in the sidebar,
-//     noCache: true                if true ,the page will no be cached(default is false)
-//   }
-// **/
-// export const xt_constantRouterMap = [
-//   // { path: '/login', component: () => import('@/views/login/index'), hidden: true },
-//   { path: '/token/verify', component: () => import('@/xt_pages/index/verify_token'), hidden: true },
-//   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
-//   { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-//   {
-//     path: '',
-//     component: Layout,
-//     redirect: '/home',
-//     children: [{
-//       path: '/home',
-//       component: () => import('@/xt_pages/home/index'),
-//       name: 'home',
-//       meta: { title: 'home', icon: 'dashboard', noCache: true }
-//     }]
-//   },
-//   // //////////////////////////////////////////////////////////
-//   {
-//     path: '/sign',
-//     component: Layout,
-//     redirect: '/sign/index',
-//     name: 'sign',
-//     alwaysShow: true,
-//     meta: { title: 'signWeight', icon: 'table' },
-//     children: [
-//       { path: '/sign/index', component: () => import('@/xt_pages/sign/index'), name: 'signWeight', meta: { title: 'signWeight' }}
-//     ]
-//   },
-//   {
-//     path: '/patients',
-//     component: Layout,
-//     redirect: 'noredirect',
-//     name: 'User',
-//     meta: {
-//       title: 'user',
-//       icon: 'chart'
-//     },
-//     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,
-//         name: 'patient Page',
-//         meta: { title: 'patientPage', noCache: true }
-//       },
-//       {
-//         path: '/patients/patient/:id/edit',
-//         component: () => import('@/xt_pages/user/editPatient'),
-//         hidden: true,
-//         name: 'Edit Patient',
-//         meta: { title: 'editPatient', noCache: true }
-//       },
-//       {
-//         path: '/patients/patient/:id/dialysisSolution',
-//         component: () => import('@/xt_pages/user/dialysisSolution'),
-//         hidden: true,
-//         name: 'dialysisSolution',
-//         meta: { title: 'dialysisSolution', noCache: true }
-//       },
-//       {
-//         path: '/patients/patient/:id/weight',
-//         component: () => import('@/xt_pages/user/weight'),
-//         hidden: true,
-//         name: 'weight',
-//         meta: { title: 'weight', noCache: true }
-//       },
-//       {
-//         path: '/patients/dialysisRecord',
-//         component: () => import('@/xt_pages/user/dialysisRecord'),
-//         name: 'dialysisRecord',
-//         meta: { title: 'dialysisRecord', noCache: true }
-//       },
-//       {
-//         path: '/patients/patient/:id/scheduling',
-//         component: () => import('@/xt_pages/user/scheduling'),
-//         hidden: true,
-//         name: 'scheduling',
-//         meta: { title: 'scheduling', noCache: true }
-//       },
-//       {
-//         path: '/patients/patient/:id/doctorAdvice',
-//         component: () => import('@/xt_pages/user/doctorAdvice'),
-//         hidden: true,
-//         name: 'doctorAdvice',
-//         meta: { title: 'doctorAdvice', noCache: true }
-//       },
-//       {
-//         path: '/patients/inspection',
-//         component: () => import('@/xt_pages/user/inspection'),
-//         hidden: true,
-//         name: 'Inspection',
-//         meta: { title: 'inspection', noCache: true }
-//       }
-//     ]
-//   },
-//   {
-//     path: '/workforce',
-//     component: Layout,
-//     redirect: 'noredirect',
-//     name: 'workforce',
-//     meta: {
-//       title: 'workforce',
-//       icon: 'chart'
-//     },
-//     children: [
-//       {
-//         path: 'appointment',
-//         component: () => import('@/xt_pages/workforce/appointment'),
-//         name: 'appointment',
-//         meta: { title: 'appointment', noCache: true }
-//       },
-//       {
-//         path: 'sign',
-//         component: () => import('@/xt_pages/workforce/sign'),
-//         name: 'sign',
-//         meta: { title: 'sign', noCache: true }
-//       },
-//       {
-//         path: 'remind',
-//         component: () => import('@/xt_pages/workforce/remind'),
-//         name: 'remind',
-//         meta: { title: 'remind', noCache: true }
-//       }
-//     ]
-//   },
-//   {
-//     path: '/dialysis/',
-//     component: Layout,
-//     redirect: 'noredirect',
-//     name: 'dialysis',
-//     meta: {
-//       title: 'dialysis',
-//       icon: 'component'
-//     },
-//     children: [
-//       { path: 'paper', component: () => import('@/xt_pages/dialysis/dialysisPage'), name: 'paper', meta: { title: 'paper' }},
-//       { 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: 'watch', component: () => import('@/xt_pages/dialysis/bloodPresssWatch'), name: 'watch', meta: { title: 'watch' }}
-//     ]
-//   },
-//   {
-//     path: '/device',
-//     component: Layout,
-//     redirect: '/device/main',
-//     name: 'device',
-//     alwaysShow: true,
-//     meta: { title: 'deviceManage', icon: 'table' },
-//     children: [
-//       { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'deviceManage', meta: { title: 'deviceManage' }}
-//     ]
-//   }
-// ]
-
-// export default new Router({
-//   // mode: 'history', // require service support
-//   scrollBehavior: () => ({ y: 0 }),
-//   routes: xt_constantRouterMap
-// })
-
-// export const xt_asyncRouterMap = [
-//   {
-//     path: '/role',
-//     component: Layout,
-//     redirect: '/role/admin/manage',
-//     name: 'role',
-//     alwaysShow: true,
-//     meta: { title: 'permissionManage', icon: 'table' },
-//     children: [
-//       { path: '/role/admin/manage', component: () => import('@/xt_pages/role/admin'), name: 'adminManage', meta: { title: 'adminManage' }},
-//       { path: '/role/manage', component: () => import('@/xt_pages/role/role'), name: 'roleManage', meta: { title: 'roleManage' }},
-//       { path: '/role/admin/create', component: () => import('@/xt_pages/role/CreateAdmin'), name: 'addAdmin', meta: { title: 'addAdmin', noCache: true }, hidden: true, is_menu: false },
-//       { path: '/role/admin/edit', component: () => import('@/xt_pages/role/EditAdmin'), name: 'editAdmin', meta: { title: 'editAdmin', noCache: true }, hidden: true, is_menu: false },
-//       { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false }
-//     ]
-//   }
-// ]

src/store/modules/xt_user.js

@@ -1,7 +1,14 @@
-import { verifyToken, modifyAdminInfo } from '@/api/login/login'
+import {
+  verifyToken,
+  modifyAdminInfo
+} from '@/api/login/login'
 // import { mapGetters } from 'vuex'
 // import { getToken, setToken, removeToken } from '@/utils/auth'
-import { getAdminUserInfoCache, cacheAdminUserInfo, removeAdminUserInfoCache } from '@/utils/admin_info_cache'
+import {
+  getAdminUserInfoCache,
+  cacheAdminUserInfo,
+  removeAdminUserInfoCache
+} from '@/utils/admin_info_cache'
 
 const xt_user = {
   state: {
@@ -33,9 +40,13 @@ const xt_user = {
       period_start: 0,
       period_end: 0,
       state: 2, // 1正版（标准） 2试用（免费） 3过期(或其他无效状态) 8 专业 9 永久，
-      patients:20, //患者数
+      patients: 20 // 患者数
     },
 
+    scrm_role_exist: false,
+    cdm_role_exist: false,
+    mall_role_exist: false,
+
     // 示例: ['', '',]
     urlfors: []
   },
@@ -68,6 +79,10 @@ const xt_user = {
       state.subscibe.period_start = cur_info.subscibe.period_start
       state.subscibe.period_end = cur_info.subscibe.period_end
       state.subscibe.state = cur_info.subscibe.state
+
+      state.scrm_role_exist = cur_info.scrm_role_exist
+      state.cdm_role_exist = cur_info.cdm_role_exist
+      state.mall_role_exist = cur_info.mall_role_exist
     },
 
     SET_URLFORS: (state, payload) => {
@@ -79,8 +94,8 @@ const xt_user = {
       state.user.avatar = payload.avatar
     },
 
-    SET_SUBSCIBE_PATIENT:(state)=>{
-      state.subscibe.patients += 1;
+    SET_SUBSCIBE_PATIENT: (state) => {
+      state.subscibe.patients += 1
     },
     CLEAR_USER_INFO: (state) => {
       state.org_id = 0
@@ -110,6 +125,10 @@ const xt_user = {
       state.subscibe.state = 3
       state.subscibe.patients = 0
 
+      state.scrm_role_exist = false
+      state.cdm_role_exist = false
+      state.mall_role_exist = false
+
       state.urlfors = []
     }
   },
@@ -121,11 +140,17 @@ const xt_user = {
   },
 
   actions: {
-    SetSubscibePatients({ commit, state }) {
-      commit('SET_SUBSCIBE_PATIENT');
+    SetSubscibePatients({
+      commit,
+      state
+    }) {
+      commit('SET_SUBSCIBE_PATIENT')
     },
 
-    VerifyToken({ commit, state }, token) {
+    VerifyToken({
+      commit,
+      state
+    }, token) {
       // console.log('验证 token 之前：token = ' + token)
       return new Promise((resolve, reject) => {
         var cacheInfo = getAdminUserInfoCache()
@@ -139,6 +164,9 @@ const xt_user = {
             cur_app_id: infoJSON.current_app_id,
             org: infoJSON.org,
             subscibe: infoJSON.subscibe,
+            scrm_role_exist: infoJSON.scrm_role_exist,
+            cdm_role_exist: infoJSON.cdm_role_exist,
+            mall_role_exist: infoJSON.mall_role_exist
           })
 
           commit('SET_URLFORS', {
@@ -149,14 +177,17 @@ const xt_user = {
           verifyToken(token).then(response => {
             if (response.data.state === 1) {
               // alert('验证通过')
-              console.log('验证通过')
+              // console.log('验证通过')
               var data = response.data.data
               this.commit('SET_CURRENT_INFO', {
                 user: data.user,
                 cur_org_id: data.current_org_id,
                 cur_app_id: data.current_app_id,
                 org: data.org,
-                subscibe: data.subscibe
+                subscibe: data.subscibe,
+                scrm_role_exist: data.scrm_role_exist,
+                cdm_role_exist: data.cdm_role_exist,
+                mall_role_exist: data.mall_role_exist
               })
 
               this.commit('SET_URLFORS', {
@@ -168,22 +199,34 @@ const xt_user = {
               resolve(data.user.id)
             } else {
               alert('请求失败：' + response.data.msg)
-              reject({ msg: response.data.msg, code: response.data.code })
+              reject({
+                msg: response.data.msg,
+                code: response.data.code
+              })
             }
           })
         }
       })
     },
-    ModifyAdminUserInfo({ commit, state }, params) {
-      commit('MODIFY_USER_INFO', { user_name: params.user_name, avatar: params.avatar })
+    ModifyAdminUserInfo({
+      commit,
+      state
+    }, params) {
+      commit('MODIFY_USER_INFO', {
+        user_name: params.user_name,
+        avatar: params.avatar
+      })
       cacheAdminUserInfo(
-        JSON.stringify({ 
-          user: state.user, 
-          org: state.org, 
-          current_org_id: state.org_id, 
-          current_app_id: state.app_id, 
+        JSON.stringify({
+          user: state.user,
+          org: state.org,
+          current_org_id: state.org_id,
+          current_app_id: state.app_id,
           urlfors: state.urlfors,
           subscibe: state.subscibe,
+          scrm_role_exist: state.scrm_role_exist,
+          cdm_role_exist: state.cdm_role_exist,
+          mall_role_exist: state.mall_role_exist
         })
       )
     },
@@ -207,7 +250,9 @@ const xt_user = {
     //   }
     // }
     // 登出
-    FrontendLogout({ commit }) {
+    FrontendLogout({
+      commit
+    }) {
       commit('CLEAR_USER_INFO')
       removeAdminUserInfoCache()
     }

src/views/layout/components/Navbar.vue

@@ -9,33 +9,29 @@
         </span>
       </div>
       <div class="system-nav">
-        <div class="system-nav-menu">
-          <a  href="http://jk.kuyicloud.com/">
-          <!-- <a href="http://test1.sgjyun.com/"> -->
-            <span><i class="iconfont icon-pengyou"></i> SCRM</span>
-          </a>
-        </div>
-        <div class="system-nav-menu">
-          <a href="http://mall.kuyicloud.com/">
-          <!-- <a href="http://mall.test.sgjyun.com/"> -->
-            <span><i class="icon iconfont icon-service_fill"></i> 微商城</span>
-          </a>
-        </div>
         <div class="system-nav-menu active">
           <a>
             <span><i class="icon iconfont icon-jiankangshuidi"></i> 血透管理</span>
           </a>
         </div>
-        <div class="system-nav-menu">
-          <a href="http://cdm.kuyicloud.com/">
-          <!-- <a href=" http://cdm.test.sgjyun.com/"> -->
+        <div class="system-nav-menu" v-if="this.$store.getters.xt_user.cdm_role_exist">
+          <a :href="CDMWebsit()">
             <span><i class="icon iconfont icon-manbing-xuanzhong"></i> 慢病管理</span>
           </a>
         </div>
+        <div class="system-nav-menu" v-if="this.$store.getters.xt_user.scrm_role_exist">
+          <a :href="SCRMWebsit()">
+            <span><i class="iconfont icon-pengyou"></i> SCRM</span>
+          </a>
+        </div>
+        <div class="system-nav-menu" v-if="this.$store.getters.xt_user.mall_role_exist">
+          <a :href="MircoMallWebsit()">
+            <span><i class="icon iconfont icon-service_fill"></i> 微商城</span>
+          </a>
+        </div>
 
         <div class="system-nav-menu">
-          <a href="http://sso.kuyicloud.com/org/app/create">
-          <!-- <a href="http://testsso.sgjyun.com/org/app/create"> -->
+          <a :href="APPManageWebsit()">
             <span><i class="icon iconfont icon-suoyou"></i> 应用</span>
           </a>
         </div>
@@ -86,7 +82,7 @@
   export default {
     data() {
       return {
-        orgname: ''
+        // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
       }
     },
     components: {
@@ -135,13 +131,21 @@
       myServe() {
         this.$router.push('/service')
         return false
+      },
+      SCRMWebsit() {
+        return process.env.SCRM_HOST
+      },
+      MircoMallWebsit() {
+        return process.env.MIRCO_MALL_HOST
+      },
+      CDMWebsit() {
+        return process.env.CDM_HOST
+      },
+      APPManageWebsit() {
+        return process.env.SSO_HOST + '/org/admin/apps?org=' + this.$store.getters.xt_user.org_id
       }
     },
     created() {
-      var xtuser = this.$store.getters.xt_user
-      this.orgname = xtuser.org.org_name
-      console.log(this.orgname)
-
     }
   }
 </script>

src/views/layout/components/TagsView.vue

@@ -133,6 +133,10 @@ export default {
     z-index: 1000;
     top: 60px;
     overflow-x: scroll;
+    white-space: normal;
+    right: 0;
+    left: 150px;
+    
     /* 针对缺省样式 (必须的) */
       &::-webkit-scrollbar {
         width: 6px;
@@ -223,6 +227,11 @@ export default {
     }
   }
 }
+.scroll-wrapper{
+      right: 0;
+      position: fixed!important;
+      
+}
 </style>
 
 <style rel="stylesheet/scss" lang="scss">

src/xt_pages/data/components/tableson.vue

@@ -4,7 +4,7 @@
       <el-button style="float: right;" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row
-      style="width: 100%;">
+      >
       <el-table-column  align="center" label="名称">
         <template slot-scope="scope">
           <span @click="handleUpdate(scope.row)">{{scope.row.name}}</span>

src/xt_pages/data/index.vue

@@ -5,11 +5,13 @@
   </div>
   <div class="app-container">
     <el-tabs  v-model="activeName" >
-      <el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key" style="display:flex;">
+      <el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key" >
         <keep-alive>
-          <div style="display:flex;width:100%;">
-          <tab-pane v-if='activeName==item.key' :type='item.key' style="flex:1;"></tab-pane>
-          <tableson v-if='activeName==item.key' :type='item.key' style="flex:1;"></tableson>
+          <div >
+         <el-row :gutter="24">
+           <el-col :span="12"><tab-pane v-if='activeName==item.key' :type='item.key' ></tab-pane></el-col>
+           <el-col :span="12"><tableson v-if='activeName==item.key' :type='item.key' ></tableson></el-col>
+         </el-row>
           </div>
         </keep-alive>
       </el-tab-pane>

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -16,7 +16,6 @@
           highlight-current-row
           max-height="250"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-
           @current-change="goodTypeTableChange"
           style="width: 100%">
           <el-table-column
@@ -93,29 +92,63 @@
     methods: {
       hide:function(){
         this.visibility = false
+        this.goodInfoTableData = []
+
       },
       show:function(){
         this.visibility = true
       },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
         this.currentGoodTypeId = currentRow.id
-
         this.goodInfoTableData = []
         this.goodInfo = []
+        console.log(this.propForm.manufacturer)
+        console.log(this.propForm.dealer)
+        console.log(this.propForm.goodInfo)
+
+
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.currentGoodTypeId == this.propForm.goodInfo[i].good_type_id) {
-            this.goodInfo.push(this.propForm.goodInfo[i])
-            this.goodInfoTableData.push(this.propForm.goodInfo[i])
+            if(this.propForm.dealer == 0 && this.propForm.manufacturer == 0){
+              this.goodInfo.push(this.propForm.goodInfo[i])
+              this.goodInfoTableData.push(this.propForm.goodInfo[i])
+
+            }else{
+              if(this.propForm.manufacturer == 0 && this.propForm.dealer != 0){
+                if(this.propForm.goodInfo[i].dealers.id == this.propForm.dealer){
+                  this.goodInfo.push(this.propForm.goodInfo[i])
+                  this.goodInfoTableData.push(this.propForm.goodInfo[i])
+                }
+              }
+              if(this.propForm.manufacturer != 0 && this.propForm.dealer == 0){
+                if(this.propForm.goodInfo[i].manufacturers.id == this.propForm.manufacturer){
+                  this.goodInfo.push(this.propForm.goodInfo[i])
+                  this.goodInfoTableData.push(this.propForm.goodInfo[i])
+                }
+              }
+              if(this.propForm.manufacturer != 0 && this.propForm.dealer != 0){
+                if(this.propForm.goodInfo[i].manufacturers.id == this.propForm.manufacturer && this.propForm.goodInfo[i].dealers.id == this.propForm.dealer){
+                  this.goodInfo.push(this.propForm.goodInfo[i])
+                  this.goodInfoTableData.push(this.propForm.goodInfo[i])
+                }
+              }
+            }
           }
         }
       },
       cancle: function() {
         this.$emit('dialog-cancle', this.getValue())
         this.$refs.multipleTable.clearSelection()
+        this.$refs.templatetable.setCurrentRow(null);
+        this.goodInfoTableData = []
+
       },
       comfirm: function() {
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
+        this.$refs.templatetable.setCurrentRow(null);
+        this.goodInfoTableData = []
+
       },
       getValue: function() {
         const obj = {
@@ -126,11 +159,10 @@
       }, goodTypeSelect: function(id) {
         this.tempGoodInfo = []
         this.goodInfo = []
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].good_type_id == id) {
-            this.tempGoodInfo.push(this.propForm.goodInfo[i])
-          }
-        }
+        console.log(this.propForm.manufacturer )
+        console.log(this.propForm.dealers )
+
+
       }, goodInfoSelect: function(id) {
         let index = 0
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -59,6 +59,16 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            align="center"
+            label="单价"
+            property="buy_price"
+          >
+            <template slot-scope="scope">
+              <span>{{scope.row.buy_price}}</span>
+            </template>
+          </el-table-column>
+
         </el-table>
       </el-col>
     </el-row>
@@ -85,19 +95,19 @@
         multipleSelection: [],
         currentGoodTypeId: 0,
         isClose: false,
-        visibility: false,
+        visibility: false
       }
     },
     props: {
       propForm: {
         type: Object
-      },
+      }
     },
     methods: {
-      hide:function(){
+      hide: function() {
         this.visibility = false
       },
-      show:function(){
+      show: function() {
         this.visibility = true
       },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
@@ -124,16 +134,14 @@
         this.goodInfoTableData = []
         this.$emit('dialog-cancle', this.getValue())
         this.$refs.multipleTable.clearSelection()
-        this.$refs.templatetable.setCurrentRow(null);
-
+        this.$refs.templatetable.setCurrentRow(null)
       },
       comfirm: function(formName) {
         this.goodInfo = []
         this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
-        this.$refs.templatetable.setCurrentRow(null);
-
+        this.$refs.templatetable.setCurrentRow(null)
       },
       getValue: function() {
         const obj = {
@@ -186,7 +194,7 @@
         this.multipleSelection = val
       }, changeAllGoodInfoTableData: function(val) {
         this.multipleSelection = val
-      },clickRow:function(row) {
+      }, clickRow: function(row) {
         this.$refs.multipleTable.toggleRowSelection(row)
       }
     }

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
         <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
@@ -25,9 +27,22 @@
                           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  size="small"   v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select   size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商"  @change="changeDealer">
+          <el-option
+            v-for="(option, index) in dealer"
+            :key="index"
+            :label="option.dealer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+          <label class="title"><span class="name">厂商</span> : </label>
+          <el-select  size="small"   v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer">
             <el-option
               v-for="(option, index) in manufacturer"
               :key="index"
@@ -37,17 +52,6 @@
           </el-select>
         </div>
 
-        <div class="cell clearfix">
-          <label class="title"><span class="name">经销商</span> : </label>
-          <el-select   size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商" >
-            <el-option
-              v-for="(option, index) in dealer"
-              :key="index"
-              :label="option.dealer_name"
-              :value="option.id">
-            </el-option>
-          </el-select>
-        </div>
 
 
     </div>
@@ -142,7 +146,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '退库单' },
+          { path: false, name: '耗材退库单' },
+          { path: false, name: '新增退库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退库单' },
           { path: false, name: '新增退库单' }
         ],
 
@@ -169,11 +178,13 @@
         propForm: {
           goodType: [],
           goodInfo: [],
-          goodUnit: []
+          goodUnit: [],
+          manufacturer: 0,
+          dealer: 0
         },
         form: {
-          manufacturer: '',
-          dealer: ''
+          manufacturer: 0,
+          dealer: 0
         },
         warehouseOutInfoList:[],
         manufacturer: [],
@@ -199,37 +210,53 @@
           }
         }
 
+        this.propForm.goodType = []
+
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
+        this.propForm.goodType = []
+
       }, GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
         const params = {
           type: this.$route.query.type
         }
         getCancelStockConfig(params).then(response => {
           if (response.data.state == 0) {
+            loading.close()
             this.$message.error(response.data.msg)
             return false
           } else {
-            var warehouseOutList = response.data.data.warehouseOutList
+            loading.close()
             var warehouseOutInfoList = response.data.data.warehouseOutInfoList
             this.warehouseOutInfoList = response.data.data.warehouseOutInfoList
-
-            for (let i = 0; i < warehouseOutList.length; i++) {
-              if (warehouseOutList[i].Manufacturer.id > 0) {
-                this.manufacturer.push(warehouseOutList[i].Manufacturer)
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              if (warehouseOutInfoList[i].info.manufacturers.id > 0) {
+                this.manufacturer.push(warehouseOutInfoList[i].info.manufacturers)
               }
-              if (warehouseOutList[i].Dealer.id > 0) {
-                this.dealer.push(warehouseOutList[i].Dealer)
+              if (warehouseOutInfoList[i].info.dealers.id > 0) {
+                this.dealer.push(warehouseOutInfoList[i].info.dealers)
               }
             }
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              this.goodType.push(warehouseOutInfoList[i].info.type)
+            }
+
 
             for (let i = 0; i < warehouseOutInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
+              this.propForm.goodInfo.push(warehouseOutInfoList[i].info)
             }
 
             const obj = {}
             const obj2 = {}
+            const obj3 = {}
             const obj4 = {}
             // 去重复
             this.manufacturer = this.manufacturer.reduce((cur, next) => {
@@ -241,17 +268,27 @@
               obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
               return cur
             }, [])
+            this.goodType = this.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
             this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
+
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+            this.form.manufacturer =0
+            this.form.dealer = 0
+
           }
         })
       }, typeName: function(good_type_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
           }
         }
         return name
@@ -289,10 +326,57 @@
           return ''
         }
       }, showDialog(index, row) {
+        this.currentIndex = index
+        this.propForm.goodType = []
+
+
+        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+
+        } else {
+          if(this.form.manufacturer == 0 && this.form.dealer != 0){
+            for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+              if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer){
+                this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              }
+            }
+          }
+          if(this.form.manufacturer != 0 && this.form.dealer == 0){
+            for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+              if(this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
+                this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              }
+            }
+          }
+          if(this.form.manufacturer != 0 && this.form.dealer != 0){
+            for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+              if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer && this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
+                this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              }
+            }
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+        }
+
+
+
+        this.$refs.dialog.show()
+
+
         this.currentIndex = index
         if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
+
         } else {
           this.$refs.dialog.show()
 
@@ -351,13 +435,10 @@
             return false
           }
         })
-      }, changeManufacturer() {
-        this.recordInfo.recordData = []
-        const tempObj = {}
-        tempObj['good_type_id'] = 0
-        tempObj['good_id'] = 0
-        tempObj['return_count'] = ''
-        this.recordInfo.recordData.push(tempObj)
+      }, changeManufacturer(val) {
+        this.propForm.manufacturer = val
+      },changeDealer(val){
+        this.propForm.dealer = val
       }
     },
     created() {

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
     </div>
   <div class="app-container">
 
@@ -82,7 +85,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '退库单' },
+          { path: false, name: '耗材退库单' },
+          { path: false, name: '退库单详情' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退库单' },
           { path: false, name: '退库单详情' }
         ],
         isEdit: 0,

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
         <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
@@ -21,6 +22,35 @@
                         value-format="yyyy-MM-dd"></el-date-picker>
       </div>
 
+      <div class="cell clearfix">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select   size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商"  @change="changeDealer">
+          <el-option
+            v-for="(option, index) in dealer"
+            :key="index"
+            :label="option.dealer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">厂商</span> : </label>
+        <el-select  size="small"   v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer">
+          <el-option
+            v-for="(option, index) in manufacturer"
+            :key="index"
+            :label="option.manufacturer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+
+
+
+
+
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
@@ -117,9 +147,17 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '退库单' },
+          { path: false, name: '耗材退库单' },
+          { path: false, name: '编辑退库单' }
+        ],
+
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退库单' },
           { path: false, name: '编辑退库单' }
         ],
+
+
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehousing_time: '',
         adminUserOptions: null,
@@ -191,35 +229,75 @@
         const params = {
           type: this.$route.query.type
         }
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         getCancelStockConfig(params).then(response => {
+
           if (response.data.state == 0) {
+            loading.close()
             this.$message.error(response.data.msg)
             return false
           } else {
+            loading.close()
             var warehouseOutInfoList = response.data.data.warehouseOutInfoList
             this.warehouseOutInfoList = response.data.data.warehouseOutInfoList
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              if (warehouseOutInfoList[i].info.manufacturers.id > 0) {
+                this.manufacturer.push(warehouseOutInfoList[i].info.manufacturers)
+              }
+              if (warehouseOutInfoList[i].info.dealers.id > 0) {
+                this.dealer.push(warehouseOutInfoList[i].info.dealers)
+              }
+            }
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              this.goodType.push(warehouseOutInfoList[i].info.type)
+            }
+
 
             for (let i = 0; i < warehouseOutInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
-              this.propForm.goodType.push(warehouseOutInfoList[i].GoodInfo.GoodsType)
+              this.propForm.goodInfo.push(warehouseOutInfoList[i].info)
             }
+
+            const obj = {}
+            const obj2 = {}
             const obj3 = {}
             const obj4 = {}
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+            // 去重复
+            this.manufacturer = this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
               return cur
             }, [])
-            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            // 去重复
+            this.dealer = this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.goodType = this.goodType.reduce((cur, next) => {
               obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
               return cur
             }, [])
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+
+
+            console.log(this.goodType)
+
           }
         })
       }, typeName: function(good_type_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
           }
         }
         return name
@@ -301,7 +379,7 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
+            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -342,6 +420,10 @@
             this.recordInfo.recordData.push(tempObj)
           }
         })
+      },changeManufacturer(val) {
+        this.propForm.manufacturer = val
+      },changeDealer(val){
+        this.propForm.dealer = val
       }
     },
     created() {

src/xt_pages/stock/config/goodInfo.vue

@@ -33,28 +33,28 @@
           </el-table-column>
 
 
+          <el-table-column label="进价"  align="center" >
+            <template slot-scope="scope" v-if="scope.row.buy_price">
 
-          <el-table-column label="进价"  align="center">
-            <template slot-scope="scope">
               {{scope.row.buy_price}}
 
             </template>
           </el-table-column>
-          <el-table-column label="出货价"  align="center">
-            <template slot-scope="scope">
+          <el-table-column label="出货价"  align="center" >
+            <template slot-scope="scope" v-if="scope.row.sell_price">
               {{scope.row.sell_price}}
             </template>
           </el-table-column>
-          <el-table-column label="有效期预警"  align="center">
-            <template slot-scope="scope">
-              {{scope.row.expiry_date_warn_day_count}}
-            </template>
-          </el-table-column>
-          <el-table-column label="库存预警" align="center">
-            <template slot-scope="scope">
-              {{scope.row.stock_warn_count}}
-            </template>
-          </el-table-column>
+          <!--<el-table-column label="有效期预警"  align="center">-->
+            <!--<template slot-scope="scope" v-if="scope.row.expiry_date_warn_day_count">-->
+              <!--{{scope.row.expiry_date_warn_day_count}}-->
+            <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="库存预警" align="center">-->
+            <!--<template slot-scope="scope" v-if="scope.row.stock_warn_count">-->
+              <!--{{scope.row.stock_warn_count}}-->
+            <!--</template>-->
+          <!--</el-table-column>-->
           <el-table-column label="操作" align="center" >
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -320,7 +320,6 @@
         });
 
       }, goodInfoDialogComfirm: function (val) {
-        this.$refs.dialog.hide()
 
         if (val.isCreated == 2) { //修改
           val['id'] = this.goodInfo.editGoodId
@@ -331,6 +330,8 @@
               this.$message.error(response.data.msg);
               return false;
             } else {
+              this.$refs.dialog.hide()
+
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].specification_name = response.data.data.goodInfo.specification_name
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit = response.data.data.goodInfo.good_unit
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].buy_price = response.data.data.goodInfo.buy_price.toString()
@@ -350,6 +351,8 @@
               this.$message.error(response.data.msg);
               return false;
             } else {
+              this.$refs.dialog.hide()
+
               this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
 
               this.$message.success("新增成功")

src/xt_pages/stock/config/goodType.vue

@@ -259,7 +259,6 @@ export default {
     },
 
     goodTypeDialogComfirm: function(val) {
-      this.$refs.dialog.hide();
 
       if (val.isCreated == 2) {
         //修改
@@ -275,6 +274,8 @@ export default {
             this.$message.error(response.data.msg);
             return false;
           } else {
+            this.$refs.dialog.hide();
+
             this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name =
               response.data.data.goodTypes.type_name;
             this.goodType.goodTypeData[this.goodType.editTypeIndex].remark =
@@ -290,8 +291,8 @@ export default {
             this.$message.error(response.data.msg);
             return false;
           } else {
+            this.$refs.dialog.hide();
             this.goodType.goodTypeData.unshift(response.data.data.goodTypes);
-
             this.$message.success("新增成功");
           }
         });
@@ -301,6 +302,7 @@ export default {
       this.$refs.dialog.hide();
     },
     showDialog: function() {
+      this.goodType.goodTypeDialog.isCreated = 1;
       this.$refs.dialog.show();
     },
     getList() {

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
       <div class="cell clearfix" >
-        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <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>
 
@@ -58,13 +58,20 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品" align="center">
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{typeName(scope.row.good_type_id)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="规格名称" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>
           </el-table-column>
 
 
+
           <el-table-column label="单据类型" align="center">
             <template slot-scope="scope">
               {{getTypeName(scope.row)}}
@@ -187,6 +194,14 @@
           name = '其他退库单'
         }
 
+        return name
+      },   typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
         return name
       },
       specificationName: function(good_info_id) {
@@ -301,6 +316,8 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+
           }
         })
       }, getManufactuerName: function(manufacturer_id) {

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
       <div class="cell clearfix" >
-        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <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>
 
@@ -61,7 +61,13 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品" align="center">
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{typeName(scope.row.good_type_id)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="规格名称" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>
@@ -189,6 +195,14 @@
           name = '其他退货单'
         }
 
+        return name
+      },   typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
         return name
       },
       specificationName: function(good_info_id) {
@@ -303,6 +317,8 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+
           }
         })
       }, getManufactuerName: function(manufacturer_id) {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
       <div class="cell clearfix">
-        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <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>
 
@@ -58,7 +58,13 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品" align="center">
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{typeName(scope.row.good_type_id)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="规格名称" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>
@@ -198,6 +204,14 @@
           name = '其他入库单'
         }
 
+        return name
+      },   typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
         return name
       },
       specificationName: function(good_info_id) {
@@ -312,6 +326,8 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+
           }
         })
       }, getManufactuerName: function(manufacturer_id) {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
       <div class="cell clearfix" >
-        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <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>
 
@@ -62,7 +62,13 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品" align="center">
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{typeName(scope.row.good_type_id)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="规格名称" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>
@@ -212,6 +218,15 @@
         }
         return name
       },
+      typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      },
       search: function() {
         const Params = {
           page: this.page,
@@ -315,6 +330,8 @@
             this.manufacturer = response.data.data.manufacturer
             this.dealer = response.data.data.dealer
             this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+
           }
         })
       }, getManufactuerName: function(manufacturer_id) {

src/xt_pages/stock/salesReturnEdit.vue

@@ -22,7 +22,37 @@
                             value-format="yyyy-MM-dd"></el-date-picker>
     </div>
 
-        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">经销商</span> : </label>
+      <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+        <el-option
+          v-for="(option, index) in dealer"
+          :key="index"
+          :label="option.dealer_name"
+          :value="option.id">
+        </el-option>
+      </el-select>
+    </div>
+
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">厂商</span> : </label>
+
+      <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+        <el-option
+          v-for="(option, index) in manufacturer"
+          :key="index"
+          :label="option.manufacturer_name"
+          :value="option.id">
+        </el-option>
+      </el-select>
+    </div>
+
+
+
+
+    <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
           <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
                     max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
@@ -143,12 +173,7 @@
           ]
 
         },
-        ruleForm: {
-          manufacturer: [
-            { required: true, message: '请选择厂商', trigger: 'change' }
-          ]
 
-        },
 
         // prop
         isVisibility: false,
@@ -156,12 +181,14 @@
           goodType: [],
           goodInfo: [],
           goodUnit: [],
-          title: '入库'
+          title: '入库',
+          manufacturer:0,
+          dealer:0,
         },
 
         form: {
-          manufacturer: '',
-          dealer: ''
+          manufacturer: 0,
+          dealer: 0,
         },
         warehouseInfoList:[],
         salesReturn: {},
@@ -189,45 +216,91 @@
             }
           }
         }
-
+        this.propForm.goodType = []
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
+        this.propForm.goodType = []
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
 
         }
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         getSalesReturnConfig(params).then(response => {
           if (response.data.state == 0) {
+            loading.close()
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            loading.close()
+
             var warehouseInfoList = response.data.data.warehouseInfoList
             this.warehouseInfoList = response.data.data.warehouseInfoList
             for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-              this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
+              if (warehouseInfoList[i].info.manufacturers.id > 0) {
+                this.manufacturer.push(warehouseInfoList[i].info.manufacturers)
+              }
+              if (warehouseInfoList[i].info.dealers.id > 0) {
+                this.dealer.push(warehouseInfoList[i].info.dealers)
+              }
+            }
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.goodType.push(this.warehouseInfoList[i].info.type)
             }
+
+
+            const obj = {}
+            const obj2 = {}
             const obj3 = {}
+
             const obj4 = {}
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+
+            // 去重复
+            this.manufacturer = this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            // 去重复
+            this.dealer = this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
               return cur
             }, [])
-            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+
+            this.goodType = this.goodType.reduce((cur, next) => {
               obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
               return cur
             }, [])
-            console.log(this.propForm.goodInfo)
-            console.log(this.propForm.goodType)
+
+
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+
+
           }
         })
       }, typeName: function(good_type_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
           }
         }
         return name
@@ -278,17 +351,58 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-        this.$refs.dialog.show()
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
+        this.propForm.goodType = []
+
+
+        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
           }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+        } else {
+
+
+          if(this.form.manufacturer == 0 && this.form.dealer != 0){
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer){
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+          }
+          if(this.form.manufacturer != 0 && this.form.dealer == 0){
+            console.log(this.warehouseInfoList)
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if(this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+
+          }
+          if(this.form.manufacturer != 0 && this.form.dealer != 0){
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
         }
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
+        this.$refs.dialog.show()
+
+
+
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -309,7 +423,7 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -351,6 +465,12 @@
             this.recordInfo.recordData.push(tempObj)
           }
         })
+      },changeManufacturer(val) {
+        this.propForm.manufacturer = val
+        console.log(val)
+      },changeDealer(val){
+        this.propForm.dealer = val
+        console.log(val)
       }
     },
     created() {

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
+
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
         <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
@@ -20,32 +23,33 @@
                         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 size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
           <el-option
-            v-for="(option, index) in manufacturer"
+            v-for="(option, index) in dealer"
             :key="index"
-            :label="option.manufacturer_name"
+            :label="option.dealer_name"
             :value="option.id">
           </el-option>
         </el-select>
       </div>
 
       <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商">
+        <label class="title"><span class="name">厂商</span> : </label>
+
+        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
           <el-option
-            v-for="(option, index) in dealer"
+            v-for="(option, index) in manufacturer"
             :key="index"
-            :label="option.dealer_name"
+            :label="option.manufacturer_name"
             :value="option.id">
           </el-option>
         </el-select>
       </div>
 
+
+
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
                   max-height="450"  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
@@ -91,9 +95,6 @@
               <span>退货数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--{{scope.row.warehousing_count}}-->
-              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-
               <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count'
                             style="padding-top: 17px">
                 <el-input  placeholder="请输入退货数量" type="number" v-model="scope.row.return_count"></el-input>
@@ -148,10 +149,16 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '退回单' },
+          { path: false, name: '耗材退货单' },
+          { path: false, name: '新增退货单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退货单' },
           { path: false, name: '新增退货单' }
         ],
 
+
         type: this.$route.query.type,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
@@ -167,22 +174,21 @@
             { required: true, message: '数量不能为空', trigge: 'blur' }
           ]
         },
-        ruleForm: {
-          manufacturer: [
-            { required: true, message: '请选择厂商', trigger: 'change' }
-          ]
 
-        },
+
+
         // prop
         isVisibility: false,
         propForm: {
           goodType: [],
           goodInfo: [],
-          goodUnit: []
+          goodUnit: [],
+          manufacturer:0,
+          dealer:0,
         },
         form: {
-          manufacturer: '',
-          dealer: ''
+          manufacturer: 0,
+          dealer: 0,
         },
         warehouseInfoList:[],
         manufacturer: [],
@@ -193,7 +199,6 @@
     methods: {
       comfirm: function(val) {
         this.$refs.dialog.hide()
-
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -209,38 +214,51 @@
             }
           }
         }
-
+        this.propForm.goodType = []
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
+        this.propForm.goodType = []
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.type
         }
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
         getSalesReturnConfig(params).then(response => {
           if (response.data.state == 0) {
+            loading.close()
+
             this.$message.error(response.data.msg)
             return false
           } else {
-            var warehouseList = response.data.data.warehouseList
+            loading.close()
             var warehouseInfoList = response.data.data.warehouseInfoList
-            this.warehouseInfoList =  response.data.data.warehouseInfoList
-
-            for (let i = 0; i < warehouseList.length; i++) {
-              if (warehouseList[i].Manufacturer.id > 0) {
-                this.manufacturer.push(warehouseList[i].Manufacturer)
+            this.warehouseInfoList = response.data.data.warehouseInfoList
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              if (warehouseInfoList[i].info.manufacturers.id > 0) {
+                this.manufacturer.push(warehouseInfoList[i].info.manufacturers)
               }
-              if (warehouseList[i].Dealer.id > 0) {
-                this.dealer.push(warehouseList[i].Dealer)
+              if (warehouseInfoList[i].info.dealers.id > 0) {
+                this.dealer.push(warehouseInfoList[i].info.dealers)
               }
             }
 
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.goodType.push(this.warehouseInfoList[i].info.type)
             }
-
             const obj = {}
             const obj2 = {}
+            const obj3 = {}
             const obj4 = {}
             // 去重复
             this.manufacturer = this.manufacturer.reduce((cur, next) => {
@@ -252,18 +270,27 @@
               obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
               return cur
             }, [])
+
+            this.goodType = this.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
             this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+
 
           }
         })
       }, typeName: function(good_type_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
           }
         }
         return name
@@ -303,16 +330,46 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.$refs.dialog.show()
+        this.propForm.goodType = []
 
+        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+        } else {
+
+
+          if(this.form.manufacturer == 0 && this.form.dealer != 0){
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer){
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+          }
+          if(this.form.manufacturer != 0 && this.form.dealer == 0){
+            console.log(this.warehouseInfoList)
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if(this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+
+          }
+          if(this.form.manufacturer != 0 && this.form.dealer != 0){
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if(this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer){
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
             }
+
           }
           const obj3 = {}
           this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -320,15 +377,12 @@
             return cur
           }, [])
         }
+        this.$refs.dialog.show()
       }, back() {
         this.$router.go(-1)
       }, submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
-            if (this.form.manufacturer == 0) {
-              this.$message.error('厂商不能为空')
-              return
-            }
             const array = this.recordInfo.recordData
             let total = 0
             for (let i = 0; i < array.length; i++) {
@@ -360,14 +414,12 @@
             return false
           }
         })
-      }, changeManufacturer() {
-        this.recordInfo.recordData = []
-        const tempObj = {}
-        tempObj['good_type_id'] = 0
-        tempObj['good_id'] = 0
-        tempObj['return_count'] = ''
-        tempObj['price'] = ''
-        this.recordInfo.recordData.push(tempObj)
+      }, changeManufacturer(val) {
+        this.propForm.manufacturer = val
+        console.log(val)
+      },changeDealer(val){
+        this.propForm.dealer = val
+        console.log(val)
       }
     },
     created() {

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
     </div>
 
     <div class="app-container">
@@ -82,7 +83,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '退货单' },
+          { path: false, name: '耗材退货单' },
+          { path: false, name: '退货单详情' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退货单' },
           { path: false, name: '退货单详情' }
         ],
         isEdit: 0,

src/xt_pages/stock/stockInOrderAdd.vue

@@ -2,7 +2,9 @@
 
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="type == 2" :crumbs='crumbs2'></bread-crumb>
+
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
         <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
@@ -27,7 +29,7 @@
         <label class="title"><span class="name">厂商</span> : </label>
 
         <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
-                   @change="changeManufacturer()">
+                   @change="changeManufacturer">
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -39,7 +41,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商">
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
           <el-option
             v-for="(option, index) in dealer"
             :key="index"
@@ -124,13 +126,10 @@
 
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
-              <span>批号<span style="color: red">*</span></span>
+              <span>批号</span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input  v-model="scope.row.numbers"></el-input>-->
-
-              <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
-                            style="padding-top: 17px">
+              <el-form-item style="padding-top: 17px">
                 <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
               </el-form-item>
 
@@ -160,10 +159,15 @@
             </template>
           </el-table-column>
 
+
           <el-table-column label="操作" align="center" fixed="right" width="150">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
+
+
+
+
                 <el-button
                   size="mini"
                   type="primary"
@@ -181,13 +185,21 @@
                 </el-button>
               </el-tooltip>
 
+
             </template>
           </el-table-column>
 
+
+
+
+
+
         </el-table>
       </el-form>
 
 
+
+
     </div>
   </div>
 
@@ -225,7 +237,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '入库单' },
+          { path: false, name: '耗材入库单' },
+          { path: false, name: '新增入库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他入库单' },
           { path: false, name: '新增入库单' }
         ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
@@ -246,9 +263,7 @@
           warehousing_count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
           ],
-          number: [
-            { required: true, message: '批号不能为空', trigge: 'blur' }
-          ],
+
           good_id: [
             { validator: checkGoodId, trigger: 'blur' }
           ]
@@ -340,11 +355,14 @@
       }, comfirm: function(val) {
         this.propForm.goodType = []
         this.$refs.dialog.hide()
+        console.log(val)
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
+
             } else {
               const tempForm = {}
               tempForm['good_type_id'] = val.goodTypeId
@@ -353,7 +371,7 @@
               tempForm['product_date'] = ''
               tempForm['expiry_date'] = ''
               tempForm['warehousing_count'] = ''
-              tempForm['price'] = ''
+              tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
@@ -409,10 +427,12 @@
             this.goodInfo = response.data.data.goodInfo
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
-            loading.close()
-
+            this.form.manufacturer = 0
+            this.form.dealer = 0
 
           }
+          loading.close()
+
         })
       }, typeName: function(good_type_id) {
         let name = ''
@@ -490,11 +510,13 @@
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
+              loading.close()
+
             } else {
               loading.close()
-              console.log(response.data.data.goodInfo)
-              if(response.data.data.goodInfo.length <= 0){
-                this.$message.error("该厂商或经销商没有物品信息")
+
+              if (response.data.data.goodInfo.length <= 0) {
+                this.$message.error('该厂商或经销商没有物品信息')
                 return
               }
               this.$refs.dialog.show()
@@ -508,49 +530,50 @@
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
             }
 
+
           }
         )
-    },
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '总价'
-          return
-        }
-        const values = data.map(item => Number(item[column.property]))
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ' 元'
-        } else {
-          sums[index] = 'N/A'
-        }
-      })
+      },
+      getSummaries(param) {
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总价'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        })
+
+        return sums
+      }
+      ,
+      back() {
+        this.$router.go(-1)
+      }
+      ,
+      submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+
+
+
+
+
 
-      return sums
-    }
-    ,
-    back() {
-      this.$router.go(-1)
-    }
-    ,
-    submit() {
-      this.$refs['tableForm'].validate((valid) => {
-        if (valid) {
-          const array = this.recordInfo.recordData
-          for (let i = 0; i < array.length; i++) {
-            if (array[i].good_type_id == 0) {
-              this.$message.error('商品类型不能为空')
-              return
-            }
             if (array[i].good_id == 0) {
               this.$message.error('规格名称不能为空')
               return
@@ -569,15 +592,41 @@
 
               this.$router.back(-1)
             }
-          })
-        } else {
-          return false
-        }
-      })
+            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('入库成功')
+
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }
+      ,
+      changeManufacturer(val) {
+
+
+      }, changeDealer(val) {
+
+      }
     }
     ,
-    changeManufacturer() {
-      this.recordInfo.recordData = []
+    created() {
+      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)
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/stockInOrderDetail.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
     </div>
   <div class="app-container">
     <div class="filter-container">
@@ -122,7 +124,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '入库单' },
+          { path: false, name: '耗材入库单' },
+          { path: false, name: '入库单详情' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他入库单' },
           { path: false, name: '入库单详情' }
         ],
         isEdit: 0,

src/xt_pages/stock/stockInOrderEdit.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2"  :crumbs='crumbs2'></bread-crumb>
+
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
         <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
@@ -22,6 +24,35 @@
       <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> : </label>
+      <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商">
+        <el-option
+          v-for="(option, index) in dealer"
+          :key="index"
+          :label="option.dealer_name"
+          :value="option.id">
+        </el-option>
+      </el-select>
+    </div>
+
+
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">厂商</span> : </label>
+
+      <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
+                >
+        <el-option
+          v-for="(option, index) in manufacturer"
+          :key="index"
+          :label="option.manufacturer_name"
+          :value="option.id">
+        </el-option>
+      </el-select>
+    </div>
+
+
 
         <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
           <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
@@ -96,12 +127,10 @@
 
             <el-table-column align="center"  width="150">
               <template slot="header" slot-scope="scope">
-                <span>批号<span style="color: red">*</span></span>
+                <span>批号</span>
               </template>
               <template slot-scope="scope">
-                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
-                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
-                              style="padding-top: 17px">
+                <el-form-item>
                   <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
                 </el-form-item>
               </template>
@@ -195,7 +224,12 @@ export default {
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '入库单' },
+          { path: false, name: '耗材入库单' },
+          { path: false, name: '编辑入库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他入库单' },
           { path: false, name: '编辑入库单' }
         ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
@@ -216,20 +250,13 @@ export default {
           warehousing_count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
           ],
-          number: [
-            { required: true, message: '批号不能为空', trigge: 'blur' }
-          ],
+
           good_id: [
             { validator: checkGoodId, trigger: 'blur' }
           ]
 
         },
-        ruleForm: {
-          manufacturer: [
-            { required: true, message: '请选择厂商', trigger: 'change' }
-          ]
 
-        },
 
         total: '',
         product_date: '',
@@ -260,12 +287,15 @@ export default {
 
       comfirm: function(val) {
         this.$refs.dialog.hide()
+        this.propForm.goodType = []
 
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
+
             } else {
               const tempForm = {}
               tempForm['id'] = 0
@@ -275,7 +305,7 @@ export default {
               tempForm['product_date'] = ''
               tempForm['expiry_date'] = ''
               tempForm['warehousing_count'] = ''
-              tempForm['price'] = ''
+              tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
@@ -287,7 +317,15 @@ export default {
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
+        this.propForm.goodType = []
+
       }, GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         GetAllConfig().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -297,7 +335,11 @@ export default {
             this.dealer = response.data.data.dealer
             this.goodType = response.data.data.goodType
             this.goodInfo = response.data.data.goodInfo
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
           }
+          loading.close()
+
         })
       }, typeName: function(good_type_id) {
         let name = ''
@@ -367,25 +409,40 @@ export default {
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.isVisibility = true
-          const params = {
-            id: this.form.manufacturer
-          }
-          this.propForm.goodType = []
-          GetAllGoodInfoByID(params).then(response => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        }
+        GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
             } else {
-              this.propForm.goodType = this.goodType
+              if(response.data.data.goodInfo.length <= 0){
+                this.$message.error("该厂商或经销商没有物品信息")
+                return
+              }
               this.$refs.dialog.show()
+              for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+              }
+              const obj = {}
+              this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+                obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
             }
-          })
-        }
+            loading.close()
+
+          }
+        )
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -406,7 +463,7 @@ export default {
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -441,6 +498,7 @@ export default {
             this.warehouse = response.data.data.warehousing
             this.form.manufacturer = this.warehouse.manufacturer
             this.form.dealer = this.warehouse.dealer
+
             this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
 
             if (this.recordInfo.recordData.length == 0) {

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -2,161 +2,168 @@
 
   <div class="main-contain">
     <div class="position">
-    <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
+
       <div style="float:right;">
-        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
       </div>
-  </div>
+    </div>
 
-  <div class="app-container">
+    <div class="app-container">
 
-    <sales-return-dialog ref="dialog" :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+      <sales-return-dialog ref="dialog" :propForm="propForm"
+                           :visibility="isVisibility"
+                           v-on:dialog-comfirm="comfirm"
+                           v-on:dialog-cancle="cancle"></sales-return-dialog>
 
-    <div class="cell clearfix">
+      <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
-          <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>
-
-
-    <div class="cell clearfix">
-      <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
-
-      <el-select size="small"  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
-        <el-option
-          v-for="(option, index) in manufacturer"
-          :key="index"
-          :label="option.manufacturer_name"
-          :value="option.id">
-        </el-option>
-      </el-select>
-    </div>
+        <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>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">经销商</span> : </label>
-      <el-select size="small"  v-model="form.dealer" clearable  placeholder="请选择经销商" >
-        <el-option
-          v-for="(option, index) in dealer"
-          :key="index"
-          :label="option.dealer_name"
-          :value="option.id">
-        </el-option>
-      </el-select>
-    </div>
 
+      <div class="cell clearfix">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+          <el-option
+            v-for="(option, index) in dealer"
+            :key="index"
+            :label="option.dealer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
 
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-          >
-
-            <el-table-column min-width="35" align="center">
-
-              <template slot="header" slot-scope="scope">
-                <span>商品类型<span style="color: red">*</span></span>
-              </template>
-
-              <template slot-scope="scope" >
-                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
-                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
-
-                <el-form-item  style="padding-top: 15px">
-                  <el-input placeholder="请输入商品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
-                </el-form-item>
-
-              </template>
-            </el-table-column>
-            <el-table-column min-width="35" align="center">
-              <template slot="header" slot-scope="scope">
-                <span>规格名称<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-
-                <el-form-item  style="padding-top: 15px">
-                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
-                </el-form-item>
-
-              </template>
-            </el-table-column>
-
-
-            <el-table-column  min-width="23" align="center">
-              <template slot="header" slot-scope="scope">
-                <span>单价<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
-                  <el-input placeholder="请输入单价" type="number"  v-model="scope.row.price" ></el-input>
-                </el-form-item>
-
-
-              </template>
-            </el-table-column>
-
-            <el-table-column  min-width="23" align="center">
-              <template slot="header" slot-scope="scope">
-                <span>出库数量<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count' style="padding-top: 17px">
-                  <el-input placeholder="请输入出库数量" type="number"  v-model="scope.row.count" ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="总价" min-width="20" align="center">
-              <template slot-scope="scope">
-                {{calculate(scope.row.price*scope.row.count)}}
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" min-width="20" align="center">
-              <template slot-scope="scope">
-                <el-input  v-model="scope.row.remark"></el-input>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="操作" align="center" min-width="20">
-              <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" content="新增" placement="top">
-
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-circle-plus-outline"
-                    @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="删除" placement="top">
-
-                  <el-button
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-delete"
-                    @click="handleDelete(scope.$index, scope.row)">
-                  </el-button>
-                </el-tooltip>
-
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form>
-  </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">厂商</span> : </label>
+        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+          <el-option
+            v-for="(option, index) in manufacturer"
+            :key="index"
+            :label="option.manufacturer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+          <el-table-column min-width="35" align="center">
+
+            <template slot="header" slot-scope="scope">
+              <span>商品类型</span>
+            </template>
+
+            <template slot-scope="scope">
+              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
+                          :value="typeName(scope.row.good_type_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                          :value="specificationName(scope.row.good_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
+                            style="padding-top: 17px">
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.price"></el-input>
+              </el-form-item>
+
+
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                            style="padding-top: 17px">
+                <el-input placeholder="请输入出库数量" type="number" v-model="scope.row.count"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{calculate(scope.row.price*scope.row.count)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" min-width="20">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </div>
   </div>
 
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import {
-    getSalesReturnConfig,
-    postWarehouseOut
-  } from '@/api/stock'
+  import { getSalesReturnConfig, postWarehouseOut } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
   import BreadCrumb from '../components/bread-crumb'
 
@@ -168,7 +175,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '出库单' },
+          { path: false, name: '耗材出库单' },
+          { path: false, name: '新增出库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他出库单' },
           { path: false, name: '新增出库单' }
         ],
         type: this.$route.query.type,
@@ -197,13 +209,15 @@
         propForm: {
           goodType: [],
           goodInfo: [],
-          goodUnit: []
+          goodUnit: [],
+          manufacturer: 0,
+          dealer: 0
         },
         form: {
-          manufacturer: '',
-          dealer: ''
+          manufacturer: 0,
+          dealer: 0
         },
-        warehouseInfoList:[],
+        warehouseInfoList: [],
         manufacturer: [],
         dealer: [],
         goodType: []
@@ -212,9 +226,9 @@
     methods: {
       comfirm: function(val) {
         this.$refs.dialog.hide()
-
+        this.propForm.goodType = []
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
+          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
@@ -233,32 +247,48 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
+        this.propForm.goodType = []
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
 
         }
         getSalesReturnConfig(params).then(response => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            var warehouseList = response.data.data.warehouseList
+            loading.close()
             var warehouseInfoList = response.data.data.warehouseInfoList
             this.warehouseInfoList = response.data.data.warehouseInfoList
-            for (let i = 0; i < warehouseList.length; i++) {
-              if (warehouseList[i].Manufacturer.id > 0) {
-                this.manufacturer.push(warehouseList[i].Manufacturer)
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              if (warehouseInfoList[i].info.manufacturers.id > 0) {
+                this.manufacturer.push(warehouseInfoList[i].info.manufacturers)
               }
-              if (warehouseList[i].Dealer.id > 0) {
-                this.dealer.push(warehouseList[i].Dealer)
+              if (warehouseInfoList[i].info.dealers.id > 0) {
+                this.dealer.push(warehouseInfoList[i].info.dealers)
               }
             }
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.goodType.push(this.warehouseInfoList[i].info.type)
+            }
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
             }
             const obj = {}
             const obj2 = {}
+            const obj3 = {}
+
             const obj4 = {}
             // 去重复
             this.manufacturer = this.manufacturer.reduce((cur, next) => {
@@ -274,13 +304,22 @@
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
+
+            this.goodType = this.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+
           }
         })
       }, typeName: function(good_type_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
           }
         }
         return name
@@ -324,15 +363,36 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.$refs.dialog.show()
-
+        this.propForm.goodType = []
+        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
-            if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
+            this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+        } else {
+          if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+          }
+          if (this.form.manufacturer != 0 && this.form.dealer == 0) {
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+          }
+          if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
             }
           }
           const obj3 = {}
@@ -341,15 +401,13 @@
             return cur
           }, [])
         }
+        this.$refs.dialog.show()
+
       }, back() {
         this.$router.go(-1)
       }, submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
-            if (this.form.manufacturer == 0) {
-              this.$message.error('厂商不能为空')
-              return
-            }
             const array = this.recordInfo.recordData
             let total = 0
             for (let i = 0; i < array.length; i++) {
@@ -382,15 +440,10 @@
             return false
           }
         })
-      }, changeManufacturer() {
-        this.recordInfo.recordData = []
-        const tempObj = {}
-        tempObj['good_type_id'] = 0
-        tempObj['good_id'] = 0
-        tempObj['return_count'] = 0
-        tempObj['price'] = ''
-        tempObj['remark'] = ''
-        this.recordInfo.recordData.push(tempObj)
+      }, changeManufacturer(val) {
+        this.propForm.manufacturer = val
+      }, changeDealer(val) {
+        this.propForm.dealer = val
       }
     },
     created() {
@@ -428,6 +481,7 @@
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+
   }
 
 

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
     </div>
 
     <div class="app-container">
@@ -108,7 +110,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '出库单' },
+          { path: false, name: '耗材出库单' },
+          { path: false, name: '出库单详情' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他出库单' },
           { path: false, name: '出库单详情' }
         ],
         isEdit: 0,

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -1,124 +1,157 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
+
       <div style="float:right;">
-        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
       </div>
     </div>
 
-  <div class="app-container">
+    <div class="app-container">
 
-    <sales-return-dialog  ref="dialog"  :propForm="propForm"
-                     :visibility="isVisibility"
-                     v-on:dialog-comfirm="comfirm"
-                     v-on:dialog-cancle="cancle"></sales-return-dialog>
+      <sales-return-dialog ref="dialog" :propForm="propForm"
+                           :visibility="isVisibility"
+                           v-on:dialog-comfirm="comfirm"
+                           v-on:dialog-cancle="cancle"></sales-return-dialog>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">出库时间</span> : </label>
-      <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>
+      <div class="cell clearfix">
+        <label class="title"><span class="name">出库时间</span> : </label>
+        <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>
 
-        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-          >
-
-            <el-table-column min-width="35" align="center">
-
-              <template slot="header" slot-scope="scope">
-                <span>商品类型<span style="color: red">*</span></span>
-              </template>
-
-              <template slot-scope="scope">
-                <el-form-item style="padding-top: 15px">
-                  <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
-                            :value="typeName(scope.row.good_type_id)"
-                            @focus="showDialog(scope.$index, scope.row)"></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column min-width="35" align="center">
-              <template slot="header" slot-scope="scope">
-                <span>规格名称<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-
-                <el-form-item style="padding-top: 15px">
-                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
-                            :value="specificationName(scope.row.good_id)"
-                            @focus="showDialog(scope.$index, scope.row)"></el-input>
-                </el-form-item>
-
-              </template>
-            </el-table-column>
-
-
-            <el-table-column  min-width="23" align="center">
-              <template slot="header" slot-scope="scope">
-                <span>单价<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.price" ></el-input>
-                </el-form-item>
-
-
-              </template>
-            </el-table-column>
-
-            <el-table-column  min-width="23" align="center">
-              <template slot="header" slot-scope="scope">
-                <span>出库数量<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.count" ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="总价" min-width="20" align="center">
-              <template slot-scope="scope">
-                {{calculate(scope.row.price*scope.row.count)}}
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" min-width="20" align="center">
-              <template slot-scope="scope">
-                <el-input  v-model="scope.row.remark"></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" min-width="20">
-              <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" content="新增" placement="top">
-
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-circle-plus-outline"
-                    @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="删除" placement="top">
-
-                  <el-button
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-delete"
-                    @click="handleDelete(scope.$index, scope.row)">
-                  </el-button>
-                </el-tooltip>
-
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form>
 
-  </div>
+      <div class="cell clearfix">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+          <el-option
+            v-for="(option, index) in dealer"
+            :key="index"
+            :label="option.dealer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">厂商</span> : </label>
+
+        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+          <el-option
+            v-for="(option, index) in manufacturer"
+            :key="index"
+            :label="option.manufacturer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+          <el-table-column min-width="35" align="center">
+
+            <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
+                          :value="typeName(scope.row.good_type_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                          :value="specificationName(scope.row.good_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.price"></el-input>
+              </el-form-item>
+
+
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.count"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{calculate(scope.row.price*scope.row.count)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" min-width="20">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+
+    </div>
   </div>
 
 </template>
@@ -126,12 +159,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import {
-    deleteWarehouseOutInfo,
-    getWarehouseOutInfo,
-    getSalesReturnConfig,
-    editWarehouseoutInfo
-  } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
   import BreadCrumb from '../components/bread-crumb'
 
@@ -143,7 +171,12 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: false, name: '出库单' },
+          { path: false, name: '耗材出库单' },
+          { path: false, name: '编辑出库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他出库单' },
           { path: false, name: '编辑出库单' }
         ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
@@ -177,14 +210,16 @@
           goodType: [],
           goodInfo: [],
           goodUnit: [],
-          title: '入库'
+          title: '入库',
+          manufacturer: 0,
+          dealer: 0
         },
 
         form: {
-          manufacturer: '',
-          dealer: ''
+          manufacturer: 0,
+          dealer: 0
         },
-        warehouseInfoList:[],
+        warehouseInfoList: [],
         warehouseOut: {},
         manufacturer: [],
         dealer: [],
@@ -221,34 +256,71 @@
           type: this.$route.query.type
         }
         getSalesReturnConfig(params).then(response => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
+            loading.close()
             var warehouseInfoList = response.data.data.warehouseInfoList
             this.warehouseInfoList = response.data.data.warehouseInfoList
-
             for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-              this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
+              if (warehouseInfoList[i].info.manufacturers.id > 0) {
+                this.manufacturer.push(warehouseInfoList[i].info.manufacturers)
+              }
+              if (warehouseInfoList[i].info.dealers.id > 0) {
+                this.dealer.push(warehouseInfoList[i].info.dealers)
+              }
+            }
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.goodType.push(this.warehouseInfoList[i].info.type)
+            }
+
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
             }
+            const obj = {}
+            const obj2 = {}
             const obj3 = {}
+
             const obj4 = {}
+            // 去重复
+            this.manufacturer = this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            // 去重复
+            this.dealer = this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
+              return cur
+            }, [])
             this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
-            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+
+            this.goodType = this.goodType.reduce((cur, next) => {
               obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
               return cur
             }, [])
+
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
+            this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
+
           }
         })
       }, typeName: function(good_type_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
           }
         }
         return name
@@ -302,17 +374,46 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-        for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          if (this.warehouseInfoList[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.warehouseInfoList[i].GoodInfo.GoodsType)
+        this.propForm.goodType = []
+        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
           }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+        } else {
+          if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+          }
+          if (this.form.manufacturer != 0 && this.form.dealer == 0) {
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+          }
+          if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              }
+            }
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
         }
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
         this.$refs.dialog.show()
+
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -333,7 +434,7 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -363,6 +464,7 @@
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
             this.form.manufacturer = this.warehouseOut.manufacturer
+            this.form.dealer = this.warehouseOut.dealer
 
           }
 
@@ -382,6 +484,10 @@
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
+      }, changeManufacturer(val) {
+        this.propForm.manufacturer = val
+      }, changeDealer(val) {
+        this.propForm.dealer = val
       }
     },
     created() {

src/xt_pages/stock/stockQuery.vue

@@ -14,11 +14,14 @@
             {{scope.row.good_code}}
           </template>
         </el-table-column>
+        <el-table-column label="商品类型" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.type.type_name}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="规格名称" align="center">
           <template slot-scope="scope">
-
             <span>{{scope.row.specification_name}}</span>
-
           </template>
         </el-table-column>
         <el-table-column label="入库数量" align="center" >

src/xt_pages/user/components/PatientForm.vue

@@ -232,7 +232,7 @@
               :before-upload="beforeAvatarUpload">
               <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" class="uploadHeadBtn" type="primary" >上传头像</el-button>
             </el-upload>
-            <el-form-item prop="avatar">
+            <el-form-item >
               <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
             </el-form-item>
           </el-col>
@@ -498,9 +498,9 @@
       }
 
       return {
-        crumbs:[
-          {path:false, name:'病人管理'},
-          {path:false, name:'新增病人'},
+        crumbs: [
+          { path: false, name: '病人管理' },
+          { path: false, name: '新增病人' }
         ],
         generic_info_fold: true,
         treat_info_fold: true,
@@ -543,7 +543,6 @@
 
         subscibe: {},
         rules: {
-          // avatar: [{ required: true, message: '请上传头像', trigger: 'blur' }],
           patientType: [{ required: true, message: '请选择患者类型', trigger: 'blur' }],
           dialysisNo: [{ required: true, message: '请填写透析号', trigger: 'blur' }],
           phone: [{ validator: checkPhone, trigger: 'blur' }],

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -18,81 +18,80 @@
 </template>
 
 <script>
-import { setTemplateMode } from "@/api/schedule_template/patient"
+import { setTemplateMode } from '@/api/schedule_template/patient'
 
 export default {
-    name: "SetUpTemplateDialog",
-    data() {
-        return {
-            visible: false,
-            form: {
-                mode: 0,
-            },
-        }
-    },
-    props: {
-        template_mode: {
-            type: Object,
-        },
-        origin_mode: {
-            type: Number,
-        }
+  name: 'SetUpTemplateDialog',
+  data() {
+    return {
+      visible: false,
+      form: {
+        mode: 0
+      }
+    }
+  },
+  props: {
+    template_mode: {
+      type: Object
     },
-    watch: {
-        "template_mode.mode": function() {
-            this.form.mode = this.template_mode.mode
-        }
+    origin_mode: {
+      type: Number
+    }
+  },
+  watch: {
+    'template_mode.mode': function() {
+      this.form.mode = this.template_mode.mode
+    }
+  },
+  methods: {
+    _close: function(done) {
+      this.clear()
+      done()
     },
-    methods: {
-        _close: function(done) {
-            this.clear()
-            done()
-        },
-        clear: function() {
-
-        },
-        show() {
-            this.clear()
-            this.visible = true
-        },
-        hide() {
-            this.clear()
-            this.visible = false
-        },
-        saveAction: function() {
-            var msg = ""
-            if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2 直接清除下两周的排班
-                msg = "开启模板将清除下两周已设置的排班！是否继续开启？"
-            } else if (this.form.mode == 0) { // 1 -> 0 或 2 -> 0 则不处理排班，但清除所有模板item
+    clear: function() {
 
-            } else if (this.origin_mode == 1 && this.form.mode == 2) { // 1 -> 2 清除第二周排班
-                msg = "开启双周模板将清除下第二周已设置的排班！是否继续开启？"
-            } else if (this.origin_mode == 2 && this.form.mode == 1) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
-                msg = "双周模板调整为单周模板时，下第二周排班将被清除，并用单周模板生成下第二周的排班！是否继续调整？"
-            }
-            if (msg.length == 0) {
-                this.submit()
-            } else {
-                this.$confirm(msg, '提示', {confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning'})
-                .then(() => {
-                    this.submit()
-                })
-            }
-        },
-        submit: function() {
-            setTemplateMode(this.form.mode).then(rs => {
-                var resp = rs.data
-                if (resp.state == 1) {
-                    this.template_mode.mode = this.form.mode
-                    this.hide()
-                    this.$emit("chenge_mode", this.form.mode)
+    },
+    show() {
+      this.clear()
+      this.visible = true
+    },
+    hide() {
+      this.clear()
+      this.visible = false
+    },
+    saveAction: function() {
+      var msg = ''
+      if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2 直接清除下两周的排班
+        msg = '开启模板将清除下两周已设置的排班！是否继续开启？'
+      } else if (this.form.mode == 0) { // 1 -> 0 或 2 -> 0 则不处理排班，但清除所有模板item
 
-                } else {
-                    this.$message.error(resp.msg)
-                }
-            })
+      } else if (this.origin_mode == 1 && this.form.mode == 2) { // 1 -> 2 清除第二周排班
+        msg = '开启双周模板将清除下第二周已设置的排班！是否继续开启？'
+      } else if (this.origin_mode == 2 && this.form.mode == 1) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+        msg = '双周模板调整为单周模板时，下第二周排班将被清除，并用单周模板生成下第二周的排班！是否继续调整？'
+      }
+      if (msg.length == 0) {
+        this.submit()
+      } else {
+        this.$confirm(msg, '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
+          .then(() => {
+            this.submit()
+          })
+      }
+    },
+    submit: function() {
+      setTemplateMode(this.form.mode).then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+          this.template_mode.mode = this.form.mode
+          this.hide()
+          this.$emit('chenge_mode', this.form.mode)
+        } else {
+          this.$message.error(resp.msg)
         }
+      })
     }
+  }
 }
 </script>