4 years ago · 5ae0d1feaa
--- a/index.html
+++ b/index.html
@@ -9,6 +9,11 @@
 
				       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
			
 
				     />
			
 
				     <title>血透管理-酷医云</title>
			
 
				+    <!-- <link
			
 
				+      rel="stylesheet"
			
 
				+      href="//at.alicdn.com/t/font_1480998_l66fq6mc0y.css"
			
 
				+    /> -->
			
 
				+    
			
 
				   </head>
			
 
				 
			
 
				   <body>
			
@@ -24,7 +29,7 @@
 
				     <!-- built files will be auto injected -->
			
 
				     <link
			
 
				       rel="stylesheet"
			
 
				-      href="//at.alicdn.com/t/font_1480998_l66fq6mc0y.css"
			
 
				+      href="//at.alicdn.com/t/font_795029_9ftx46rzd47.css"
			
 
				     />
			
 
				   </body>
			
 
				 </html>
			
--- a/package-lock.json
+++ b/package-lock.json
@@ -4740,8 +4740,7 @@
 
				         "ansi-regex": {
			
 
				           "version": "2.1.1",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "aproba": {
			
 
				           "version": "1.2.0",
			
@@ -4764,15 +4763,13 @@
 
				         "balanced-match": {
			
 
				           "version": "1.0.0",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "brace-expansion": {
			
 
				           "version": "1.1.11",
			
 
				           "resolved": false,
			
 
				           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "balanced-match": "^1.0.0",
			
 
				             "concat-map": "0.0.1"
			
@@ -4788,22 +4785,19 @@
 
				         "code-point-at": {
			
 
				           "version": "1.1.0",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "concat-map": {
			
 
				           "version": "0.0.1",
			
 
				           "resolved": false,
			
 
				           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "console-control-strings": {
			
 
				           "version": "1.1.0",
			
 
				           "resolved": false,
			
 
				           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "core-util-is": {
			
 
				           "version": "1.0.2",
			
@@ -4933,8 +4927,7 @@
 
				         "inherits": {
			
 
				           "version": "2.0.3",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "ini": {
			
 
				           "version": "1.3.5",
			
@@ -4948,7 +4941,6 @@
 
				           "resolved": false,
			
 
				           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "number-is-nan": "^1.0.0"
			
 
				           }
			
@@ -4965,7 +4957,6 @@
 
				           "resolved": false,
			
 
				           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "brace-expansion": "^1.1.7"
			
 
				           }
			
@@ -4973,15 +4964,13 @@
 
				         "minimist": {
			
 
				           "version": "0.0.8",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "minipass": {
			
 
				           "version": "2.3.5",
			
 
				           "resolved": false,
			
 
				           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "safe-buffer": "^5.1.2",
			
 
				             "yallist": "^3.0.0"
			
@@ -5002,7 +4991,6 @@
 
				           "resolved": false,
			
 
				           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "minimist": "0.0.8"
			
 
				           }
			
@@ -5090,8 +5078,7 @@
 
				         "number-is-nan": {
			
 
				           "version": "1.0.1",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "object-assign": {
			
 
				           "version": "4.1.1",
			
@@ -5105,7 +5092,6 @@
 
				           "resolved": false,
			
 
				           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "wrappy": "1"
			
 
				           }
			
@@ -5200,8 +5186,7 @@
 
				         "safe-buffer": {
			
 
				           "version": "5.1.2",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "safer-buffer": {
			
 
				           "version": "2.1.2",
			
@@ -5243,7 +5228,6 @@
 
				           "resolved": false,
			
 
				           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "code-point-at": "^1.0.0",
			
 
				             "is-fullwidth-code-point": "^1.0.0",
			
@@ -5265,7 +5249,6 @@
 
				           "resolved": false,
			
 
				           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
			
 
				           "dev": true,
			
 
				-          "optional": true,
			
 
				           "requires": {
			
 
				             "ansi-regex": "^2.0.0"
			
 
				           }
			
@@ -5313,15 +5296,13 @@
 
				         "wrappy": {
			
 
				           "version": "1.0.2",
			
 
				           "bundled": true,
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         },
			
 
				         "yallist": {
			
 
				           "version": "3.0.3",
			
 
				           "resolved": false,
			
 
				           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
			
 
				-          "dev": true,
			
 
				-          "optional": true
			
 
				+          "dev": true
			
 
				         }
			
 
				       }
			
 
				     },
			
@@ -7943,7 +7924,7 @@
 
				     },
			
 
				     "normalize-wheel": {
			
 
				       "version": "1.0.1",
			
 
				-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
			
 
				+      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
			
 
				       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
			
 
				     },
			
 
				     "normalize.css": {
			
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
 
				     "vue-template-compiler": "2.5.16",
			
 
				     "webpack": "3.10.0",
			
 
				     "webpack-bundle-analyzer": "2.9.1",
			
 
				-    "webpack-dev-server": "2.9.7",
			
 
				+    "webpack-dev-server": "^2.9.7",
			
 
				     "webpack-merge": "4.1.1",
			
 
				     "write-json": "^3.0.1"
			
 
				   },
			
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -148,15 +148,23 @@ export function getBaseDrugLibList(params) {
 
				 
			
 
				 
			
 
				 
			
 
				-export function createMedicineInsurancePercent(params) {
			
 
				+export function createMedicineInsurancePercent(params,module) {
			
 
				   return request({
			
 
				-    url: '/api/medicineinsurancepercent/create',
			
 
				+    url: '/api/medicineinsurancepercent/create?module='+module,
			
 
				     method: 'post',
			
 
				     data: params
			
 
				   })
			
 
				 }
			
 
				 
			
 
				 
			
 
				+export function getMedicineInsurancePercent(type_id,module) {
			
 
				+  return request({
			
 
				+    url: '/api/medicineinsurancepercent/get?type_id='+type_id+"&module="+module,
			
 
				+    method: 'get',
			
 
				+  })
			
 
				+}
			
 
				+
			
 
				+
			
 
				 export function createDrugUnitSafeguard(params) {
			
 
				   return request({
			
 
				     url: '/api/drugunitsafeguard/create',
			
@@ -167,3 +175,5 @@ export function createDrugUnitSafeguard(params) {
 
				 
			
 
				 
			
 
				 
			
 
				+
			
 
				+
			
--- a/src/api/datastore.js
+++ b/src/api/datastore.js
@@ -1,6 +1,7 @@
 
				 import request from '@/utils/request'
			
 
				 
			
 
				 export function getConfigList(params) {
			
 
				+
			
 
				   return request({
			
 
				     url: '/api/getconfiglist',
			
 
				     method: 'get',
			
--- a/src/api/drug.js
+++ b/src/api/drug.js
@@ -0,0 +1,9 @@
 
				+import request from '@/utils/request'
			
 
				+
			
 
				+export function getDruglist(params){
			
 
				+  return request({
			
 
				+    url:"/api/getdruglist",
			
 
				+    methods:"get",
			
 
				+    params:params
			
 
				+   })
			
 
				+}
			
--- a/src/api/drug/drug_stock.js
+++ b/src/api/drug/drug_stock.js
@@ -42,7 +42,7 @@ export function getDrugWarehouseInfo(params) {
 
				 
			
 
				 export function getDrugSalesReturnList(params) {
			
 
				   return request({
			
 
				-    url: '/api/salesreturn/list',
			
 
				+    url: '/api/drugsalesreturn/list',
			
 
				     method: 'get',
			
 
				     params: params
			
 
				   })
			
@@ -355,6 +355,7 @@ export function getPrintStockGood(params) {
 
				 }
			
 
				 
			
 
				 
			
 
				+
			
 
				 export function getWarehouseOutUser(params) {
			
 
				   return request({
			
 
				     url: '/api/drugwarehouseout/user',
			
@@ -362,3 +363,28 @@ export function getWarehouseOutUser(params) {
 
				     params: params
			
 
				   })
			
 
				 }
			
 
				+
			
 
				+
			
 
				+export function createDrugStockAutomaticReduceConfig(is_open) {
			
 
				+  return request({
			
 
				+    url: '/api/drugstock/automaticreduce/isopen?is_open='+is_open,
			
 
				+    method: 'post',
			
 
				+  })
			
 
				+}
			
 
				+
			
 
				+export function getDrugStockAutomaticReduceConfig() {
			
 
				+  return request({
			
 
				+    url: '/api/drugstockautomaticreduce/get',
			
 
				+    method: 'get',
			
 
				+  })
			
 
				+}
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
--- a/src/assets/logo/logo2.png
+++ b/src/assets/logo/logo2.png
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -149,7 +149,7 @@ export default {
 
				     RescueRecord: '抢救记录',
			
 
				     special_permission_manage: '特殊权限管理',
			
 
				     schedule_print: '排班打印',
			
 
				-    
			
 
				+
			
 
				     drugsExpiryDate:'药品有效期预警',
			
 
				     drugsSurplus:'药品剩余预警',
			
 
				     drugsQuery:'明细查询',
			
@@ -201,7 +201,31 @@ export default {
 
				 
			
 
				     slow: '慢病管理',
			
 
				     scrm: 'SCRM',
			
 
				-    shop: '分销商城'
			
 
				+    shop: '分销商城',
			
 
				+
			
 
				+    outpatientRegistration:'门诊挂号',
			
 
				+    outpatientRegistrationIndex:'门诊挂号',
			
 
				+    outpatientRegistrationRegistrationHistory:'挂号历史',
			
 
				+    outpatientDoctorStation:"门诊医生站",
			
 
				+    outpatientDoctorStationDoctorDesk:'医生工作台',
			
 
				+    outpatientDoctorStationPastInquiries:'既往查询',
			
 
				+    outpatientDoctorStationTemplateManagement:'模板管理',
			
 
				+    outpatientCharges:'门诊收费',
			
 
				+    outpatientChargesManagement:'门诊收费管理',
			
 
				+    outpatientInvoice:'门诊发票',
			
 
				+    advancePayment:'预交金',
			
 
				+    labelPrinting:'标签打印',
			
 
				+    summary:'项目消费明细汇总',
			
 
				+    outpatientPharmacy:'门诊药房',
			
 
				+    pharmacyFormula:'药房配发药',
			
 
				+    prescriptionDrugReturn:'处方退药',
			
 
				+    dispensingInquiry:'处方发药查询',
			
 
				+    drugReturnInquiry:'处方退药查询',
			
 
				+    signIndex:'签到排队',
			
 
				+    signIn:'签到窗口',
			
 
				+    lineUp:'排队窗口',
			
 
				+
			
 
				+
			
 
				   },
			
 
				   navbar: {
			
 
				     logOut: '退出登录',
			
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,6 +21,24 @@ import medicalScheduling from './modules/medical_scheduling'
 
				 import slow from './modules/slow'
			
 
				 import scrm from './modules/scrm'
			
 
				 import shop from './modules/shop'
			
 
				+import selfPreparedMedicine from './modules/selfPreparedMedicine'
			
 
				+import drugs from './modules/drugs'
			
 
				+import outpatientRegistration from './modules/outpatientRegistration'
			
 
				+import outpatientDoctorStation from './modules/outpatientDoctorStation'
			
 
				+import outpatientCharges from './modules/outpatientCharges'
			
 
				+import outpatientPharmacy from './modules/outpatientPharmacy'
			
 
				+import kuyiShopping from './modules/kuyiShopping'
			
 
				+import createPatient from './modules/createPatient'
			
 
				+import dialysisRecord from './modules/dialysisRecord'
			
 
				+import otherManagement from './modules/otherManagement'
			
 
				+import roleManage from './modules/roleManage'
			
 
				+import dataDictionary from './modules/dataDictionary'
			
 
				+import specialDictionary from './modules/specialDictionary'
			
 
				+import dataTemplate from './modules/dataTemplate'
			
 
				+import dataPrescription from './modules/dataPrescription'
			
 
				+import dataDruguse from './modules/dataDruguse'
			
 
				+import dataShowconfig from './modules/dataShowconfig'
			
 
				+import dataPrint from './modules/dataPrint'
			
 
				 
			
 
				 Vue.use(Router)
			
 
				 
			
@@ -94,11 +112,16 @@ service
 
				 
			
 
				 var _asy_router_map = [
			
 
				   patient,
			
 
				+  createPatient,
			
 
				   workforce,
			
 
				   medicalScheduling,
			
 
				   weight_sign,
			
 
				+  dialysisRecord,
			
 
				   dialysis,
			
 
				   stock,
			
 
				+  selfPreparedMedicine,
			
 
				+  drugs,
			
 
				+  otherManagement,
			
 
				   qcd,
			
 
				   device,
			
 
				   org,
			
@@ -107,7 +130,20 @@ var _asy_router_map = [
 
				   scrm,
			
 
				   shop,
			
 
				   integration,
			
 
				-  systems
			
 
				+  systems,
			
 
				+  roleManage,
			
 
				+  dataDictionary,
			
 
				+  specialDictionary,
			
 
				+  dataTemplate,
			
 
				+  dataPrescription,
			
 
				+  dataDruguse,
			
 
				+  dataShowconfig,
			
 
				+  dataPrint,
			
 
				+  outpatientRegistration,
			
 
				+  outpatientDoctorStation,
			
 
				+  outpatientCharges,
			
 
				+  outpatientPharmacy,
			
 
				+  kuyiShopping
			
 
				 ]
			
 
				 
			
 
				 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证
			
--- a/src/router/modules/createPatient.js
+++ b/src/router/modules/createPatient.js
@@ -0,0 +1,17 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/createPatient',
			
 
				+  component: Layout,
			
 
				+  name:'createPatient',
			
 
				+  redirct: '/patients/create',
			
 
				+  children: [{
			
 
				+    path: '/patients/create',
			
 
				+    component: () => import('@/xt_pages/user/createPatient'),
			
 
				+    name: 'createPatient',
			
 
				+    meta: {
			
 
				+      title: 'createPatient',
			
 
				+      noCache: true
			
 
				+    }
			
 
				+  },]
			
 
				+}
			
--- a/src/router/modules/dataDictionary.js
+++ b/src/router/modules/dataDictionary.js
@@ -0,0 +1,18 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/data/dictionary',
			
 
				+    component: Layout,
			
 
				+    name:'dictionary',
			
 
				+    redirct: '/data/dictionary',
			
 
				+    children: [{
			
 
				+        path: '/data/dictionary',
			
 
				+        component: () => import('@/xt_pages/data/index'),
			
 
				+        name: 'dictionary',
			
 
				+        meta: {
			
 
				+          title: 'data_dictionary',
			
 
				+          noCache: true,
			
 
				+    
			
 
				+        }
			
 
				+    },]
			
 
				+}
			
--- a/src/router/modules/dataDruguse.js
+++ b/src/router/modules/dataDruguse.js
@@ -0,0 +1,16 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/data/druguse',
			
 
				+    component: Layout,
			
 
				+    name:'druguse',
			
 
				+    redirct: '/data/druguse',
			
 
				+    children: [{
			
 
				+        path: '/data/druguse',
			
 
				+        component: () => import('@/xt_pages/data/druguseTemplate'),
			
 
				+        name: 'druguse',
			
 
				+        meta: {
			
 
				+          title: 'druguse'
			
 
				+        }
			
 
				+    },]
			
 
				+}
			
--- a/src/router/modules/dataPrescription.js
+++ b/src/router/modules/dataPrescription.js
@@ -0,0 +1,16 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/data/prescription',
			
 
				+    component: Layout,
			
 
				+    name:'prescription',
			
 
				+    redirct: '/data/prescription',
			
 
				+    children: [{
			
 
				+        path: '/data/prescription',
			
 
				+        component: () => import('@/xt_pages/data/prescription'),
			
 
				+        name: 'prescription',
			
 
				+        meta: {
			
 
				+          title: 'system_prescription'
			
 
				+        }
			
 
				+    },]
			
 
				+}
			
--- a/src/router/modules/dataPrint.js
+++ b/src/router/modules/dataPrint.js
@@ -0,0 +1,16 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/data/print',
			
 
				+    component: Layout,
			
 
				+    name:'printTemplate',
			
 
				+    redirct: '/data/print',
			
 
				+    children: [{
			
 
				+        path: '/data/print',
			
 
				+        component: () => import('@/xt_pages/data/printTemplate'),
			
 
				+        name: 'printTemplate',
			
 
				+        meta: {
			
 
				+          title: 'printTemplate'
			
 
				+        }
			
 
				+      },]
			
 
				+}
			
--- a/src/router/modules/dataShowconfig.js
+++ b/src/router/modules/dataShowconfig.js
@@ -0,0 +1,16 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/data/showconfig',
			
 
				+    component: Layout,
			
 
				+    name:'showconfig',
			
 
				+    redirct: '/data/showconfig',
			
 
				+    children: [{
			
 
				+        path: '/data/showconfig',
			
 
				+        component: () => import('@/xt_pages/data/showConfig'),
			
 
				+        name: 'showconfig',
			
 
				+        meta: {
			
 
				+          title: 'showconfig'
			
 
				+        }
			
 
				+      },]
			
 
				+}
			
--- a/src/router/modules/dataTemplate.js
+++ b/src/router/modules/dataTemplate.js
@@ -0,0 +1,18 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/data/template',
			
 
				+    component: Layout,
			
 
				+    name:'template',
			
 
				+    redirct: '/data/template',
			
 
				+    children: [{
			
 
				+        path: '/data/template',
			
 
				+        component: () => import('@/xt_pages/data/template'),
			
 
				+        name: 'template',
			
 
				+        meta: {
			
 
				+          title: 'template',
			
 
				+          noCache: true,
			
 
				+    
			
 
				+        }
			
 
				+    },]
			
 
				+}
			
--- a/src/router/modules/data_dict.js
+++ b/src/router/modules/data_dict.js
@@ -12,35 +12,36 @@ export default {
 
				   },
			
 
				   children: [
			
 
				     {
			
 
				-    path: '/data/dictionary',
			
 
				-    component: () => import('@/xt_pages/data/index'),
			
 
				-    name: 'dictionary',
			
 
				-    meta: {
			
 
				-      title: 'field_config',
			
 
				-      noCache: true,
			
 
				+      path: '/data/dictionary',
			
 
				+      component: () => import('@/xt_pages/data/index'),
			
 
				+      name: 'dictionary',
			
 
				+      meta: {
			
 
				+        title: 'field_config',
			
 
				+        noCache: true,
			
 
				 
			
 
				-    }
			
 
				-  },
			
 
				-  {
			
 
				-    path: '/data/template',
			
 
				-    component: () => import('@/xt_pages/data/template'),
			
 
				-    name: 'template',
			
 
				-    meta: {
			
 
				-      title: 'template',
			
 
				-      noCache: true,
			
 
				+      }
			
 
				+    },
			
 
				+    {
			
 
				+      path: '/data/template',
			
 
				+      component: () => import('@/xt_pages/data/template'),
			
 
				+      name: 'template',
			
 
				+      meta: {
			
 
				+        title: 'template',
			
 
				+        noCache: true,
			
 
				 
			
 
				-    }
			
 
				-  },
			
 
				-  {
			
 
				-    path: '/data/druguse',
			
 
				-    component: () => import('@/xt_pages/data/druguseTemplate'),
			
 
				-    name: 'druguse',
			
 
				-    meta: {
			
 
				-      title: 'druguse',
			
 
				-      noCache: true,
			
 
				+      }
			
 
				+    },
			
 
				+    {
			
 
				+      path: '/data/druguse',
			
 
				+      component: () => import('@/xt_pages/data/druguseTemplate'),
			
 
				+      name: 'druguse',
			
 
				+      meta: {
			
 
				+        title: 'druguse',
			
 
				+        noCache: true,
			
 
				 
			
 
				-    }
			
 
				-  }, {
			
 
				+      }
			
 
				+    }, 
			
 
				+    {
			
 
				       path: '/data/showconfig',
			
 
				       component: () => import('@/xt_pages/data/showConfig'),
			
 
				       name: 'showconfig',
			
--- a/src/router/modules/dialysis.js
+++ b/src/router/modules/dialysis.js
@@ -11,15 +11,6 @@ export default {
 
				     icon: 'touxi'
			
 
				   },
			
 
				   children: [
			
 
				-    {
			
 
				-      path: '/dialysis/dialysisrecord',
			
 
				-      component: () => import('@/xt_pages/dialysis/schedualPatient'),
			
 
				-      name: '透析记录',
			
 
				-      meta: {
			
 
				-        title: '透析记录',
			
 
				-        noCache: true
			
 
				-      }
			
 
				-    },
			
 
				     {
			
 
				       path: '/dialysis/watch',
			
 
				       component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
			
--- a/src/router/modules/dialysisRecord.js
+++ b/src/router/modules/dialysisRecord.js
@@ -0,0 +1,17 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/dialysisrecord',
			
 
				+  component: Layout,
			
 
				+  name:'dialysisrecord',
			
 
				+  redirct: '/dialysis/dialysisrecord',
			
 
				+  children: [{
			
 
				+    path: '/dialysis/dialysisrecord',
			
 
				+    component: () => import('@/xt_pages/dialysis/schedualPatient'),
			
 
				+    name: '透析记录',
			
 
				+    meta: {
			
 
				+      title: '透析记录',
			
 
				+      noCache: true
			
 
				+    }
			
 
				+  },]
			
 
				+}
			
--- a/src/router/modules/drugs.js
+++ b/src/router/modules/drugs.js
@@ -0,0 +1,70 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/stock/drugs',
			
 
				+  component: Layout,
			
 
				+  redirect: 'noredirect',
			
 
				+  name: 'stockDrugs',
			
 
				+  alwaysShow: true,
			
 
				+  meta: {
			
 
				+    title: 'stockDrugs',
			
 
				+    icon: 'stock',
			
 
				+    isChild: true
			
 
				+  },
			
 
				+  children: [
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/in',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/stockIn'),
			
 
				+        name: 'drugsStockIn',
			
 
				+        meta: { title: 'drugsStockIn', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/out',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/stockOut'),
			
 
				+        name: 'drugsStockOut',
			
 
				+        meta: { title: 'drugsStockOut', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/return',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/stockReturn'),
			
 
				+        name: 'drugsStockReturn',
			
 
				+        meta: { title: 'drugsStockReturn', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/cancel',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/stockCancel'),
			
 
				+        name: 'drugsStockCancel',
			
 
				+        meta: { title: 'drugsStockCancel', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/adjustPrice',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
			
 
				+        name: 'drugsAdjustPrice',
			
 
				+        meta: { title: 'drugsAdjustPrice', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/reportLoss',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/reportLoss'),
			
 
				+        name: 'drugsReportLoss',
			
 
				+        meta: { title: 'drugsReportLoss', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/query',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/query'),
			
 
				+        name: 'drugsQuery',
			
 
				+        meta: { title: 'drugsQuery', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/drugsSurplus',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
			
 
				+        name: 'drugsSurplus',
			
 
				+        meta: { title: 'drugsSurplus', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/drugs/stock/drugsExpiryDate',
			
 
				+        component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
			
 
				+        name: 'drugsExpiryDate',
			
 
				+        meta: { title: 'drugsExpiryDate', noCache: true }
			
 
				+    },
			
 
				+  ]
			
 
				+}
			
--- a/src/router/modules/kuyiShopping.js
+++ b/src/router/modules/kuyiShopping.js
@@ -0,0 +1,18 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/kuyiShopping',
			
 
				+    component: Layout,
			
 
				+    name:'kuyiShopping',
			
 
				+    redirct: '/kuyiShopping/index',
			
 
				+    children: [{
			
 
				+      path: '/kuyiShopping',
			
 
				+      component: () => import('@/xt_pages/kuyiShopping/index'),
			
 
				+      name: 'kuyiShopping',
			
 
				+      meta: {
			
 
				+        title: 'kuyiShopping',
			
 
				+        icon: 'kuyiShopping',
			
 
				+        noCache: true
			
 
				+      }
			
 
				+    }]
			
 
				+}
			
--- a/src/router/modules/otherManagement.js
+++ b/src/router/modules/otherManagement.js
@@ -0,0 +1,40 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/other',
			
 
				+  component: Layout,
			
 
				+  redirect: 'noredirect',
			
 
				+  name: 'otherManagement',
			
 
				+  alwaysShow: true,
			
 
				+  meta: {
			
 
				+    title: 'otherManagement',
			
 
				+    icon: 'otherManagement',
			
 
				+    isChild: true
			
 
				+  },
			
 
				+  children: [
			
 
				+    {
			
 
				+        path: '/stock/in/other',
			
 
				+        component: () => import('@/xt_pages/stock/otherStockInOrder'),
			
 
				+        name: 'otherStockInOrder',
			
 
				+        meta: { title: 'otherStockInOrder', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/return/other',
			
 
				+        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
			
 
				+        name: 'otherSalesReturnOrder',
			
 
				+        meta: { title: 'otherSalesReturnOrder', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/out/other',
			
 
				+        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
			
 
				+        name: 'otherStockOutOrder',
			
 
				+        meta: { title: 'otherStockOutOrder', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/cancel/other',
			
 
				+        component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
			
 
				+        name: 'otherCancelStockOrder',
			
 
				+        meta: { title: 'otherCancelStockOrder', noCache: true }
			
 
				+    },
			
 
				+  ]
			
 
				+}
			
--- a/src/router/modules/outpatientCharges.js
+++ b/src/router/modules/outpatientCharges.js
@@ -0,0 +1,46 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/outpatientCharges',
			
 
				+  component: Layout,
			
 
				+  redirect: 'noredirect',
			
 
				+  name: 'outpatientCharges',
			
 
				+  alwaysShow: true,
			
 
				+  meta: {
			
 
				+    title: 'outpatientCharges',
			
 
				+    icon: 'outpatientCharges',
			
 
				+    isChild: true
			
 
				+  },
			
 
				+  children: [
			
 
				+    {
			
 
				+        path: '/outpatientCharges/outpatientChargesManagement',
			
 
				+        component: () => import('@/xt_pages/outpatientCharges/outpatientChargesManagement'),
			
 
				+        name: 'outpatientChargesManagement',
			
 
				+        meta: { title: 'outpatientChargesManagement', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientCharges/outpatientInvoice',
			
 
				+        component: () => import('@/xt_pages/outpatientCharges/outpatientInvoice'),
			
 
				+        name: 'outpatientInvoice',
			
 
				+        meta: { title: 'outpatientInvoice', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientCharges/advancePayment',
			
 
				+        component: () => import('@/xt_pages/outpatientCharges/advancePayment'),
			
 
				+        name: 'advancePayment',
			
 
				+        meta: { title: 'advancePayment', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientCharges/labelPrinting',
			
 
				+        component: () => import('@/xt_pages/outpatientCharges/labelPrinting'),
			
 
				+        name: 'labelPrinting',
			
 
				+        meta: { title: 'labelPrinting', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientCharges/summary',
			
 
				+        component: () => import('@/xt_pages/outpatientCharges/summary'),
			
 
				+        name: 'summary',
			
 
				+        meta: { title: 'summary', noCache: true }
			
 
				+    },
			
 
				+  ]
			
 
				+}
			
--- a/src/router/modules/outpatientDoctorStation.js
+++ b/src/router/modules/outpatientDoctorStation.js
@@ -0,0 +1,34 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/outpatientDoctorStation',
			
 
				+  component: Layout,
			
 
				+  redirect: 'noredirect',
			
 
				+  name: 'outpatientDoctorStation',
			
 
				+  alwaysShow: true,
			
 
				+  meta: {
			
 
				+    title: 'outpatientDoctorStation',
			
 
				+    icon: 'outpatientDoctorStation',
			
 
				+    isChild: true
			
 
				+  },
			
 
				+  children: [
			
 
				+    {
			
 
				+        path: '/outpatientDoctorStation/doctorDesk',
			
 
				+        component: () => import('@/xt_pages/outpatientDoctorStation/doctorDesk'),
			
 
				+        name: 'outpatientDoctorStationDoctorDesk',
			
 
				+        meta: { title: 'outpatientDoctorStationDoctorDesk', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientDoctorStation/pastInquiries',
			
 
				+        component: () => import('@/xt_pages/outpatientDoctorStation/pastInquiries'),
			
 
				+        name: 'outpatientDoctorStationPastInquiries',
			
 
				+        meta: { title: 'outpatientDoctorStationPastInquiries', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientDoctorStation/templateManagement',
			
 
				+        component: () => import('@/xt_pages/outpatientDoctorStation/templateManagement'),
			
 
				+        name: 'outpatientDoctorStationTemplateManagement',
			
 
				+        meta: { title: 'outpatientDoctorStationTemplateManagement', noCache: true }
			
 
				+    },
			
 
				+  ]
			
 
				+}
			
--- a/src/router/modules/outpatientPharmacy.js
+++ b/src/router/modules/outpatientPharmacy.js
@@ -0,0 +1,40 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/outpatientPharmacy',
			
 
				+  component: Layout,
			
 
				+  redirect: 'noredirect',
			
 
				+  name: 'outpatientPharmacy',
			
 
				+  alwaysShow: true,
			
 
				+  meta: {
			
 
				+    title: 'outpatientPharmacy',
			
 
				+    icon: 'outpatientPharmacy',
			
 
				+    isChild: true
			
 
				+  },
			
 
				+  children: [
			
 
				+    {
			
 
				+        path: '/outpatientPharmacy/pharmacyFormula',
			
 
				+        component: () => import('@/xt_pages/outpatientPharmacy/pharmacyFormula'),
			
 
				+        name: 'pharmacyFormula',
			
 
				+        meta: { title: 'pharmacyFormula', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientPharmacy/prescriptionDrugReturn',
			
 
				+        component: () => import('@/xt_pages/outpatientPharmacy/prescriptionDrugReturn'),
			
 
				+        name: 'prescriptionDrugReturn',
			
 
				+        meta: { title: 'prescriptionDrugReturn', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientPharmacy/dispensingInquiry',
			
 
				+        component: () => import('@/xt_pages/outpatientPharmacy/dispensingInquiry'),
			
 
				+        name: 'dispensingInquiry',
			
 
				+        meta: { title: 'dispensingInquiry', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientPharmacy/drugReturnInquiry',
			
 
				+        component: () => import('@/xt_pages/outpatientPharmacy/drugReturnInquiry'),
			
 
				+        name: 'drugReturnInquiry',
			
 
				+        meta: { title: 'drugReturnInquiry', noCache: true }
			
 
				+    },
			
 
				+  ]
			
 
				+}
			
--- a/src/router/modules/outpatientRegistration.js
+++ b/src/router/modules/outpatientRegistration.js
@@ -0,0 +1,28 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/outpatientRegistration',
			
 
				+  component: Layout,
			
 
				+  redirect: 'noredirect',
			
 
				+  name: 'outpatientRegistration',
			
 
				+  alwaysShow: true,
			
 
				+  meta: {
			
 
				+    title: 'outpatientRegistration',
			
 
				+    icon: 'outpatientRegistration',
			
 
				+    isChild: true
			
 
				+  },
			
 
				+  children: [
			
 
				+    {
			
 
				+        path: '/outpatientRegistration/index',
			
 
				+        component: () => import('@/xt_pages/outpatientRegistration/index'),
			
 
				+        name: 'outpatientRegistrationIndex',
			
 
				+        meta: { title: 'outpatientRegistrationIndex', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/outpatientRegistration/registrationHistory',
			
 
				+        component: () => import('@/xt_pages/outpatientRegistration/registrationHistory'),
			
 
				+        name: 'outpatientRegistrationRegistrationHistory',
			
 
				+        meta: { title: 'outpatientRegistrationRegistrationHistory', noCache: true }
			
 
				+    },
			
 
				+  ]
			
 
				+}
			
--- a/src/router/modules/patient.js
+++ b/src/router/modules/patient.js
@@ -5,7 +5,6 @@ export default {
 
				   component: Layout,
			
 
				   redirect: 'noredirect',
			
 
				   name: 'User',
			
 
				-  alwaysShow: true,
			
 
				   meta: {
			
 
				     title: 'user',
			
 
				     icon: 'bingren'
			
@@ -19,15 +18,6 @@ export default {
 
				       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'),
			
--- a/src/router/modules/roleManage.js
+++ b/src/router/modules/roleManage.js
@@ -0,0 +1,18 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/role/manage',
			
 
				+    component: Layout,
			
 
				+    name:'roleManage',
			
 
				+    redirct: '/role/manage',
			
 
				+    children: [{
			
 
				+        path: '/role/manage',
			
 
				+        component: () => import('@/xt_pages/role/role'),
			
 
				+        name: 'roleManage',
			
 
				+        meta: {
			
 
				+          title: 'roleManage',
			
 
				+          noCache: true,
			
 
				+    
			
 
				+        }
			
 
				+    },]
			
 
				+}
			
--- a/src/router/modules/selfPreparedMedicine.js
+++ b/src/router/modules/selfPreparedMedicine.js
@@ -0,0 +1,42 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+  path: '/stock/selfPreparedMedicine',
			
 
				+  component: Layout,
			
 
				+  redirect: 'noredirect',
			
 
				+  name: 'selfPreparedMedicine',
			
 
				+  alwaysShow: true,
			
 
				+  meta: {
			
 
				+    title: 'selfPreparedMedicine',
			
 
				+    icon: 'stock',
			
 
				+    isChild: true
			
 
				+  },
			
 
				+  children: [
			
 
				+    {
			
 
				+        path: '/stock/selfPreparedMedicineIndex',
			
 
				+        component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
			
 
				+        name: 'selfPreparedMedicineIndex',
			
 
				+        meta: { title: 'selfPreparedMedicineIndex', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/selfPreparedMedicineQuery',
			
 
				+        component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
			
 
				+        name: 'selfPreparedMedicineQuery',
			
 
				+        meta: { title: 'selfPreparedMedicineQuery', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/selfPreparedMedicineQueryPrint',
			
 
				+        component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
			
 
				+        name: 'selfPreparedMedicineQueryPrint',
			
 
				+        hidden: true,
			
 
				+        is_menu: false,
			
 
				+        meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
			
 
				+    },
			
 
				+    {
			
 
				+        path: '/stock/selfPreparedMedicineInfo',
			
 
				+        component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
			
 
				+        name: 'selfPreparedMedicineInfo',
			
 
				+        meta: { title: 'selfPreparedMedicineInfo', noCache: true }
			
 
				+    }
			
 
				+  ]
			
 
				+}
			
--- a/src/router/modules/specialDictionary.js
+++ b/src/router/modules/specialDictionary.js
@@ -0,0 +1,18 @@
 
				+import Layout from '@/views/layout/Layout'
			
 
				+
			
 
				+export default {
			
 
				+    path: '/data/specialDictionary',
			
 
				+    component: Layout,
			
 
				+    name:'specialDictionary',
			
 
				+    redirct: '/data/specialDictionary',
			
 
				+    children: [{
			
 
				+        path: '/data/specialDictionary',
			
 
				+        component: () => import('@/xt_pages/data/specialDictionary'),
			
 
				+        name: 'specialDictionary',
			
 
				+        meta: {
			
 
				+          title: 'specialDictionary',
			
 
				+          noCache: true,
			
 
				+    
			
 
				+        }
			
 
				+    },]
			
 
				+}
			
--- a/src/router/modules/stock.js
+++ b/src/router/modules/stock.js
@@ -201,6 +201,13 @@ export default {
 
				       hidden: true,
			
 
				       is_menu: false,
			
 
				       meta: { title: 'salesReturnDetail', noCache: true }
			
 
				+    }, {
			
 
				+      path: '/drugstock/return/detail',
			
 
				+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnDetail'),
			
 
				+      name: 'drugSalesReturnDetail',
			
 
				+      hidden: true,
			
 
				+      is_menu: false,
			
 
				+      meta: { title: 'drugSalesReturnDetail', noCache: true }
			
 
				     },
			
 
				     {
			
 
				       path: '/stock/return/add',
			
@@ -364,6 +371,7 @@ export default {
 
				         noCache: true
			
 
				       }
			
 
				     },
			
 
				+
			
 
				     {
			
 
				       path: '/stock/drugs/stock/in',
			
 
				       component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
			
@@ -394,30 +402,30 @@ export default {
 
				     {
			
 
				       path: '/stock/drugs/stock/cancel',
			
 
				       component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
			
 
				-      name: 'cancelDrugStockOrder',
			
 
				-      hidden: true,
			
 
				-      is_menu: false,
			
 
				-      num: 3,
			
 
				-      meta: { title: 'cancelDrugStockOrder', noCache: true }
			
 
				-    },
			
 
				-    {
			
 
				-      path: '/stock/drugs/stock/adjustPrice',
			
 
				-      component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
			
 
				-      name: 'drugsAdjustPrice',
			
 
				-      hidden: true,
			
 
				-      is_menu: false,
			
 
				-      num: 3,
			
 
				-      meta: { title: 'drugsAdjustPrice', noCache: true }
			
 
				-    },
			
 
				-    {
			
 
				-      path: '/stock/drugs/stock/reportLoss',
			
 
				-      component: () => import('@/xt_pages/stock/drugs/reportLoss'),
			
 
				-      name: 'drugsReportLoss',
			
 
				+      name: 'drugsStockCancel',
			
 
				       hidden: true,
			
 
				       is_menu: false,
			
 
				       num: 3,
			
 
				-      meta: { title: 'drugsReportLoss', noCache: true }
			
 
				+      meta: { title: 'drugsStockCancel', noCache: true }
			
 
				     },
			
 
				+    // {
			
 
				+    //   path: '/stock/drugs/stock/adjustPrice',
			
 
				+    //   component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
			
 
				+    //   name: 'drugsAdjustPrice',
			
 
				+    //   hidden: true,
			
 
				+    //   is_menu: false,
			
 
				+    //   num: 3,
			
 
				+    //   meta: { title: 'drugsAdjustPrice', noCache: true }
			
 
				+    // },
			
 
				+    // {
			
 
				+    //   path: '/stock/drugs/stock/reportLoss',
			
 
				+    //   component: () => import('@/xt_pages/stock/drugs/reportLoss'),
			
 
				+    //   name: 'drugsReportLoss',
			
 
				+    //   hidden: true,
			
 
				+    //   is_menu: false,
			
 
				+    //   num: 3,
			
 
				+    //   meta: { title: 'drugsReportLoss', noCache: true }
			
 
				+    // },
			
 
				     {
			
 
				       path: '/stock/drugs/stock/query',
			
 
				       component: () => import('@/xt_pages/stock/drugs/query'),
			
@@ -427,23 +435,23 @@ export default {
 
				       num: 3,
			
 
				       meta: { title: 'drugsQuery', noCache: true }
			
 
				     },
			
 
				-    {
			
 
				-      path: '/stock/drugs/stock/drugsSurplus',
			
 
				-      component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
			
 
				-      name: 'drugsSurplus',
			
 
				-      hidden: true,
			
 
				-      is_menu: false,
			
 
				-      num: 3,
			
 
				-      meta: { title: 'drugsSurplus', noCache: true }
			
 
				-    },
			
 
				-    {
			
 
				-      path: '/stock/drugs/stock/drugsExpiryDate',
			
 
				-      component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
			
 
				-      name: 'drugsExpiryDate',
			
 
				-      hidden: true,
			
 
				-      is_menu: false,
			
 
				-      num: 3,
			
 
				-      meta: { title: 'drugsExpiryDate', noCache: true }
			
 
				-    },
			
 
				+    // {
			
 
				+    //   path: '/stock/drugs/stock/drugsSurplus',
			
 
				+    //   component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
			
 
				+    //   name: 'drugsSurplus',
			
 
				+    //   hidden: true,
			
 
				+    //   is_menu: false,
			
 
				+    //   num: 3,
			
 
				+    //   meta: { title: 'drugsSurplus', noCache: true }
			
 
				+    // },
			
 
				+    // {
			
 
				+    //   path: '/stock/drugs/stock/drugsExpiryDate',
			
 
				+    //   component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
			
 
				+    //   name: 'drugsExpiryDate',
			
 
				+    //   hidden: true,
			
 
				+    //   is_menu: false,
			
 
				+    //   num: 3,
			
 
				+    //   meta: { title: 'drugsExpiryDate', noCache: true }
			
 
				+    // },
			
 
				   ]
			
 
				 }
			
--- a/src/router/modules/weight_sign.js
+++ b/src/router/modules/weight_sign.js
@@ -3,8 +3,34 @@ import Layout from '@/views/layout/Layout'
 
				 export default {
			
 
				   path: '/sign',
			
 
				   component: Layout,
			
 
				-  redirct: '/sign/index',
			
 
				+  name:'signIndex',
			
 
				+  redirct: 'noredirect',
			
 
				+  meta: {
			
 
				+    title: 'signIndex',
			
 
				+    icon: 'signIndex',
			
 
				+    isChild: true
			
 
				+  },
			
 
				   children: [{
			
 
				+    path: '/signIn',
			
 
				+    component: () => import('@/xt_pages/sign/signIn'),
			
 
				+    name: 'signIn',
			
 
				+    meta: {
			
 
				+      title: 'signIn',
			
 
				+      icon: 'signIn',
			
 
				+      noCache: true
			
 
				+    }
			
 
				+  },
			
 
				+  {
			
 
				+    path: '/lineUp',
			
 
				+    component: () => import('@/xt_pages/sign/lineUp'),
			
 
				+    name: 'lineUp',
			
 
				+    meta: {
			
 
				+      title: 'lineUp',
			
 
				+      icon: 'lineUp',
			
 
				+      noCache: true
			
 
				+    }
			
 
				+  },
			
 
				+  {
			
 
				     path: '/sign',
			
 
				     component: () => import('@/xt_pages/sign/index'),
			
 
				     name: 'sign',
			
--- a/src/store/modules/xt_permission.js
+++ b/src/store/modules/xt_permission.js
@@ -41,7 +41,7 @@ function xt_filterAsyncRouter(routers) {
 
				 }
			
 
				 
			
 
				 function setupRouters(urls) {
			
 
				-  // console.log(urls)
			
 
				+  console.log(urls)
			
 
				   xt_asyncRouterMap.forEach(router => {
			
 
				     if (Object.prototype.toString.call(router.children) === '[object Array]') {
			
 
				       router.hidden = true
			
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -139,8 +139,9 @@ code {
 
				 .app-container {
			
 
				   padding: 20px;
			
 
				   background: #fff;
			
 
				-  margin: 0 15px 15px 15px;
			
 
				-  min-height: calc(100vh - 178px);
			
 
				+  margin: 10px 10px 5px 10px;
			
 
				+  // min-height: calc(100vh - 178px);
			
 
				+  min-height: calc(100vh - 118px);
			
 
				 }
			
 
				 
			
 
				 .components-container {
			
@@ -349,16 +350,19 @@ code {
 
				 }
			
 
				 
			
 
				 .position {
			
 
				-  background: #f6f8f9;
			
 
				+  background: #fff;
			
 
				   padding: 10px 20px;
			
 
				   display: flex;
			
 
				   align-items: center;
			
 
				   justify-content: space-between;
			
 
				-  height: 52px;
			
 
				+  height: 50px;
			
 
				+  border-top:1px solid #e5e5e5;
			
 
				+  border-bottom:1px solid #e5e5e5;
			
 
				 }
			
 
				 
			
 
				 // 筛选全局样式
			
 
				 .app-container {
			
 
				+  height:100%;
			
 
				   .cell.clearfix {
			
 
				     margin: 0px 0 12px 0;
			
 
				     display: flex;
			
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -3,21 +3,21 @@
 
				   .main-container {
			
 
				     min-height: 100%;
			
 
				     transition: margin-left 0.28s;
			
 
				-    margin-left: 150px;
			
 
				+    // margin-left: 150px;
			
 
				     position: relative;
			
 
				   }
			
 
				   // 侧边栏
			
 
				   .sidebar-container {
			
 
				-    transition: width 0.28s;
			
 
				-    width: 150px !important;
			
 
				-    height: 100%;
			
 
				-    position: fixed;
			
 
				-    font-size: 0px;
			
 
				-    // top: 60px;
			
 
				-    bottom: 0;
			
 
				-    left: 0;
			
 
				-    z-index: 1001;
			
 
				-    overflow: hidden;
			
 
				+    // transition: width 0.28s;
			
 
				+    // width: 150px !important;
			
 
				+    // height: 100%;
			
 
				+    // position: fixed;
			
 
				+    // font-size: 0px;
			
 
				+    // // top: 60px;
			
 
				+    // bottom: 0;
			
 
				+    // left: 0;
			
 
				+    // z-index: 1001;
			
 
				+    // overflow: hidden;
			
 
				     //reset element-ui css
			
 
				     .horizontal-collapse-transition {
			
 
				       transition: 0s width ease-in-out, 0s padding-left ease-in-out,
			
@@ -25,6 +25,8 @@
 
				     }
			
 
				     .scrollbar-wrapper {
			
 
				       overflow-x: hidden !important;
			
 
				+      width: 150px;
			
 
				+      border-right:1px solid #e5e5e5;
			
 
				       .el-scrollbar__view {
			
 
				         height: 96%;
			
 
				         .hamburger-container {
			
@@ -41,7 +43,7 @@
 
				     a {
			
 
				       display: inline-block;
			
 
				       width: 100%;
			
 
				-      overflow: hidden;
			
 
				+      // overflow: hidden;
			
 
				     }
			
 
				     .svg-icon {
			
 
				       margin-right: 6px;
			
@@ -93,14 +95,18 @@
 
				   .sidebar-container .nest-menu .el-submenu > .el-submenu__title,
			
 
				   .sidebar-container .el-submenu .el-menu-item {
			
 
				     // min-width: 180px !important;
			
 
				-    background-color: $subMenuBg !important;
			
 
				+    // background-color: $subMenuBg !important;
			
 
				     &:hover {
			
 
				-      background-color: $menuHover !important;
			
 
				+      // background-color: $menuHover !important;
			
 
				+      background-color: #eaebeb !important;
			
 
				     }
			
 
				   }
			
 
				   .el-menu--collapse .el-menu .el-submenu {
			
 
				     // min-width: 180px !important;
			
 
				   }
			
 
				+  .el-menu-item.is-active{
			
 
				+    background-color: #eaebeb !important;
			
 
				+  }
			
 
				 
			
 
				   //适配移动端
			
 
				   .mobile {
			
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -1,25 +1,103 @@
 
				 <template>
			
 
				   <div class="app-wrapper" :class="classObj">
			
 
				-    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
			
 
				-    <navbar></navbar>
			
 
				-
			
 
				-    <div class="Header-container">
			
 
				-      <sidebar class="sidebar-container" @callBackIndex="handleIndex"></sidebar>
			
 
				-      <!-- <sidebar class="newSide" @callBackIndex="handleIndex"></sidebar> -->
			
 
				-      <div class="main-container">
			
 
				-        <tags-view :index="index" :num="num"></tags-view>
			
 
				+    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
			
 
				+    
			
 
				+    <div class="mainBox">
			
 
				+      <div class="navLeft">
			
 
				+        <div :class="index == 0 ? 'navOne navActive' : 'navOne'" @click="clickActive(0,'门诊管理')">
			
 
				+          <i class="iconfont icon--yishengmenzhen navIcon"></i>
			
 
				+          <p>门诊管理</p>
			
 
				+        </div>
			
 
				+        <div :class="index == 1 ? 'navOne navActive' : 'navOne'" @click="clickActive(1,'电子病历')">
			
 
				+          <i class="iconfont icon-s_bingli navIcon"></i>
			
 
				+          <p>电子病历</p>
			
 
				+        </div>
			
 
				+        <div :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
			
 
				+          <i class="iconfont icon-computer_fill navIcon"></i>
			
 
				+          <p>透析管理</p>
			
 
				+        </div>
			
 
				+        <div :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库存管理')">
			
 
				+          <i class="iconfont icon-kccx navIcon"></i>
			
 
				+          <p>库存管理</p>
			
 
				+        </div>
			
 
				+        <div :class="index == 4 ? 'navOne navActive' : 'navOne'" @click="clickActive(4,'酷医商城')">
			
 
				+          <i class="iconfont icon-shangcheng-1 navIcon"></i>
			
 
				+          <p>酷医商城</p>
			
 
				+        </div>
			
 
				+        
			
 
				+        <div class="navOne" @click="open">
			
 
				+          <i class="iconfont icon-manage_fill navIcon"></i>
			
 
				+          <p>更多</p>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <sidebar :navTitle="navTitle" v-show="navShow" class="sidebar-container" @func="show"></sidebar>
			
 
				+      <div class="main-container new-main-container" style="flex:1;margin-top:50px;">
			
 
				+        <navbar></navbar>
			
 
				+        
			
 
				+        <!-- <tags-view></tags-view> -->
			
 
				         <app-main></app-main>
			
 
				       </div>
			
 
				     </div>
			
 
				+    <div class="dialogMadol" v-if="sign" @click="close"></div>
			
 
				+    <div class="dialogBox" v-if="sign">
			
 
				+      <div class="dialogBoxTitle">
			
 
				+        <span>更多菜单</span>
			
 
				+        <span @click="close">关闭</span>
			
 
				+      </div>
			
 
				+      <div class="dialogMain">
			
 
				+        <!-- <div class="dialogMainOne" @click="clickActive(5,'库存管理')">
			
 
				+          <div class="dialogIcon">
			
 
				+            <i class="el-icon-menu newIcon"></i>
			
 
				+          </div>
			
 
				+          <p>库存管理</p>
			
 
				+        </div> -->
			
 
				+        <a :href="CDMWebsit()" target="_blank" v-if="this.$store.getters.xt_user.cdm_role_exist">
			
 
				+          <div class="dialogMainOne">
			
 
				+            <div class="dialogIcon">
			
 
				+              <i class="iconfont icon-yiliao newIcon"></i>
			
 
				+            </div>
			
 
				+            <p>慢病管理</p>
			
 
				+          </div>
			
 
				+        </a>
			
 
				+        <a :href="SCRMWebsit()" target="_blank" v-if="this.$store.getters.xt_user.scrm_role_exist">
			
 
				+          <div class="dialogMainOne">
			
 
				+            <div class="dialogIcon">
			
 
				+              <i class="iconfont icon-yingxiao newIcon"></i>
			
 
				+            </div>
			
 
				+            <p>营销管理</p>
			
 
				+          </div>
			
 
				+        </a>
			
 
				+        <div class="dialogMainOne">
			
 
				+          <div class="dialogIcon">
			
 
				+            <i class="iconfont icon-shujufenxi-jingyinggaikuang newIcon"></i>
			
 
				+          </div>
			
 
				+          <p>经营中心</p>
			
 
				+        </div>
			
 
				+        <a :href="MircoMallWebsit()" target="_blank" v-if="this.$store.getters.xt_user.mall_role_exist">
			
 
				+          <div class="dialogMainOne">
			
 
				+            <div class="dialogIcon">
			
 
				+              <i class="iconfont icon-fenxiao newIcon"></i>
			
 
				+            </div>
			
 
				+            <p>分销商城</p>
			
 
				+          </div>
			
 
				+        </a>
			
 
				+        <div class="dialogMainOne" @click="clickActive(11,'配置管理')">
			
 
				+          <div class="dialogIcon">
			
 
				+            <i class="iconfont icon-setup_fill newIcon"></i>
			
 
				+          </div>
			
 
				+          <p>配置管理</p>
			
 
				+        </div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				-import { Navbar, Sidebar, AppMain, TagsView } from "./components";
			
 
				-import ResizeMixin from "./mixin/ResizeHandler";
			
 
				+import { Navbar, Sidebar, AppMain, TagsView } from './components'
			
 
				+import ResizeMixin from './mixin/ResizeHandler'
			
 
				 
			
 
				 export default {
			
 
				-  name: "layout",
			
 
				+  name: 'layout',
			
 
				   components: {
			
 
				     Navbar,
			
 
				     Sidebar,
			
@@ -27,73 +105,185 @@ export default {
 
				     TagsView
			
 
				   },
			
 
				   mixins: [ResizeMixin],
			
 
				+  data(){
			
 
				+    return{
			
 
				+      index:2,
			
 
				+      navTitle:'透析管理',
			
 
				+      sign:false,
			
 
				+      navShow:true
			
 
				+    }
			
 
				+  },
			
 
				   computed: {
			
 
				     sidebar() {
			
 
				-      return this.$store.state.app.sidebar;
			
 
				+      return this.$store.state.app.sidebar
			
 
				     },
			
 
				     device() {
			
 
				-      return this.$store.state.app.device;
			
 
				+      return this.$store.state.app.device
			
 
				     },
			
 
				     classObj() {
			
 
				       return {
			
 
				         hideSidebar: !this.sidebar.opened,
			
 
				         openSidebar: this.sidebar.opened,
			
 
				         withoutAnimation: this.sidebar.withoutAnimation,
			
 
				-        mobile: this.device === "mobile"
			
 
				-      };
			
 
				+        mobile: this.device === 'mobile'
			
 
				+      }
			
 
				     }
			
 
				   },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      index: 0,
			
 
				-      num: 1
			
 
				-    };
			
 
				-  },
			
 
				   methods: {
			
 
				     handleClickOutside() {
			
 
				-      this.$store.dispatch("closeSideBar", { withoutAnimation: false });
			
 
				+      this.$store.dispatch('closeSideBar', { withoutAnimation: false })
			
 
				+    },
			
 
				+    clickActive(index,title){
			
 
				+      if(index == 4){
			
 
				+        this.$router.push('/kuyiShopping')
			
 
				+      }else if(index == 6){
			
 
				+        this.CDMWebsit()
			
 
				+      }
			
 
				+      this.index = index
			
 
				+      this.navTitle = title
			
 
				+      this.sign = false
			
 
				+    },
			
 
				+    open(){
			
 
				+      this.sign = true
			
 
				+    },
			
 
				+    close(){
			
 
				+      this.sign = false
			
 
				+    },
			
 
				+    show(data){
			
 
				+      this.navShow = data
			
 
				+    },
			
 
				+    SCRMWebsit() {
			
 
				+      return process.env.SRCM_HOST;
			
 
				+    },
			
 
				+    MircoMallWebsit() {
			
 
				+      return process.env.MIRCO_MALL_HOST;
			
 
				+    },
			
 
				+    CDMWebsit() {
			
 
				+      return process.env.CDM_HOST;
			
 
				     },
			
 
				-    handleIndex(data, num) {
			
 
				-      // console.log({ prop: data });
			
 
				-      this.index = data;
			
 
				-      this.num = num;
			
 
				-    }
			
 
				   }
			
 
				-};
			
 
				+}
			
 
				 </script>
			
 
				 
			
 
				 <style rel="stylesheet/scss" lang="scss" scoped>
			
 
				-@import "src/styles/mixin.scss";
			
 
				-.app-wrapper {
			
 
				-  @include clearfix;
			
 
				-  // position: relative;
			
 
				-  height: 100%;
			
 
				-  width: 100%;
			
 
				-  // &.mobile.openSidebar{
			
 
				+  @import "src/styles/mixin.scss";
			
 
				+  .app-wrapper {
			
 
				+    @include clearfix;
			
 
				+    position: relative;
			
 
				+    height: 100%;
			
 
				+    width: 100%;
			
 
				+    &.mobile.openSidebar{
			
 
				+      position: fixed;
			
 
				+      top: 0;
			
 
				+    }
			
 
				+  }
			
 
				+  .drawer-bg {
			
 
				+    background: #000;
			
 
				+    opacity: 0.3;
			
 
				+    width: 100%;
			
 
				+    top: 0;
			
 
				+    height: 100%;
			
 
				+    position: absolute;
			
 
				+    z-index: 999;
			
 
				+  }
			
 
				+  // .sidebar-container{
			
 
				   //   position: fixed;
			
 
				-  //   top: 0;
			
 
				+  //   top:50px;
			
 
				+  //   left:0;
			
 
				   // }
			
 
				-}
			
 
				-.drawer-bg {
			
 
				-  background: #000;
			
 
				-  opacity: 0.3;
			
 
				-  width: 100%;
			
 
				-  top: 0;
			
 
				-  height: 100%;
			
 
				-  position: absolute;
			
 
				-  z-index: 999;
			
 
				-}
			
 
				-.newSide {
			
 
				-  width: 150px !important;
			
 
				-  height: 100%;
			
 
				-  position: fixed;
			
 
				-  top: 60px;
			
 
				-  bottom: 0;
			
 
				-  left: 0;
			
 
				-  z-index: 1001;
			
 
				-  overflow: hidden;
			
 
				-}
			
 
				-</style>
			
 
				-<style lang="scss">
			
 
				-
			
 
				+  .navLeft{
			
 
				+    width:80px;
			
 
				+    height:100%;
			
 
				+    background: #1F2D3D;
			
 
				+    margin-top:50px;
			
 
				+    .navOne{
			
 
				+      width:80px;
			
 
				+      height:80px;
			
 
				+      color:#BFCBD9;
			
 
				+      display: flex;
			
 
				+      align-items: center;
			
 
				+      flex-direction: column;
			
 
				+      cursor: pointer;
			
 
				+      .navIcon{
			
 
				+        margin: 16px 0 10px 0;
			
 
				+        font-size: 24px;
			
 
				+      }
			
 
				+    }
			
 
				+    .navActive{
			
 
				+      background: #409EFF;
			
 
				+      color:#fff;
			
 
				+    }
			
 
				+  }
			
 
				+  .mainBox{
			
 
				+    display:flex;
			
 
				+    width:100%;
			
 
				+    height:calc(100% - 50px)
			
 
				+  }
			
 
				+  #app .sidebar-container {
			
 
				+    width: 150px !important;
			
 
				+    height: 100%;
			
 
				+    margin-top:50px;
			
 
				+    overflow: visible;
			
 
				+    background-color: #fff;
			
 
				+  }
			
 
				+  .dialogBox{
			
 
				+    width: 392px;
			
 
				+    height: 400px;
			
 
				+    background: #304155;
			
 
				+    position: fixed;
			
 
				+    bottom:0;
			
 
				+    left:80px;
			
 
				+    z-index:4000;
			
 
				+    .dialogBoxTitle{
			
 
				+      display: flex;
			
 
				+      justify-content: space-between;
			
 
				+      padding:0 16px;
			
 
				+      border-bottom:1px solid #BFCBD9;
			
 
				+      height:44px;
			
 
				+      align-items: center;
			
 
				+      color:#BFCBD9;
			
 
				+      >:last-child{
			
 
				+        cursor: pointer;
			
 
				+      }
			
 
				+    }
			
 
				+    .dialogMain{
			
 
				+      display: flex;
			
 
				+      flex-wrap: wrap;
			
 
				+    }
			
 
				+    .dialogMainOne{
			
 
				+      color:#BFCBD9;
			
 
				+      display: flex;
			
 
				+      align-items: center;
			
 
				+      flex-direction: column;
			
 
				+      margin: 16px;
			
 
				+      .dialogIcon{
			
 
				+        width: 66px;
			
 
				+        height: 66px;
			
 
				+        background: rgba(64, 158, 255, 0.2);
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+        margin-bottom: 10px;
			
 
				+      }
			
 
				+      .newIcon{
			
 
				+        margin: 0 auto;
			
 
				+        font-size: 24px;
			
 
				+      }
			
 
				+      >p{
			
 
				+        font-size: 14px;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+  .dialogMadol{
			
 
				+    position: fixed;
			
 
				+    left: 0;
			
 
				+    top: 0;
			
 
				+    width: 100%;
			
 
				+    height: 100%;
			
 
				+    opacity: .5;
			
 
				+    background: #000;
			
 
				+    z-index: 3000;
			
 
				+  }
			
 
				+  .new-main-container{
			
 
				+    width: calc(100% - 220px);
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -1,5 +1,5 @@
 
				 <template>
			
 
				-  <section class="app-main">
			
 
				+  <section class="app-main new-app-main">
			
 
				     <transition name="fade-transform" mode="out-in">
			
 
				       <keep-alive :include="cachedViews">
			
 
				         <router-view :key="key"></router-view>
			
@@ -25,11 +25,16 @@ export default {
 
				 <style scoped>
			
 
				 .app-main {
			
 
				   /*84 = navbar + tags-view = 50 +34 */
			
 
				-  min-height: calc(100vh - 120px);
			
 
				+  /* min-height: calc(100vh - 120px); */
			
 
				   position: relative;
			
 
				-  overflow: hidden;
			
 
				-  margin-top: 40px;
			
 
				+  /* overflow: hidden; */
			
 
				+  /* margin-top: 40px; */
			
 
				   background: #f6f8f9;
			
 
				+  height:100%;
			
 
				+  overflow: auto;
			
 
				+}
			
 
				+.new-app-main{
			
 
				+  height:100%;
			
 
				 }
			
 
				 </style>
			
 
				 
			
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -63,21 +63,26 @@
 
				 
			
 
				       </div>
			
 
				     </el-menu>-->
			
 
				-    <div class="dropdownBox">
			
 
				-      <el-dropdown trigger="click" @command="handleOrgCommand">
			
 
				-        <span class="el-dropdown-link">
			
 
				-          {{ org_name }}
			
 
				-          <i class="el-icon-arrow-down el-icon--right"></i>
			
 
				-        </span>
			
 
				-        <el-dropdown-menu slot="dropdown">
			
 
				-          <el-dropdown-item
			
 
				-            v-for="(item, index) in orgs"
			
 
				-            :key="index"
			
 
				-            :command="item.id"
			
 
				-            >{{ item.org_name }}</el-dropdown-item
			
 
				-          >
			
 
				-        </el-dropdown-menu>
			
 
				-      </el-dropdown>
			
 
				+    <div style="display:flex;align-items: center;">
			
 
				+      <div class="nav-logo">
			
 
				+        <img :src="require(`../../../assets/logo/logo2.png`)" alt="">
			
 
				+      </div>
			
 
				+      <div class="dropdownBox">
			
 
				+        <el-dropdown trigger="click" @command="handleOrgCommand">
			
 
				+          <span class="el-dropdown-link">
			
 
				+            {{ org_name }}
			
 
				+            <i class="el-icon-arrow-down el-icon--right"></i>
			
 
				+          </span>
			
 
				+          <el-dropdown-menu slot="dropdown">
			
 
				+            <el-dropdown-item
			
 
				+              v-for="(item, index) in orgs"
			
 
				+              :key="index"
			
 
				+              :command="item.id"
			
 
				+              >{{ item.org_name }}</el-dropdown-item
			
 
				+            >
			
 
				+          </el-dropdown-menu>
			
 
				+        </el-dropdown>
			
 
				+      </div>
			
 
				     </div>
			
 
				     <div class="navRight">
			
 
				       <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
			
@@ -300,17 +305,17 @@ export default {
 
				 
			
 
				 <style rel="stylesheet/scss" lang="scss" scoped>
			
 
				 .top-nav {
			
 
				-  background: #409eff;
			
 
				+  background: #fff;
			
 
				   position: fixed;
			
 
				   top: 0;
			
 
				-  left: 150px;
			
 
				+  left: 0px;
			
 
				   right: 0;
			
 
				   z-index: 1000;
			
 
				   height: 50px;
			
 
				   display: flex;
			
 
				   align-items: center;
			
 
				   justify-content: space-between;
			
 
				-  color: #fff;
			
 
				+  color: #666666;
			
 
				   .dropdownBox {
			
 
				     margin-left: 10px;
			
 
				   }
			
@@ -325,7 +330,7 @@ export default {
 
				       float: right;
			
 
				       height: 100%;
			
 
				       z-index: 99999;
			
 
				-      color: #fff;
			
 
				+      color: #666666;
			
 
				       & :focus {
			
 
				         outline: none;
			
 
				       }
			
@@ -371,12 +376,12 @@ export default {
 
				           .user-title {
			
 
				             margin: 0 8px;
			
 
				             font-size: 14px;
			
 
				-            color: #fff;
			
 
				+            color: #666666;
			
 
				           }
			
 
				 
			
 
				           .el-icon-caret-bottom {
			
 
				             font-size: 12px;
			
 
				-            color: #fff;
			
 
				+            color: #666666;
			
 
				           }
			
 
				         }
			
 
				       }
			
@@ -384,13 +389,13 @@ export default {
 
				   }
			
 
				 
			
 
				   .nav-logo {
			
 
				-    width: 162px;
			
 
				+    width: 140px;
			
 
				     display: flex;
			
 
				     align-items: center;
			
 
				-    height: 60px;
			
 
				+    // height: 60px;
			
 
				     text-align: center;
			
 
				     justify-content: center;
			
 
				-    padding: 10px 0;
			
 
				+    // padding: 10px 0;
			
 
				     box-sizing: border-box;
			
 
				     float: left;
			
 
				 
			
@@ -469,12 +474,12 @@ export default {
 
				           .user-title {
			
 
				             margin: 0 8px;
			
 
				             font-size: 14px;
			
 
				-            color: #fff;
			
 
				+            color: #666666;
			
 
				           }
			
 
				 
			
 
				           .el-icon-caret-bottom {
			
 
				             font-size: 12px;
			
 
				-            color: #fff;
			
 
				+            color: #666666;
			
 
				           }
			
 
				         }
			
 
				       }
			
@@ -532,7 +537,7 @@ export default {
 
				 .dropdownBox {
			
 
				   .el-dropdown-link {
			
 
				     font-size: 14px;
			
 
				-    color: #fff;
			
 
				+    color: #666;
			
 
				   }
			
 
				 }
			
 
				 </style>
			
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -1,283 +1,80 @@
 
				 <template>
			
 
				-  <div v-if="!item.hidden && item.children" class="menu-wrapper">
			
 
				-    <div v-if="item.other">
			
 
				-      <a :href="item.src" target="_blank">
			
 
				-        <el-menu-item
			
 
				-          :index="resolvePath(item.src)"
			
 
				-          :class="{ 'submenu-title-noDropdown': !isNest }"
			
 
				-        >
			
 
				-          <i
			
 
				-            v-if="item.name == 'slow'"
			
 
				-            class="icon iconfont icon-manbing-xuanzhong"
			
 
				-            style="margin-right: 4px;"
			
 
				-          ></i>
			
 
				-          <i
			
 
				-            v-if="item.name == 'scrm'"
			
 
				-            class="icon iconfont icon-pengyou"
			
 
				-            style="margin-right: 4px;"
			
 
				-          ></i>
			
 
				-          <i
			
 
				-            v-if="item.name == 'shop'"
			
 
				-            class="icon iconfont icon-service_fill"
			
 
				-            style="margin-right: 4px;"
			
 
				-          ></i>
			
 
				-          <span slot="title">{{ generateTitle(item.name) }}</span>
			
 
				-        </el-menu-item>
			
 
				-      </a>
			
 
				-    </div>
			
 
				-    <div v-else>
			
 
				-      <div
			
 
				-        v-if="
			
 
				-          hasOneShowingChild(item.children) &&
			
 
				-          !onlyOneChild.children &&
			
 
				-          !item.alwaysShow
			
 
				-        "
			
 
				-        @click="onClick(item)"
			
 
				-      >
			
 
				-        <router-link :to="resolvePath(onlyOneChild.path)">
			
 
				-          <el-menu-item
			
 
				-            :index="resolvePath(onlyOneChild.path)"
			
 
				-            :class="{ 'submenu-title-noDropdown': !isNest }"
			
 
				-          >
			
 
				-            <svg-icon
			
 
				-              v-if="onlyOneChild.meta && onlyOneChild.meta.icon"
			
 
				-              :icon-class="onlyOneChild.meta.icon"
			
 
				-            ></svg-icon>
			
 
				-            <span
			
 
				-              v-if="onlyOneChild.meta && onlyOneChild.meta.title"
			
 
				-              slot="title"
			
 
				-              >{{ generateTitle(onlyOneChild.meta.title) }}</span
			
 
				-            >
			
 
				-          </el-menu-item>
			
 
				-        </router-link>
			
 
				-      </div>
			
 
				+  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
			
 
				 
			
 
				-      <div v-else>
			
 
				-        <el-submenu
			
 
				-          v-if="item.meta.isChild"
			
 
				-          id="mySubmenu"
			
 
				-          :index="item.name || item.path"
			
 
				-        >
			
 
				-          <template slot="title">
			
 
				-            <svg-icon
			
 
				-              v-if="item.meta && item.meta.icon"
			
 
				-              :icon-class="item.meta.icon"
			
 
				-            ></svg-icon>
			
 
				-            <span v-if="item.meta && item.meta.title" slot="title">
			
 
				-              {{ generateTitle(item.meta.title) }}
			
 
				-            </span>
			
 
				-          </template>
			
 
				-          <template v-for="child in item.children" v-if="!child.hidden">
			
 
				-            <router-link
			
 
				-              :to="resolvePath(child.path)"
			
 
				-              v-if="child.meta.isChild != true"
			
 
				-              :key="child.name"
			
 
				-            >
			
 
				-              <el-menu-item
			
 
				-                @click="onClick(item)"
			
 
				-                :index="resolvePath(child.path)"
			
 
				-              >
			
 
				-                <svg-icon
			
 
				-                  v-if="child.meta && child.meta.icon"
			
 
				-                  :icon-class="child.meta.icon"
			
 
				-                ></svg-icon>
			
 
				-                <span v-if="child.meta && child.meta.title" slot="title">
			
 
				-                  {{ generateTitle(child.meta.title) }}
			
 
				-                </span>
			
 
				-              </el-menu-item>
			
 
				-            </router-link>
			
 
				+      <router-link v-if="hasOneShowingChild(item.children) && !onlyOneChild.children&&!item.alwaysShow" :to="resolvePath(onlyOneChild.path)">
			
 
				+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
			
 
				+          <!-- <svg-icon v-if="onlyOneChild.meta&&onlyOneChild.meta.icon" :icon-class="onlyOneChild.meta.icon"></svg-icon> -->
			
 
				+          <span v-if="onlyOneChild.meta&&onlyOneChild.meta.title" slot="title">{{generateTitle(onlyOneChild.meta.title)}}</span>
			
 
				+        </el-menu-item>
			
 
				+      </router-link>
			
 
				 
			
 
				-            <router-link
			
 
				-              v-if="child.meta.isChild == true"
			
 
				-              :to="child.path"
			
 
				-              :key="child.name"
			
 
				-            >
			
 
				-              <el-menu-item
			
 
				-                @click="onClick(item, child.parentNum)"
			
 
				-                :index="resolvePath(child.path)"
			
 
				-              >
			
 
				-                <svg-icon
			
 
				-                  v-if="child.meta && child.meta.icon"
			
 
				-                  :icon-class="child.meta.icon"
			
 
				-                ></svg-icon>
			
 
				-                <span v-if="child.meta && child.meta.title" slot="title">
			
 
				-                  {{ generateTitle(child.meta.title) }}
			
 
				-                </span>
			
 
				-              </el-menu-item>
			
 
				-            </router-link>
			
 
				-          </template>
			
 
				-        </el-submenu>
			
 
				-        <div v-else @click="onClick(item)">
			
 
				-          <router-link :to="resolvePath(item.children[0].path)">
			
 
				-            <el-menu-item :index="item.name || item.path">
			
 
				-              <template slot="title">
			
 
				-                <svg-icon
			
 
				-                  v-if="item.meta && item.meta.icon"
			
 
				-                  :icon-class="item.meta.icon"
			
 
				-                ></svg-icon>
			
 
				-                <span v-if="item.meta && item.meta.title" slot="title">
			
 
				-                  {{ generateTitle(item.meta.title) }}
			
 
				-                </span>
			
 
				-              </template>
			
 
				+      <el-submenu v-else :index="item.name||item.path">
			
 
				+        <template slot="title">
			
 
				+          <!-- <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon> -->
			
 
				+          <span v-if="item.meta&&item.meta.title" slot="title">{{generateTitle(item.meta.title)}}</span>
			
 
				+        </template>
			
 
				 
			
 
				-              <!-- <template v-for="child in item.children" v-if="!child.hidden">
			
 
				-                <sidebar-item
			
 
				-                  :is-nest="true"
			
 
				-                  class="nest-menu"
			
 
				-                  v-if="child.children && child.children.length > 0"
			
 
				-                  :item="child"
			
 
				-                  :key="child.path"
			
 
				-                  :base-path="resolvePath(child.path)"
			
 
				-                ></sidebar-item>
			
 
				+        <template v-for="child in item.children" v-if="!child.hidden">
			
 
				+          <sidebar-item :is-nest="true" class="nest-menu" v-if="child.children&&child.children.length>0" :item="child" :key="child.path" :base-path="resolvePath(child.path)"></sidebar-item>
			
 
				 
			
 
				-                <router-link
			
 
				-                  v-else
			
 
				-                  :to="resolvePath(child.path)"
			
 
				-                  :key="child.name"
			
 
				-                >
			
 
				-                  <el-menu-item :index="resolvePath(child.path)">
			
 
				-                    <svg-icon
			
 
				-                      v-if="child.meta && child.meta.icon"
			
 
				-                      :icon-class="child.meta.icon"
			
 
				-                    ></svg-icon>
			
 
				-                    <span v-if="child.meta && child.meta.title" slot="title">{{
			
 
				-                      generateTitle(child.meta.title)
			
 
				-                    }}</span>
			
 
				-                  </el-menu-item>
			
 
				-                </router-link>
			
 
				-              </template> -->
			
 
				+          <router-link v-else :to="resolvePath(child.path)" :key="child.name">
			
 
				+            <el-menu-item :index="resolvePath(child.path)">
			
 
				+              <!-- <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"></svg-icon> -->
			
 
				+              <span v-if="child.meta&&child.meta.title" slot="title">&nbsp;&nbsp;{{generateTitle(child.meta.title)}}</span>
			
 
				             </el-menu-item>
			
 
				           </router-link>
			
 
				-        </div>
			
 
				-      </div>
			
 
				-    </div>
			
 
				+        </template>
			
 
				+      </el-submenu>
			
 
				+
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				-import path from "path";
			
 
				-import { generateTitle } from "@/utils/i18n";
			
 
				-import { mapGetters } from "vuex";
			
 
				+import path from 'path'
			
 
				+import { generateTitle } from '@/utils/i18n'
			
 
				 
			
 
				 export default {
			
 
				-  name: "SidebarItem",
			
 
				+  name: 'SidebarItem',
			
 
				   props: {
			
 
				     // route object
			
 
				     item: {
			
 
				       type: Object,
			
 
				-      required: true,
			
 
				+      required: true
			
 
				     },
			
 
				     isNest: {
			
 
				       type: Boolean,
			
 
				-      default: false,
			
 
				+      default: false
			
 
				     },
			
 
				     basePath: {
			
 
				       type: String,
			
 
				-      default: "",
			
 
				-    },
			
 
				-    index: {
			
 
				-      type: Number,
			
 
				-    },
			
 
				-  },
			
 
				-  computed: {
			
 
				-    ...mapGetters(["permission_routers"]),
			
 
				+      default: ''
			
 
				+    }
			
 
				   },
			
 
				   data() {
			
 
				     return {
			
 
				-      onlyOneChild: null,
			
 
				-    };
			
 
				+      onlyOneChild: null
			
 
				+    }
			
 
				   },
			
 
				   methods: {
			
 
				     hasOneShowingChild(children) {
			
 
				-      const showingChildren = children.filter((item) => {
			
 
				+      const showingChildren = children.filter(item => {
			
 
				         if (item.hidden) {
			
 
				-          return false;
			
 
				+          return false
			
 
				         } else {
			
 
				           // temp set(will be used if only has one showing child )
			
 
				-          this.onlyOneChild = item;
			
 
				-          return true;
			
 
				+          this.onlyOneChild = item
			
 
				+          return true
			
 
				         }
			
 
				-      });
			
 
				+      })
			
 
				       if (showingChildren.length === 1) {
			
 
				-        return true;
			
 
				+        return true
			
 
				       }
			
 
				-      return false;
			
 
				+      return false
			
 
				     },
			
 
				     resolvePath(...paths) {
			
 
				-      return path.resolve(this.basePath, ...paths);
			
 
				+      return path.resolve(this.basePath, ...paths)
			
 
				     },
			
 
				-    generateTitle,
			
 
				-    onClick(index, num) {
			
 
				-      this.permission_routers.map((item, i) => {
			
 
				-        if (this.isObjectValueEqual(item, index)) {
			
 
				-          if (num) {
			
 
				-            this.$emit("a", i, num);
			
 
				-          } else {
			
 
				-            this.$emit("a", i, 999);
			
 
				-          }
			
 
				-        }
			
 
				-      });
			
 
				-    },
			
 
				-    isObjectValueEqual(a, b) {
			
 
				-      var aProps = Object.getOwnPropertyNames(a);
			
 
				-      var bProps = Object.getOwnPropertyNames(b);
			
 
				-
			
 
				-      if (aProps.length != bProps.length) {
			
 
				-        return false;
			
 
				-      }
			
 
				-
			
 
				-      for (var i = 0; i < aProps.length; i++) {
			
 
				-        var propName = aProps[i];
			
 
				-
			
 
				-        if (a[propName] !== b[propName]) {
			
 
				-          return false;
			
 
				-        }
			
 
				-      }
			
 
				-
			
 
				-      return true;
			
 
				-    },
			
 
				-  },
			
 
				-  created() {
			
 
				-    console.log(this.permission_routers);
			
 
				-  },
			
 
				-};
			
 
				-</script>
			
 
				-
			
 
				-<style lang="scss">
			
 
				-#mySubmenu {
			
 
				-  .el-menu {
			
 
				-    display: flex;
			
 
				-    flex-wrap: wrap;
			
 
				-    > a {
			
 
				-      width: 50% !important;
			
 
				-    }
			
 
				-    .el-menu-item {
			
 
				-      min-width: 0;
			
 
				-      padding: 0 5px !important;
			
 
				-      font-size: 12px;
			
 
				-      background-color: #1f2d3d !important;
			
 
				-    }
			
 
				+    generateTitle
			
 
				   }
			
 
				 }
			
 
				-.menu-wrapper {
			
 
				-  .el-menu-item {
			
 
				-    background-color: #1f2d3d !important;
			
 
				-    color: #fff !important;
			
 
				-  }
			
 
				-  .el-menu {
			
 
				-    background-color: #1f2d3d !important;
			
 
				-  }
			
 
				-  .el-submenu__title {
			
 
				-    background-color: #1f2d3d !important;
			
 
				-    color: #fff !important;
			
 
				-    height: 32px !important;
			
 
				-    line-height: 32px !important;
			
 
				-  }
			
 
				-  .router-link-exact-active {
			
 
				-    color: rgb(64, 158, 255) !important;
			
 
				-    .el-menu-item {
			
 
				-      color: rgb(64, 158, 255) !important;
			
 
				-    }
			
 
				-  }
			
 
				-}
			
 
				-</style>
			
 
				+</script>
			
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,257 +1,232 @@
 
				 <template>
			
 
				   <el-scrollbar wrapClass="scrollbar-wrapper">
			
 
				-    <!-- <div class="sideColumn">
			
 
				-      <hamburger
			
 
				-        class="hamburger-container"
			
 
				-        :toggleClick="toggleSideBar"
			
 
				-        :isActive="sidebar.opened"
			
 
				-      ></hamburger>
			
 
				-    </div>-->
			
 
				-    <!-- <el-menu
			
 
				-      mode="vertical"
			
 
				-      :unique-opened="uniqueOpened"
			
 
				-      :show-timeout="200"
			
 
				-      :default-active="$route.path"
			
 
				-      :collapse="isCollapse"
			
 
				-      background-color="#304156"
			
 
				-      text-color="#bfcbd9"
			
 
				-      active-text-color="#409EFF"
			
 
				-    >-->
			
 
				-    <div class="logo">
			
 
				-      <img src="../../../../assets/logo/logo1.png" alt />
			
 
				+    <div class="sideColumn">
			
 
				+       <!-- <hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>       -->
			
 
				+       {{ navTitle }}
			
 
				     </div>
			
 
				     <el-menu
			
 
				       mode="vertical"
			
 
				       :unique-opened="uniqueOpened"
			
 
				       :show-timeout="200"
			
 
				       :default-active="$route.path"
			
 
				-      background-color="#304156"
			
 
				-      text-color="#bfcbd9"
			
 
				-      active-text-color="#409EFF"
			
 
				+      background-color="#f3f5f6"
			
 
				+      text-color="#000"
			
 
				+      active-text-color="#000"
			
 
				     >
			
 
				-      <sidebar-item
			
 
				-        v-for="(route, index) in permission_routers"
			
 
				-        :key="route.name"
			
 
				-        :item="route"
			
 
				-        :base-path="route.path"
			
 
				-        :index="index"
			
 
				-        @a="b"
			
 
				-      ></sidebar-item>
			
 
				-    <!-- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
			
 
				-      <a :href="CDMWebsit()">
			
 
				-        <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
			
 
				-        <span
			
 
				-          slot="title"
			
 
				-        >慢病管理</span>
			
 
				-      </a>
			
 
				-    </el-menu-item>
			
 
				-      <el-menu-item v-if="this.$store.getters.xt_user.scrm_role_exist" index="101">
			
 
				-        <a :href="SCRMWebsit()">
			
 
				-          <i class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
			
 
				-          <span
			
 
				-            slot="title"
			
 
				-          >SCRM</span>
			
 
				-        </a>
			
 
				-      </el-menu-item>
			
 
				-      <el-menu-item v-if="this.$store.getters.xt_user.mall_role_exist" index="102">
			
 
				-        <a :href="MircoMallWebsit()">
			
 
				-          <i class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
			
 
				-          <span
			
 
				-            slot="title"
			
 
				-          >分销商城</span>
			
 
				-        </a>
			
 
				-      </el-menu-item> -->
			
 
				+      <sidebar-item v-for="route in arr" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
			
 
				     </el-menu>
			
 
				-
			
 
				   </el-scrollbar>
			
 
				-  <!-- <div class="mianLeft">
			
 
				-    <div class="logo">
			
 
				-      <img src="/static/img/logo.8dbb9fd.png" alt="" />
			
 
				-    </div>
			
 
				-    <div class="navBox">
			
 
				-      <div
			
 
				-        class="navOne"
			
 
				-        :class="activeClass == index ? 'active' : ''"
			
 
				-        v-for="(item, index) in permission_routers"
			
 
				-        :key="item.name"
			
 
				-        v-if="!item.hidden && item.children"
			
 
				-      >
			
 
				-        <div v-if="item.meta" @click="onClick(index)" class="one">
			
 
				-          <router-link :to="item.children[0].path">
			
 
				-          <svg-icon
			
 
				-            v-if="item.meta && item.meta.icon"
			
 
				-            :icon-class="item.meta.icon"
			
 
				-          ></svg-icon>
			
 
				-          <p v-if="item.meta && item.meta.title">
			
 
				-            {{ generateTitle(item.meta.title) }}
			
 
				-          </p>
			
 
				-          </router-link>
			
 
				-        </div>
			
 
				-
			
 
				-        <div v-else @click="onClick(index)">
			
 
				-          <router-link :to="item.children[0].path" class="one">
			
 
				-            <svg-icon :icon-class="item.children[0].meta.icon"></svg-icon>
			
 
				-            <p>
			
 
				-              {{ generateTitle(item.children[0].meta.title) }}
			
 
				-            </p>
			
 
				-          </router-link>
			
 
				-        </div>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-  </div>-->
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 import { mapGetters } from "vuex";
			
 
				 import SidebarItem from "./SidebarItem";
			
 
				 import Hamburger from "@/components/Hamburger";
			
 
				-import { generateTitle } from "@/utils/i18n";
			
 
				+
			
 
				 
			
 
				 export default {
			
 
				-  components: { SidebarItem, Hamburger },
			
 
				+  props:{
			
 
				+    navTitle:String
			
 
				+  },
			
 
				+  components: { SidebarItem,Hamburger },
			
 
				   computed: {
			
 
				     ...mapGetters(["permission_routers", "sidebar"]),
			
 
				     isCollapse() {
			
 
				       return !this.sidebar.opened;
			
 
				     }
			
 
				   },
			
 
				-  data() {
			
 
				-    return {
			
 
				-      uniqueOpened: true,
			
 
				-      activeClass: 0,
			
 
				-      index: 0
			
 
				-    };
			
 
				+  data(){
			
 
				+    return{
			
 
				+      uniqueOpened:true,
			
 
				+      arr:[]
			
 
				+    }
			
 
				   },
			
 
				-  methods: {
			
 
				+  methods:{
			
 
				     toggleSideBar() {
			
 
				       this.$store.dispatch("toggleSideBar");
			
 
				     },
			
 
				-    generateTitle,
			
 
				-    resolvePath(...paths) {
			
 
				-      return path.resolve(this.basePath, ...paths);
			
 
				-    },
			
 
				-    b(index, num) {
			
 
				-      // this.index = index;
			
 
				-      // this.activeClass = index;
			
 
				-      this.$emit("callBackIndex", index, num);
			
 
				-    },
			
 
				-    CDMWebsit() {
			
 
				-      return process.env.CDM_HOST;
			
 
				-    },
			
 
				-    SCRMWebsit() {
			
 
				-      return process.env.SRCM_HOST;
			
 
				-    },
			
 
				-    MircoMallWebsit() {
			
 
				-      return process.env.MIRCO_MALL_HOST;
			
 
				-    },
			
 
				   },
			
 
				-  created() {
			
 
				-    // console.log(1111111121121111111, this.permission_routers);
			
 
				-    // this.permission_routers.map(item => {
			
 
				-    //   console.log(item.children);
			
 
				-    // });
			
 
				+  created(){
			
 
				+    if(this.navTitle == '透析管理'){
			
 
				+      let nameArr = ['workforce','dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
			
 
				+      console.log('permission_routers',this.permission_routers)
			
 
				+      let routerArr = []
			
 
				+      this.permission_routers.map(item => {
			
 
				+        if(nameArr.indexOf(item.name) > -1){
			
 
				+          routerArr.push(item)
			
 
				+        }
			
 
				+      })
			
 
				+      this.arr = routerArr
			
 
				+    }else if(this.navTitle == '电子病历'){
			
 
				+      this.arr = []
			
 
				+    }
			
 
				+    
			
 
				+    // let a = this.permission_routers
			
 
				+    // this.arr = a.slice(0,10)
			
 
				+    // console.log('this.arr',this.arr)
			
 
				+  },
			
 
				+  watch:{
			
 
				+    navTitle:{
			
 
				+      handler(newVal,oldVal){
			
 
				+        if(newVal == '门诊管理'){
			
 
				+          let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
			
 
				+          console.log('permission_routers',this.permission_routers)
			
 
				+          let routerArr = []
			
 
				+          this.permission_routers.map(item => {
			
 
				+            if(nameArr.indexOf(item.name) > -1){
			
 
				+              routerArr.push(item)
			
 
				+            }
			
 
				+          })
			
 
				+          this.arr = routerArr
			
 
				+          if(this.arr.length > 0){
			
 
				+            let a = true
			
 
				+            this.$emit('func',a)
			
 
				+          }else{
			
 
				+            let a = false
			
 
				+            this.$emit('func',a)
			
 
				+          }
			
 
				+        }else if(newVal == '电子病历'){
			
 
				+          let nameArr = ['User','createPatient']
			
 
				+          console.log('permission_routers',this.permission_routers)
			
 
				+          let routerArr = []
			
 
				+          this.permission_routers.map(item => {
			
 
				+            if(nameArr.indexOf(item.name) > -1){
			
 
				+              routerArr.push(item)
			
 
				+            }
			
 
				+          })
			
 
				+          this.arr = routerArr
			
 
				+          if(this.arr.length > 0){
			
 
				+            let a = true
			
 
				+            this.$emit('func',a)
			
 
				+          }else{
			
 
				+            let a = false
			
 
				+            this.$emit('func',a)
			
 
				+          }
			
 
				+        }else if(newVal == '透析管理'){
			
 
				+          let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
			
 
				+          console.log('permission_routers',this.permission_routers)
			
 
				+          let routerArr = []
			
 
				+          this.permission_routers.map(item => {
			
 
				+            if(nameArr.indexOf(item.name) > -1){
			
 
				+              routerArr.push(item)
			
 
				+            }
			
 
				+          })
			
 
				+          console.log('routerArr',routerArr)
			
 
				+          this.arr = routerArr
			
 
				+          if(this.arr.length > 0){
			
 
				+            let a = true
			
 
				+            this.$emit('func',a)
			
 
				+          }else{
			
 
				+            let a = false
			
 
				+            this.$emit('func',a)
			
 
				+          }
			
 
				+        }else if(newVal == '库存管理'){
			
 
				+          let nameArr = ['stockManage','selfPreparedMedicine','stockDrugs','otherManagement']
			
 
				+          console.log('permission_routers',this.permission_routers)
			
 
				+          let routerArr = []
			
 
				+          this.permission_routers.map(item => {
			
 
				+            if(nameArr.indexOf(item.name) > -1){
			
 
				+              routerArr.push(item)
			
 
				+            }
			
 
				+          })
			
 
				+          this.arr = routerArr
			
 
				+          if(this.arr.length > 0){
			
 
				+            let a = true
			
 
				+            this.$emit('func',a)
			
 
				+          }else{
			
 
				+            let a = false
			
 
				+            this.$emit('func',a)
			
 
				+          }
			
 
				+        }else if(newVal == '配置管理'){
			
 
				+          let nameArr = ['system','roleManage','dictionary','specialDictionary','template','prescription','druguse','showconfig','printTemplate']
			
 
				+          console.log('permission_routers',this.permission_routers)
			
 
				+          let routerArr = []
			
 
				+          this.permission_routers.map(item => {
			
 
				+            if(nameArr.indexOf(item.name) > -1){
			
 
				+              routerArr.push(item)
			
 
				+            }
			
 
				+          })
			
 
				+          this.arr = routerArr
			
 
				+          if(this.arr.length > 0){
			
 
				+            let a = true
			
 
				+            this.$emit('func',a)
			
 
				+          }else{
			
 
				+            let a = false
			
 
				+            this.$emit('func',a)
			
 
				+          }
			
 
				+        }else {
			
 
				+          this.arr = []
			
 
				+          if(this.arr.length > 0){
			
 
				+            let a = true
			
 
				+            this.$emit('func',a)
			
 
				+          }else{
			
 
				+            let a = false
			
 
				+            this.$emit('func',a)
			
 
				+          }
			
 
				+        }
			
 
				+      },
			
 
				+      deep:true,
			
 
				+      immediate: true
			
 
				+    }
			
 
				   }
			
 
				 };
			
 
				 </script>
			
 
				 
			
 
				-<style rel="stylesheet/scss" lang="scss" scoped>
			
 
				-.mianLeft {
			
 
				-  width: 150px;
			
 
				-  height: 100%;
			
 
				-  overflow-y: auto;
			
 
				-  background: #304155;
			
 
				-
			
 
				-  .navBox {
			
 
				-    display: flex;
			
 
				-    flex-wrap: wrap;
			
 
				-    .navOne {
			
 
				-      width: 50%;
			
 
				-      height: 75px;
			
 
				-      display: flex;
			
 
				-      align-items: center;
			
 
				-      justify-content: space-around;
			
 
				-      color: #fff;
			
 
				-      .one {
			
 
				-        display: flex;
			
 
				-        align-items: center;
			
 
				-        flex-direction: column;
			
 
				-        p {
			
 
				-          margin-top: 10px;
			
 
				-          font-size: 14px;
			
 
				-        }
			
 
				-      }
			
 
				-    }
			
 
				-    .active {
			
 
				-      background: #409eff;
			
 
				+<style  rel="stylesheet/scss" lang="scss" scoped>
			
 
				+.sideColumn{
			
 
				+  // background-color: rgb(48, 65, 86);
			
 
				+  background-color:#fff;
			
 
				+  text-align: center;
			
 
				+  height:50px;
			
 
				+  line-height: 50px;
			
 
				+  border-top:1px solid #e5e5e5;
			
 
				+  border-bottom:1px solid #e5e5e5;
			
 
				+  // color: rgb(191, 203, 217);
			
 
				+  color:#000;
			
 
				+.head {
			
 
				+  text-align: center;
			
 
				+  padding: 20px 0 0 0;
			
 
				+  .tx {
			
 
				+    .img {
			
 
				+      width: 45px;
			
 
				+      height: 45px;
			
 
				+      border-radius: 50%;
			
 
				+      -o-object-fit: cover;
			
 
				+    object-fit: cover;
			
 
				+    -o-object-position: center;
			
 
				+    object-position: center;
			
 
				     }
			
 
				-  }
			
 
				-}
			
 
				+  } 
			
 
				+  .title {
			
 
				+    font-size: 14px;
			
 
				+    color: #bfcbd9;
			
 
				+    padding: 10px 10px 15px 10px;
			
 
				+    line-height: 22px;
			
 
				 
			
 
				-.logo {
			
 
				-  width: 100px;
			
 
				-  height: 32px;
			
 
				-  margin: 20px auto;
			
 
				-  img {
			
 
				-    width: 100%;
			
 
				-    height: 100%;
			
 
				-    display: block;
			
 
				   }
			
 
				 }
			
 
				-
			
 
				-.sideColumn {
			
 
				-  background-color: rgb(48, 65, 86);
			
 
				-  .head {
			
 
				-    text-align: center;
			
 
				-    padding: 20px 0 0 0;
			
 
				-    .tx {
			
 
				-      .img {
			
 
				-        width: 45px;
			
 
				-        height: 45px;
			
 
				-        border-radius: 50%;
			
 
				-        -o-object-fit: cover;
			
 
				-        object-fit: cover;
			
 
				-        -o-object-position: center;
			
 
				-        object-position: center;
			
 
				-      }
			
 
				-    }
			
 
				-    .title {
			
 
				-      font-size: 14px;
			
 
				-      color: #bfcbd9;
			
 
				-      padding: 10px 10px 15px 10px;
			
 
				-      line-height: 22px;
			
 
				+.headShrink{
			
 
				+  .tx{
			
 
				+    .img{
			
 
				+      width: 30px;
			
 
				+      height: 30px;
			
 
				     }
			
 
				+
			
 
				   }
			
 
				-  .headShrink {
			
 
				-    .tx {
			
 
				-      .img {
			
 
				-        width: 30px;
			
 
				-        height: 30px;
			
 
				-      }
			
 
				-    }
			
 
				-    .title {
			
 
				-      display: none;
			
 
				-    }
			
 
				+  .title{
			
 
				+    display: none;
			
 
				   }
			
 
				 }
			
 
				+}
			
 
				+
			
 
				+
			
 
				 </style>
			
 
				 
			
 
				 <style lang="scss">
			
 
				-.scrollbar-wrapper {
			
 
				-  background-color: #1F2D3D;
			
 
				-  .el-menu{
			
 
				-    background-color: #1F2D3D !important;
			
 
				-  }
			
 
				-  .el-menu-item{
			
 
				-    height: 32px !important;
			
 
				-    line-height: 32px !important;
			
 
				-    background-color: #1F2D3D !important;
			
 
				-    color: #fff !important;
			
 
				-    i{
			
 
				-      color: #fff;
			
 
				-    }
			
 
				-  }
			
 
				+.el-scrollbar__thumb{
			
 
				+  height:0 !important;
			
 
				+}
			
 
				+.scrollbar-wrapper::-webkit-scrollbar{
			
 
				+  width:0 !important;
			
 
				 }
			
 
				-</style>
			
 
				-<style lang="scss">
			
 
				-
			
 
				 </style>
			
--- a/src/xt_pages/components/bread-crumb.vue
+++ b/src/xt_pages/components/bread-crumb.vue
@@ -1,6 +1,6 @@
 
				 <template>
			
 
				     <el-breadcrumb separator="/">
			
 
				-    <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
			
 
				+    <el-breadcrumb-item>首页</el-breadcrumb-item>
			
 
				     <template v-for="(crumb, index) in crumbsList" >
			
 
				       <el-breadcrumb-item v-if="crumb.path" :to="{ path: crumb.path }" :key="index">{{crumb.name}}</el-breadcrumb-item>
			
 
				       <el-breadcrumb-item v-else :key="index">{{crumb.name}}</el-breadcrumb-item>
			
--- a/src/xt_pages/data/components/configure.vue
+++ b/src/xt_pages/data/components/configure.vue
@@ -1,10 +1,10 @@
 
				 <template>
			
 
				     <div class="page_configure">
			
 
				         <div style="width:50%;padding-right:10px;">
			
 
				-            <div class="cell clearfix" style='margin-bottom:10px;'>
			
 
				-                <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				-                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
			
 
				-            </div>
			
 
				+            <!--<div class="cell clearfix" style='margin-bottom:10px;'>-->
			
 
				+                <!--<el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>-->
			
 
				+                <!--<el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
			
 
				+            <!--</div>-->
			
 
				             <!--<el-table :data="drugList" border style="width: 100%" :row-style="{ color: '#303133' }" -->
			
 
				              <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" -->
			
 
				               <!--highlight-current-row-->
			
--- a/src/xt_pages/data/components/consumables.vue
+++ b/src/xt_pages/data/components/consumables.vue
@@ -2,13 +2,13 @@
 
				   <div class="page_consumables">
			
 
				     <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
			
 
				       <div class="cell clearfix" style="margin-bottom:0;">
			
 
				-        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
			
 
				+        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model="keywords"
			
 
				                   class="filter-item"/>
			
 
				         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
			
 
				                    @click="searchAction">搜索
			
 
				         </el-button>
			
 
				         <label class="title"><span class="name">是否启用</span> : </label>
			
 
				-        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择">
			
 
				+        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
			
 
				           <el-option
			
 
				             v-for="item in options"
			
 
				             :key="item.value"
			
@@ -17,7 +17,7 @@
 
				           </el-option>
			
 
				         </el-select>
			
 
				         <label class="title"><span class="name">是否收费</span> : </label>
			
 
				-        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择">
			
 
				+        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
			
 
				           <el-option
			
 
				             v-for="item in options"
			
 
				             :key="item.value"
			
@@ -26,7 +26,7 @@
 
				           </el-option>
			
 
				         </el-select>
			
 
				         <span style="color: #909399;font-size:14px;">耗材种类 : &nbsp;</span>
			
 
				-        <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择">
			
 
				+        <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeKind">
			
 
				           <el-option
			
 
				             v-for="item,index in  getDictionaryDataConfig('system','good_kind')"
			
 
				             :key="index"
			
@@ -50,33 +50,47 @@
 
				       </el-table-column>
			
 
				       <el-table-column label="名称" align="center">
			
 
				         <template slot-scope="scope">
			
 
				-          {{ scope.row.specification_name }}
			
 
				+          {{ scope.row.good_name }}
			
 
				         </template>
			
 
				       </el-table-column>
			
 
				       <el-table-column prop="date" label="规格型号" align="center">
			
 
				+        <template slot-scope="scope">
			
 
				+        {{ scope.row.specification_name }}
			
 
				+        </template>
			
 
				 
			
 
				       </el-table-column>
			
 
				       <el-table-column prop="date" label="耗材种类" width="140" align="center">
			
 
				-
			
 
				+        <template slot-scope="scope">
			
 
				+          {{ getGoodKind(scope.row.good_kind) }}
			
 
				+        </template>
			
 
				       </el-table-column>
			
 
				       <el-table-column label="耗材编码" width="140" align="center">
			
 
				-
			
 
				+        <template slot-scope="scope">
			
 
				+          {{ scope.row.good_code }}
			
 
				+        </template>
			
 
				       </el-table-column>
			
 
				 
			
 
				       <el-table-column label="最小单位" width="60" align="center">
			
 
				-
			
 
				+        <template slot-scope="scope">
			
 
				+          {{ getGoodUnit(scope.row.good_unit) }}
			
 
				+        </template>
			
 
				       </el-table-column>
			
 
				       <el-table-column label="零售价" width="60" align="center">
			
 
				-
			
 
				+        <template slot-scope="scope">
			
 
				+          {{ scope.row.retail_price }}
			
 
				+        </template>
			
 
				       </el-table-column>
			
 
				       <el-table-column label="状态" width="60" align="center">
			
 
				+        <template slot-scope="scope">
			
 
				+        {{ scope.row.good_status}}
			
 
				+        </template>
			
 
				 
			
 
				       </el-table-column>
			
 
				 
			
 
				       <el-table-column prop="date" label="操作" width="300" align="center">
			
 
				         <template slot-scope="scope">
			
 
				           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
			
 
				-          <!--<el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>-->
			
 
				+          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
			
 
				           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
			
 
				         </template>
			
 
				       </el-table-column>
			
@@ -94,8 +108,6 @@
 
				       :total="total"
			
 
				     >
			
 
				     </el-pagination>
			
 
				-
			
 
				-    <!--<add-consumable ref="addConsumable"></add-consumable>-->
			
 
				     <good-info-dailog ref="addConsumable"
			
 
				                       :titles="goodInfo.goodInfoDialog.goodInfoTitle"
			
 
				                       :formValue="goodInfo.goodInfoDialog.formValue"
			
@@ -104,12 +116,15 @@
 
				                       v-on:dialog-comfirm="goodInfoDialogComfirm"
			
 
				                       v-on:dialog-cancle="goodInfoDialogCancle"
			
 
				     ></good-info-dailog>
			
 
				+    <self-payment ref='selfPayment'></self-payment>
			
 
				+
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				   import GoodInfoDailog from '../../stock/Dialog/goodInfoDailog'
			
 
				   import { getDictionaryDataConfig } from "@/utils/data";
			
 
				+  import selfPayment from './selfPayment'
			
 
				 
			
 
				   import {
			
 
				     createGoodInfo,
			
@@ -125,6 +140,7 @@
 
				   export default {
			
 
				     components: {
			
 
				       GoodInfoDailog,
			
 
				+      selfPayment
			
 
				     },
			
 
				     data() {
			
 
				       return {
			
@@ -203,6 +219,39 @@
 
				       }
			
 
				     },
			
 
				     methods: {
			
 
				+      changeKind(val){
			
 
				+        this.getList()
			
 
				+
			
 
				+      },
			
 
				+      changeCharge(val){
			
 
				+        this.getList()
			
 
				+
			
 
				+      },
			
 
				+      changeUser(val){
			
 
				+        this.getList()
			
 
				+
			
 
				+
			
 
				+      },
			
 
				+      getGoodUnit(id){
			
 
				+        for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
			
 
				+          if(id == this.$store.getters.good_unit[i].id){
			
 
				+
			
 
				+            return this.$store.getters.good_unit[i].name
			
 
				+          }
			
 
				+        }
			
 
				+        return ""
			
 
				+      },
			
 
				+      getGoodKind(id){
			
 
				+        var data = this.getDictionaryDataConfig('system','good_kind')
			
 
				+        var name = ""
			
 
				+        for(let i = 0; i < data.length; i++){
			
 
				+          if(id == data[i].id){
			
 
				+            name = data[i].name
			
 
				+          }
			
 
				+
			
 
				+        }
			
 
				+        return name
			
 
				+      },
			
 
				       getDictionaryDataConfig(module,filed_name){
			
 
				         return getDictionaryDataConfig(module,filed_name)
			
 
				 
			
@@ -408,7 +457,7 @@
 
				 
			
 
				 
			
 
				 
			
 
				-            this.$refs.addConsumable.show()
			
 
				+            this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
			
 
				           }
			
 
				         })
			
 
				       },
			
@@ -480,9 +529,11 @@
 
				             return false
			
 
				           } else {
			
 
				             this.goodInfo.loading = false
			
 
				-            for (let i = 0; i < response.data.data.list.length; i++) {
			
 
				-              this.goodInfo.goodInfoData.push(response.data.data.list[i])
			
 
				-            }
			
 
				+            this.getList()
			
 
				+
			
 
				+            // for (let i = 0; i < response.data.data.list.length; i++) {
			
 
				+            //   this.goodInfo.goodInfoData.push(response.data.data.list[i])
			
 
				+            // }
			
 
				           }
			
 
				         })
			
 
				       },
			
@@ -498,25 +549,25 @@
 
				               return false
			
 
				             } else {
			
 
				               this.$refs.addConsumable.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()
			
 
				-              this.goodInfo.goodInfoData[
			
 
				-                this.goodInfo.editGoodIndex
			
 
				-                ].sell_price = response.data.data.goodInfo.sell_price.toString()
			
 
				-              this.goodInfo.goodInfoData[
			
 
				-                this.goodInfo.editGoodIndex
			
 
				-                ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
			
 
				-              this.goodInfo.goodInfoData[
			
 
				-                this.goodInfo.editGoodIndex
			
 
				-                ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
			
 
				+              this.getList()
			
 
				+              // 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()
			
 
				+              // this.goodInfo.goodInfoData[
			
 
				+              //   this.goodInfo.editGoodIndex
			
 
				+              //   ].sell_price = response.data.data.goodInfo.sell_price.toString()
			
 
				+              // this.goodInfo.goodInfoData[
			
 
				+              //   this.goodInfo.editGoodIndex
			
 
				+              //   ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
			
 
				+              // this.goodInfo.goodInfoData[
			
 
				+              //   this.goodInfo.editGoodIndex
			
 
				+              //   ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
			
 
				 
			
 
				               this.$message.success('修改成功')
			
 
				             }
			
@@ -529,9 +580,8 @@
 
				               return false
			
 
				             } else {
			
 
				               this.$refs.addConsumable.hide()
			
 
				-
			
 
				-              this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
			
 
				-
			
 
				+              this.getList()
			
 
				+              // this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
			
 
				               this.$message.success('新增成功')
			
 
				             }
			
 
				           })
			
@@ -541,7 +591,6 @@
 
				         this.$refs.addConsumable.hide()
			
 
				       },
			
 
				       showInfoDialog: function() {
			
 
				-        this.$refs.addConsumable.show()
			
 
				         this.getAllDealer()
			
 
				         this.getAllManufacturer()
			
 
				         this.goodInfo.goodInfoDialog.formValue.goodType = []
			
@@ -567,17 +616,8 @@
 
				             }
			
 
				           }
			
 
				         })
			
 
				-        this.goodInfo.goodInfoDialog.formValue.good_id = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.specification_name = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.buy_price = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.sell_price = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.remark = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.good_type_id = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.dealer = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
			
 
				-        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
			
 
				+        this.$refs.addConsumable.show()
			
 
				+
			
 
				       },
			
 
				       getAllDealer: function() {
			
 
				         this.goodInfo.goodInfoDialog.formValue.dealers = []
			
@@ -636,8 +676,12 @@
 
				         this.getList()
			
 
				       },
			
 
				       searchAction() {
			
 
				-      },clickSelfPayment(){
			
 
				-
			
 
				+        this.is_use = ""
			
 
				+        this.is_charge = ""
			
 
				+        this.good_kind = ""
			
 
				+        this.getList()
			
 
				+      },clickSelfPayment(id){
			
 
				+      this.$refs.selfPayment.show(id,2)
			
 
				       },
			
 
				       openForm() {
			
 
				 
			
@@ -699,7 +743,7 @@
 
				         this.goodInfo.goodInfoDialog.formValue.agent = ''
			
 
				         this.goodInfo.goodInfoDialog.formValue.good_number = ''
			
 
				 
			
 
				-        this.$refs.addConsumable.show()
			
 
				+        this.$refs.addConsumable.show(0)
			
 
				       }
			
 
				     }, created() {
			
 
				       this.getList()
			
--- a/src/xt_pages/data/components/drugs.vue
+++ b/src/xt_pages/data/components/drugs.vue
@@ -80,7 +80,7 @@
 
				       <el-table-column prop="date" label="操作" width="400" align="center">
			
 
				         <template slot-scope="scope">
			
 
				           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
			
 
				-          <!--<el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>-->
			
 
				+          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
			
 
				           <!--<el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>-->
			
 
				           <!--<el-button type="danger" size="small">删除</el-button>-->
			
 
				         </template>
			
@@ -339,8 +339,8 @@
 
				       searchAction() {
			
 
				         this.getList()
			
 
				       },
			
 
				-      clickSelfPayment() {
			
 
				-        this.$refs.selfPayment.show()
			
 
				+      clickSelfPayment(drug_id) {
			
 
				+        this.$refs.selfPayment.show(drug_id,1)
			
 
				       },
			
 
				       clickMainTain() {
			
 
				         // this.$refs.maintain.show();
			
--- a/src/xt_pages/data/components/selfPayment.vue
+++ b/src/xt_pages/data/components/selfPayment.vue
@@ -1,19 +1,20 @@
 
				 <template>
			
 
				-    <el-dialog
			
 
				+  <el-dialog
			
 
				     title="自付比例"
			
 
				     width="660px"
			
 
				     :visible.sync="visible"
			
 
				     :before-close="_close"
			
 
				   >
			
 
				-    <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
			
 
				-        <el-table-column prop="name" label="医保类型" align="center"></el-table-column>
			
 
				-        <el-table-column label="自付比例(%)" align="center">
			
 
				-            <template slot-scope="scope">
			
 
				-                <el-input v-model="input" placeholder="请输入内容"></el-input>
			
 
				-            </template>
			
 
				-        </el-table-column>
			
 
				+    <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }"
			
 
				+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
			
 
				+      <el-table-column prop="name" label="医保类型" align="center"></el-table-column>
			
 
				+      <el-table-column label="自付比例(%)" align="center">
			
 
				+        <template slot-scope="scope">
			
 
				+          <el-input v-model="scope.row.percent" placeholder="请输入内容"></el-input>
			
 
				+        </template>
			
 
				+      </el-table-column>
			
 
				     </el-table>
			
 
				-    
			
 
				+
			
 
				     <div slot="footer" class="dialog-footer">
			
 
				       <el-button @click="hide">取 消</el-button>
			
 
				       <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
@@ -23,45 +24,172 @@
 
				 
			
 
				 
			
 
				 <script>
			
 
				-export default {
			
 
				-    data(){
			
 
				-        return{
			
 
				-            visible: false,
			
 
				-            tableData:[
			
 
				+  import { createMedicineInsurancePercent, getMedicineInsurancePercent } from '@/api/data'
			
 
				+
			
 
				+  export default {
			
 
				+    data() {
			
 
				+      return {
			
 
				+        visible: false,
			
 
				+        module:0,
			
 
				+        tableData: [
			
 
				+          {
			
 
				+            name: '深圳医保1档',
			
 
				+            medicine_insurance_type: 1,
			
 
				+            percent: '',
			
 
				+            type_id: 0
			
 
				+          },
			
 
				+          {
			
 
				+            name: '深圳医保2档',
			
 
				+            medicine_insurance_type: 2,
			
 
				+            type_id: 0,
			
 
				+            percent: ''
			
 
				+          },
			
 
				+          {
			
 
				+            name: '深圳医保3档',
			
 
				+            medicine_insurance_type: 3,
			
 
				+            type_id: 0,
			
 
				+            percent: ''
			
 
				+          },
			
 
				+          {
			
 
				+            name: '外地医保',
			
 
				+            medicine_insurance_type: 4,
			
 
				+            type_id: 0,
			
 
				+            percent: ''
			
 
				+          },
			
 
				+          {
			
 
				+            name: '自费',
			
 
				+            medicine_insurance_type: 5,
			
 
				+            percent: '',
			
 
				+            type_id: 0
			
 
				+          }
			
 
				+        ]
			
 
				+      }
			
 
				+    },
			
 
				+    methods: {
			
 
				+
			
 
				+      submitAction: function() {
			
 
				+        let params = {
			
 
				+          'mip': this.tableData
			
 
				+        }
			
 
				+        createMedicineInsurancePercent(params,this.module).then(response => {
			
 
				+          if (response.data.state == 0) {
			
 
				+            this.$message.error(response.data.msg)
			
 
				+            return false
			
 
				+          } else {
			
 
				+            this.hide()
			
 
				+          }
			
 
				+
			
 
				+        })
			
 
				+
			
 
				+      },
			
 
				+      _close: function(done) {
			
 
				+        done()
			
 
				+      },
			
 
				+      show(id,module) {
			
 
				+        this.module = module
			
 
				+        this.tableData = []
			
 
				+        getMedicineInsurancePercent(id,module).then(response => {
			
 
				+            if (response.data.state == 0) {
			
 
				+              this.$message.error(response.data.msg)
			
 
				+              return false
			
 
				+            } else {
			
 
				+              var temptableData = [
			
 
				                 {
			
 
				-                    name:'深圳医保1档',
			
 
				-                    scale:0
			
 
				+                  name: '深圳医保1档',
			
 
				+                  medicine_insurance_type: 1,
			
 
				+                  percent: '',
			
 
				+                  type_id: id
			
 
				                 },
			
 
				                 {
			
 
				-                    name:'深圳医保2档',
			
 
				-                    scale:0
			
 
				+                  name: '深圳医保2档',
			
 
				+                  medicine_insurance_type: 2,
			
 
				+                  type_id: id,
			
 
				+                  percent: ''
			
 
				                 },
			
 
				                 {
			
 
				-                    name:'深圳医保3档',
			
 
				-                    scale:0
			
 
				+                  name: '深圳医保3档',
			
 
				+                  medicine_insurance_type: 3,
			
 
				+                  type_id: id,
			
 
				+                  percent: ''
			
 
				                 },
			
 
				                 {
			
 
				-                    name:'外地医保',
			
 
				-                    scale:0
			
 
				+                  name: '外地医保',
			
 
				+                  medicine_insurance_type: 4,
			
 
				+                  type_id: id,
			
 
				+                  percent: ''
			
 
				                 },
			
 
				                 {
			
 
				-                    name:'自费',
			
 
				-                    scale:0
			
 
				-                },
			
 
				-            ]
			
 
				-        }
			
 
				-    },
			
 
				-    methods:{
			
 
				-        _close: function(done) {
			
 
				-            done()
			
 
				-        },
			
 
				-        show() {
			
 
				-            this.visible = true
			
 
				-        },
			
 
				-        hide() {
			
 
				-            // this.clear()
			
 
				-            this.visible = false
			
 
				-        },
			
 
				+                  name: '自费',
			
 
				+                  medicine_insurance_type: 5,
			
 
				+                  percent: '',
			
 
				+                  type_id: id
			
 
				+                }
			
 
				+              ]
			
 
				+              this.tableData = temptableData
			
 
				+
			
 
				+              this.visible = true
			
 
				+              for (let i = 0; i < this.tableData.length; i++) {
			
 
				+                this.tableData[i].type_id = id
			
 
				+              }
			
 
				+              if (response.data.data.mip != null && response.data.data.mip.length > 0) {
			
 
				+
			
 
				+                for (let i = 0; i < response.data.data.mip.length; i++) {
			
 
				+                  for (let a = 0; a < this.tableData.length; a++) {
			
 
				+                    if (response.data.data.mip[i].medicine_insurance_type == this.tableData[a].medicine_insurance_type) {
			
 
				+                      this.tableData[a].percent = response.data.data.mip[i].percent.toString()
			
 
				+                    }
			
 
				+                  }
			
 
				+                }
			
 
				+
			
 
				+              }else{
			
 
				+               var temptableData = [
			
 
				+                  {
			
 
				+                    name: '深圳医保1档',
			
 
				+                    medicine_insurance_type: 1,
			
 
				+                    percent: '',
			
 
				+                    type_id: id
			
 
				+                  },
			
 
				+                  {
			
 
				+                    name: '深圳医保2档',
			
 
				+                    medicine_insurance_type: 2,
			
 
				+                    type_id: id,
			
 
				+                    percent: ''
			
 
				+                  },
			
 
				+                  {
			
 
				+                    name: '深圳医保3档',
			
 
				+                    medicine_insurance_type: 3,
			
 
				+                    type_id: id,
			
 
				+                    percent: ''
			
 
				+                  },
			
 
				+                  {
			
 
				+                    name: '外地医保',
			
 
				+                    medicine_insurance_type: 4,
			
 
				+                    type_id: id,
			
 
				+                    percent: ''
			
 
				+                  },
			
 
				+                  {
			
 
				+                    name: '自费',
			
 
				+                    medicine_insurance_type: 5,
			
 
				+                    percent: '',
			
 
				+                    type_id: id
			
 
				+                  }
			
 
				+                ]
			
 
				+                this.tableData = temptableData
			
 
				+
			
 
				+
			
 
				+
			
 
				+              }
			
 
				+
			
 
				+            }
			
 
				+
			
 
				+          }
			
 
				+        )
			
 
				+
			
 
				+      },
			
 
				+      hide() {
			
 
				+        // this.clear()
			
 
				+        this.visible = false
			
 
				+      }
			
 
				     }
			
 
				-}
			
 
				+  }
			
 
				 </script>
			
--- a/src/xt_pages/index/verify_token.vue
+++ b/src/xt_pages/index/verify_token.vue
@@ -15,7 +15,7 @@ export default {
 
				           // console.log(this.$store.getters.xt_permission.addRouters)
			
 
				           this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
			
 
				   //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
			
 
				-          this.$router.replace({ path: '/' })
			
 
				+          this.$router.replace({ path: '/dialysis/dialysisrecord' })
			
 
				         })
			
 
				       })
			
 
				     }).catch((error) => {
			
--- a/src/xt_pages/kuyiShopping/index.vue
+++ b/src/xt_pages/kuyiShopping/index.vue
@@ -0,0 +1,5 @@
 
				+<template>
			
 
				+    <div style="width:100%;height:100%;">
			
 
				+        <iframe style="width:100%;height:100%;" src="http://market.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&r=pc" frameborder="0"></iframe>
			
 
				+    </div>
			
 
				+</template>
			
--- a/src/xt_pages/outpatientCharges/advancePayment.vue
+++ b/src/xt_pages/outpatientCharges/advancePayment.vue
@@ -0,0 +1,82 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
			
 
				+                <div>
			
 
				+                    <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                </div>
			
 
				+                <el-button size="small" type="primary">预交金查询</el-button>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column type="selection" width="55" align="center"></el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="序号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者姓名">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="证件号码">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者类型">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="地址">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="预交金余额(元)">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="已交金额(元)">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作" width="300">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        <el-button size="mini" type="primary">交款</el-button>
			
 
				+                        <el-button size="mini" type="danger">删除</el-button>
			
 
				+                        <el-button size="mini" type="primary">结算</el-button>
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊收费' },
			
 
				+                { path: false, name: '预交金' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
--- a/src/xt_pages/outpatientCharges/components/charged.vue
+++ b/src/xt_pages/outpatientCharges/components/charged.vue
@@ -0,0 +1,166 @@
 
				+<template>
			
 
				+    <div style="display:flex;">
			
 
				+        <div class="noChargeLeft">
			
 
				+            <div class="mainCell" style="margin-bottom:10px;">
			
 
				+                <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" prop="name" label="处方号" width="100">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="姓名" width="99">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+        </div>
			
 
				+        <div style="flex:1;overflow-x: hidden;">
			
 
				+            <div class="noChargeRight">
			
 
				+                <div class="chargeInfo">
			
 
				+                    <p>姓名：<span></span></p>
			
 
				+                    <p>性别：<span></span></p>
			
 
				+                    <p>年龄：<span></span></p>
			
 
				+                    <p>证件号：<span></span></p>
			
 
				+                    <p>挂号类型：<span></span></p>
			
 
				+                    <p>上一个发票号：<span></span></p>
			
 
				+                    <p>下一个发票号：<span></span></p>
			
 
				+                </div>
			
 
				+                <div class="chargeBox">
			
 
				+                    <p>医疗费用总额：<span></span></p>
			
 
				+                    <p>基金支付金额：<span></span></p>
			
 
				+                    <p>个人账户支付金额：<span></span></p>
			
 
				+                    <p>个人支付金额：<span></span></p>
			
 
				+                    <p>个人账号金额：<span></span></p>
			
 
				+                </div>
			
 
				+                <p class='chargeTitle'>药品信息</p>
			
 
				+                <el-table :data="tableData" border height="200" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单位">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单价（元）">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="数量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总价">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+                <p class='chargeTitle'>项目信息</p>
			
 
				+                <el-table :data="tableData" border height="200" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="科室">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单价（元）">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="数量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总价">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+                <div class='chargeBtn'>
			
 
				+                    <p>总金额：0元</p>
			
 
				+                    <div>
			
 
				+                        <el-button>收费清单打印</el-button>
			
 
				+                        <el-button type="primary">处方查询</el-button>
			
 
				+                        <el-button type="danger">退费</el-button>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.noChargeLeft{
			
 
				+    width:200px;
			
 
				+    .mainCell{
			
 
				+        display: flex;
			
 
				+    }
			
 
				+}
			
 
				+.noChargeRight{
			
 
				+    margin-left:20px;
			
 
				+    // flex: 1;
			
 
				+    .chargeInfo{
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        align-items: center;
			
 
				+        height: 32px;
			
 
				+        margin-bottom: 10px;
			
 
				+        >p{
			
 
				+            display: flex;
			
 
				+        }
			
 
				+        >p>span{
			
 
				+            display: inline-block;
			
 
				+            min-width: 50px;
			
 
				+        }
			
 
				+    }
			
 
				+    .chargeBox{
			
 
				+        height:42px;
			
 
				+        border: 1px solid #EBEEF5;
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        background-color: rgb(245, 247, 250);
			
 
				+        color: rgb(96, 98, 102);
			
 
				+        align-items: center;
			
 
				+        padding: 0 20px;
			
 
				+        >p>span{
			
 
				+            display: inline-block;
			
 
				+            min-width: 50px;
			
 
				+        }
			
 
				+    }
			
 
				+    .chargeTitle{
			
 
				+        line-height: 32px;
			
 
				+        height: 32px;
			
 
				+    }
			
 
				+    .chargeBtn{
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        align-items: center;
			
 
				+        margin-top: 20px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientCharges/components/medicalInsuranceRefund.vue
+++ b/src/xt_pages/outpatientCharges/components/medicalInsuranceRefund.vue
@@ -0,0 +1,165 @@
 
				+<template>
			
 
				+    <div style="display:flex;">
			
 
				+        <div class="noChargeLeft">
			
 
				+            <div class="mainCell" style="margin-bottom:10px;">
			
 
				+                <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" prop="name" label="处方号" width="100">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="姓名" width="99">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+        </div>
			
 
				+        <div style="flex:1;overflow-x: hidden;">
			
 
				+            <div class="noChargeRight">
			
 
				+                <div class="chargeInfo">
			
 
				+                    <p>姓名：<span></span></p>
			
 
				+                    <p>性别：<span></span></p>
			
 
				+                    <p>年龄：<span></span></p>
			
 
				+                    <p>证件号：<span></span></p>
			
 
				+                    <p>挂号类型：<span></span></p>
			
 
				+                    <p>上一个发票号：<span></span></p>
			
 
				+                    <p>下一个发票号：<span></span></p>
			
 
				+                </div>
			
 
				+                <div class="chargeBox">
			
 
				+                    <p>医疗费用总额：<span></span></p>
			
 
				+                    <p>基金支付金额：<span></span></p>
			
 
				+                    <p>个人账户支付金额：<span></span></p>
			
 
				+                    <p>个人支付金额：<span></span></p>
			
 
				+                    <p>个人账号金额：<span></span></p>
			
 
				+                </div>
			
 
				+                <p class='chargeTitle'>药品信息</p>
			
 
				+                <el-table :data="tableData" border height="200" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单位">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单价（元）">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="数量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总价">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+                <p class='chargeTitle'>项目信息</p>
			
 
				+                <el-table :data="tableData" border height="200" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="科室">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单价（元）">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="数量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总价">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+                <div class='chargeBtn'>
			
 
				+                    <p>总金额：0元</p>
			
 
				+                    <div>
			
 
				+                        <el-button type="primary">处方查询</el-button>
			
 
				+                        <el-button type="danger">退单</el-button>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.noChargeLeft{
			
 
				+    width:200px;
			
 
				+    .mainCell{
			
 
				+        display: flex;
			
 
				+    }
			
 
				+}
			
 
				+.noChargeRight{
			
 
				+    margin-left:20px;
			
 
				+    // flex: 1;
			
 
				+    .chargeInfo{
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        align-items: center;
			
 
				+        height: 32px;
			
 
				+        margin-bottom: 10px;
			
 
				+        >p{
			
 
				+            display: flex;
			
 
				+        }
			
 
				+        >p>span{
			
 
				+            display: inline-block;
			
 
				+            min-width: 50px;
			
 
				+        }
			
 
				+    }
			
 
				+    .chargeBox{
			
 
				+        height:42px;
			
 
				+        border: 1px solid #EBEEF5;
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        background-color: rgb(245, 247, 250);
			
 
				+        color: rgb(96, 98, 102);
			
 
				+        align-items: center;
			
 
				+        padding: 0 20px;
			
 
				+        >p>span{
			
 
				+            display: inline-block;
			
 
				+            min-width: 50px;
			
 
				+        }
			
 
				+    }
			
 
				+    .chargeTitle{
			
 
				+        line-height: 32px;
			
 
				+        height: 32px;
			
 
				+    }
			
 
				+    .chargeBtn{
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        align-items: center;
			
 
				+        margin-top: 20px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientCharges/components/noCharge.vue
+++ b/src/xt_pages/outpatientCharges/components/noCharge.vue
@@ -0,0 +1,165 @@
 
				+<template>
			
 
				+    <div style="display:flex;">
			
 
				+        <div class="noChargeLeft">
			
 
				+            <div class="mainCell" style="margin-bottom:10px;">
			
 
				+                <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" prop="name" label="处方号" width="100">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="姓名" width="99">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+        </div>
			
 
				+        <div style="flex:1;overflow-x: hidden;">
			
 
				+            <div class="noChargeRight">
			
 
				+                <div class="chargeInfo">
			
 
				+                    <p>姓名：<span></span></p>
			
 
				+                    <p>性别：<span></span></p>
			
 
				+                    <p>年龄：<span></span></p>
			
 
				+                    <p>证件号：<span></span></p>
			
 
				+                    <p>挂号类型：<span></span></p>
			
 
				+                    <p>上一个发票号：<span></span></p>
			
 
				+                    <p>下一个发票号：<span></span></p>
			
 
				+                </div>
			
 
				+                <div class="chargeBox">
			
 
				+                    <p>医疗费用总额：<span></span></p>
			
 
				+                    <p>基金支付金额：<span></span></p>
			
 
				+                    <p>个人账户支付金额：<span></span></p>
			
 
				+                    <p>个人支付金额：<span></span></p>
			
 
				+                    <p>个人账号金额：<span></span></p>
			
 
				+                </div>
			
 
				+                <p class='chargeTitle'>药品信息</p>
			
 
				+                <el-table :data="tableData" border height="200" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单位">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单价（元）">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="数量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总价">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+                <p class='chargeTitle'>项目信息</p>
			
 
				+                <el-table :data="tableData" border height="200" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="科室">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单价（元）">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="数量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总价">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+                <div class='chargeBtn'>
			
 
				+                    <p>总金额：0元</p>
			
 
				+                    <div>
			
 
				+                        <el-button>预结算</el-button>
			
 
				+                        <el-button type="primary">结算保存</el-button>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.noChargeLeft{
			
 
				+    width:200px;
			
 
				+    .mainCell{
			
 
				+        display: flex;
			
 
				+    }
			
 
				+}
			
 
				+.noChargeRight{
			
 
				+    margin-left:20px;
			
 
				+    // flex: 1;
			
 
				+    .chargeInfo{
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        align-items: center;
			
 
				+        height: 32px;
			
 
				+        margin-bottom: 10px;
			
 
				+        >p{
			
 
				+            display: flex;
			
 
				+        }
			
 
				+        >p>span{
			
 
				+            display: inline-block;
			
 
				+            min-width: 50px;
			
 
				+        }
			
 
				+    }
			
 
				+    .chargeBox{
			
 
				+        height:42px;
			
 
				+        border: 1px solid #EBEEF5;
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        background-color: rgb(245, 247, 250);
			
 
				+        color: rgb(96, 98, 102);
			
 
				+        align-items: center;
			
 
				+        padding: 0 20px;
			
 
				+        >p>span{
			
 
				+            display: inline-block;
			
 
				+            min-width: 50px;
			
 
				+        }
			
 
				+    }
			
 
				+    .chargeTitle{
			
 
				+        line-height: 32px;
			
 
				+        height: 32px;
			
 
				+    }
			
 
				+    .chargeBtn{
			
 
				+        display: flex;
			
 
				+        justify-content: space-between;
			
 
				+        align-items: center;
			
 
				+        margin-top: 20px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientCharges/labelPrinting.vue
+++ b/src/xt_pages/outpatientCharges/labelPrinting.vue
@@ -0,0 +1,86 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
			
 
				+                <div>
			
 
				+                    <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                    <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                    <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
			
 
				+                </div>
			
 
				+                <el-button size="small" type="primary">打印</el-button>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column type="selection" width="55" align="center"></el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者名字">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="处方号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="创建时间">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="创建医生">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="项目名称">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="试管颜色">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        <el-button size="mini" type="primary">打印</el-button>
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊收费' },
			
 
				+                { path: false, name: '标签打印' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
--- a/src/xt_pages/outpatientCharges/outpatientChargesManagement.vue
+++ b/src/xt_pages/outpatientCharges/outpatientChargesManagement.vue
@@ -0,0 +1,71 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div class="dateBox">
			
 
				+                <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
			
 
				+            </div>
			
 
				+            <el-tabs v-model="activeName">
			
 
				+                <el-tab-pane label="未收费" name="first">
			
 
				+                    <no-charge></no-charge>
			
 
				+                </el-tab-pane>
			
 
				+                <el-tab-pane label="已收费" name="second">
			
 
				+                    <charged></charged>
			
 
				+                </el-tab-pane>
			
 
				+                <el-tab-pane label="医保退处方" name="third">
			
 
				+                    <medical-insurance-refund></medical-insurance-refund>
			
 
				+                </el-tab-pane>
			
 
				+            </el-tabs>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+import noCharge from './components/noCharge'
			
 
				+import charged from './components/charged'
			
 
				+import medicalInsuranceRefund from './components/medicalInsuranceRefund'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+        noCharge,
			
 
				+        charged,
			
 
				+        medicalInsuranceRefund
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊收费' },
			
 
				+                { path: false, name: '门诊收费管理' }
			
 
				+            ],
			
 
				+            activeName:'first'
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.outpatientChargesManagement{
			
 
				+    .el-tabs{
			
 
				+        position: relative;
			
 
				+    }
			
 
				+    .el-tabs__nav-wrap{
			
 
				+        padding-left:200px;
			
 
				+    }
			
 
				+    .dateBox{
			
 
				+        position: absolute;
			
 
				+        z-index:99;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+.outpatientChargesManagement{
			
 
				+    .el-tabs__nav-wrap{
			
 
				+        padding-left:220px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientCharges/outpatientInvoice.vue
+++ b/src/xt_pages/outpatientCharges/outpatientInvoice.vue
@@ -0,0 +1,77 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
			
 
				+                <div>
			
 
				+                    <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                </div>
			
 
				+                <el-button size="small" type="danger">删除</el-button>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column type="selection" width="55" align="center"></el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="序号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作员">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="发票起">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="发票止">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="状态">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="备注">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        <el-button size="mini" type="danger">删除</el-button>
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊收费' },
			
 
				+                { path: false, name: '门诊发票' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
--- a/src/xt_pages/outpatientCharges/summary.vue
+++ b/src/xt_pages/outpatientCharges/summary.vue
@@ -0,0 +1,88 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
			
 
				+                <div>
			
 
				+                    <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                    <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                    <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
			
 
				+                    <el-radio v-model="radio" label="1">明细</el-radio>
			
 
				+                    <el-radio v-model="radio" label="2">汇总</el-radio>
			
 
				+                </div>
			
 
				+                <el-button size="small" type="primary">报表下载</el-button>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column type="selection" width="55" align="center"></el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者名字">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="处方号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="创建时间">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="创建医生">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="项目名称">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="试管颜色">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        <el-button size="mini" type="primary">打印</el-button>
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊收费' },
			
 
				+                { path: false, name: '项目消费明细汇总' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
--- a/src/xt_pages/outpatientDoctorStation/components/advice.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/advice.vue
@@ -0,0 +1,135 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="新增医嘱"
			
 
				+        width="1000px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+    >
			
 
				+        <div>
			
 
				+            <el-form :model="form" :rules="rules" class="adviceForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				+                <el-form-item class="width50" label="开嘱医生 : " prop="name">
			
 
				+                    张三
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="开嘱时间 : " prop="name">
			
 
				+                    张三
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="医嘱内容 : " prop="name" style="width:100%;">
			
 
				+                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="药品规格 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
			
 
				+                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="总量 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
			
 
				+                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="每次量 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
			
 
				+                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="用法 : " prop="name">
			
 
				+                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="执行频率 : " prop="name">
			
 
				+                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="天数 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="限制说明 : " prop="name" style="width:100%;">
			
 
				+                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
			
 
				+                </el-form-item>
			
 
				+            </el-form>
			
 
				+        </div>
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            form:{
			
 
				+                name:''
			
 
				+            },
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.adviceForm{
			
 
				+    .width33{
			
 
				+        width:33%;
			
 
				+    }
			
 
				+    .width50{
			
 
				+        width:50%;
			
 
				+    }
			
 
				+    .width100{
			
 
				+        width:100%;
			
 
				+    }
			
 
				+    .el-radio{
			
 
				+        margin-right:2px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue
@@ -0,0 +1,146 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="详情"
			
 
				+        width="1000px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+        class="detailDialog"
			
 
				+    >
			
 
				+        <el-tabs v-model="activeName">
			
 
				+            <el-tab-pane label="处方详情" name="first">
			
 
				+                <el-table :data="tableData" border height="350" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="类型">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="医嘱名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="组">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="每次量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单位">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="用法">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="频率">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="天数">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单位">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="限制说明">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table> 
			
 
				+            </el-tab-pane>
			
 
				+            <el-tab-pane label="病历详情" name="second">
			
 
				+                <el-table :data="tableData" border height="350" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="类型">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="医嘱名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="组">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="每次量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单位">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="用法">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="频率">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="天数">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="总量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单位">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="限制说明">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table> 
			
 
				+            </el-tab-pane>
			
 
				+        </el-tabs>
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }],
			
 
				+            activeName:'first'
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss">
			
 
				+.detailDialog{
			
 
				+    .el-dialog__body{
			
 
				+        padding: 0 20px 30px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/components/inspection.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/inspection.vue
@@ -0,0 +1,106 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="选择模板"
			
 
				+        width="1000px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+    >
			
 
				+        <div class="inspectionTitle">
			
 
				+            <p>姓名：<span>张三</span></p>
			
 
				+            <p>证件号：<span>张三</span></p>
			
 
				+            <p>性别：<span>张三</span></p>
			
 
				+            <p>类型：<span>张三</span></p>
			
 
				+            <p>金额：<span>张三</span></p>
			
 
				+        </div>
			
 
				+        <div style="margin:10px 0;">
			
 
				+           <el-input v-model="name" placeholder="" style="width:150px;"></el-input> 
			
 
				+        </div>
			
 
				+        <div style="display:flex;">
			
 
				+            <div style="width: 151px;">
			
 
				+                <el-table :data="tableData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="模板名称" width="150">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table> 
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="300" style="flex:1;margin-left:20px;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column type="selection" width="55" align="center"></el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="项目名称">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="数量">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="单位">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="金额">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+            </el-table> 
			
 
				+        </div>
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.inspectionTitle{
			
 
				+    display:flex;
			
 
				+    justify-content: space-between;
			
 
				+    span{
			
 
				+        min-width:80px;
			
 
				+        display:inline-block;
			
 
				+        
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue
@@ -0,0 +1,148 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="病历"
			
 
				+        width="1000px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+    >
			
 
				+        <div>
			
 
				+            <el-form :model="form" :rules="rules" class="medicalRecordForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				+                <el-form-item class="width33" label="传染病:" prop="name">
			
 
				+                    <el-radio v-model="radio" label="1">阴性</el-radio>
			
 
				+                    <el-radio v-model="radio" label="2">阳性</el-radio>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width33" label="患病类型:" prop="name">
			
 
				+                    <el-radio v-model="radio" label="1">慢性病</el-radio>
			
 
				+                    <el-radio v-model="radio" label="2">神经病</el-radio>
			
 
				+                    <el-radio v-model="radio" label="3">抑郁症</el-radio>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width33" label="透析之前情况:" prop="name">
			
 
				+                    <el-radio v-model="radio" label="1">腹膜透析</el-radio>
			
 
				+                    <el-radio v-model="radio" label="2">肾移植</el-radio>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width100" label="主诉 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width100" label="现病史 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width100" label="既往史 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="药品规格 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
			
 
				+                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="总量 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
			
 
				+                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="每次量 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
			
 
				+                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="用法 : " prop="name">
			
 
				+                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="执行频率 : " prop="name">
			
 
				+                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item class="width50" label="天数 : " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="限制说明 : " prop="name" style="width:100%;">
			
 
				+                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
			
 
				+                </el-form-item>
			
 
				+            </el-form>
			
 
				+        </div>
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            form:{
			
 
				+                name:''
			
 
				+            },
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.medicalRecordForm{
			
 
				+    .width33{
			
 
				+        width:33%;
			
 
				+    }
			
 
				+    .width50{
			
 
				+        width:50%;
			
 
				+    }
			
 
				+    .width100{
			
 
				+        width:100%;
			
 
				+    }
			
 
				+    .el-radio{
			
 
				+        margin-right:2px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/components/prescription.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/prescription.vue
@@ -0,0 +1,151 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="开处方"
			
 
				+        width="1000px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+    >
			
 
				+        <div>
			
 
				+            <el-form :model="form" :rules="rules" ref="form" class="perscriptionForm" label-width="140px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				+                <el-form-item label="透析模式:" prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析时长(h): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析时长(min): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="血流量(ml/min): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="预充量(L): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="目标超滤量(L): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析液配方: " prop="name">
			
 
				+                    <el-select v-model="value" style="width:160px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="抗凝剂: " prop="name">
			
 
				+                    <el-select v-model="value" style="width:160px;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="首剂(mg): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="维持(mg/h): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="总量(mg): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="置换量(L): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="钾(mmol/L): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="钠(mmol/L): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="钙(mmol/L): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="碳酸氢盐(mmol/L): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析液流量(ml/min): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析液温度(℃): " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析器/灌流器: " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="体液过多症状: " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="体液过多其他症状: " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析前使用特殊药品: " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="透析前使用其他特殊药品: " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="置换液: " prop="name">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="限制说明 : " style="width:100%;" prop="name">
			
 
				+                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
			
 
				+                </el-form-item>
			
 
				+            </el-form>
			
 
				+        </div>
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+            <el-button type="primary">设为长期处方</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            form:{
			
 
				+                name:''
			
 
				+            },
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.perscriptionForm{
			
 
				+    .el-form-item{
			
 
				+        width:33%;
			
 
				+    }
			
 
				+    .el-input{
			
 
				+        width:160px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue
@@ -0,0 +1,70 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="新增医嘱"
			
 
				+        width="600px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+    >
			
 
				+        <div>
			
 
				+            <el-form :model="form" :rules="rules" class="adviceForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				+                <el-form-item label="模板名称 : " prop="name" style="width: 100%;">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="模板类型 : " prop="name" style="width: 100%;">
			
 
				+                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
			
 
				+                        <el-option
			
 
				+                        v-for="item in options"
			
 
				+                        :key="item.value"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value">
			
 
				+                        </el-option>
			
 
				+                    </el-select>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="模板等级 : " prop="name" style="width: 100%;">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+                <el-form-item label="创建时间 : " prop="name" style="width: 100%;">
			
 
				+                    <el-input v-model="form.name" placeholder=""></el-input>
			
 
				+                </el-form-item>
			
 
				+            </el-form>
			
 
				+        </div>
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            form:{
			
 
				+                name:''
			
 
				+            },
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/components/selectTemplate.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/selectTemplate.vue
@@ -0,0 +1,93 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="选择模板"
			
 
				+        width="1000px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+    >
			
 
				+        <div style="display:flex;">
			
 
				+            <div style="width: 121px;">
			
 
				+                <el-table :data="tableData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="模板名称" width="120">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table> 
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border height="300" style="flex:1;margin-left:20px;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column type="selection" width="55" align="center"></el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="医嘱内容">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="药品规格">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="开药数量">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="单次用量">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="给药途径">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="执行频率">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="天数">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+            </el-table> 
			
 
				+        </div>
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/components/templateDetail.vue
+++ b/src/xt_pages/outpatientDoctorStation/components/templateDetail.vue
@@ -0,0 +1,97 @@
 
				+<template>
			
 
				+    <el-dialog
			
 
				+        title="详情"
			
 
				+        width="1000px"
			
 
				+        :visible.sync="visible"
			
 
				+        :before-close="_close"
			
 
				+    >
			
 
				+        <el-table :data="tableData" border height="350" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+            <el-table-column align="center" prop="name" label="类型">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="医嘱名称">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="组">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="每次量">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="单位/容量">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="用法">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="频率">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="天数">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="总量">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="限制说明">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+            <el-table-column align="center" prop="name" label="组套名称">
			
 
				+                <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+            </el-table-column>
			
 
				+        </el-table> 
			
 
				+        <div slot="footer" class="dialog-footer">
			
 
				+            <el-button @click="hide">取 消</el-button>
			
 
				+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+        </div>
			
 
				+    </el-dialog>         
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+export default {
			
 
				+    data(){
			
 
				+        return{
			
 
				+            visible:false,
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }],
			
 
				+            activeName:'first'
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            // this.clear()
			
 
				+            done()
			
 
				+        },
			
 
				+        clear: function() {
			
 
				+            this.form.id = 0;
			
 
				+            this.form.name = "";
			
 
				+            this.form.intro = "";
			
 
				+        },
			
 
				+        show() {
			
 
				+            // this.clear()
			
 
				+            this.visible = true
			
 
				+        },
			
 
				+        hide() {
			
 
				+            // this.clear()
			
 
				+            this.visible = false
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+
			
--- a/src/xt_pages/outpatientDoctorStation/doctorDesk.vue
+++ b/src/xt_pages/outpatientDoctorStation/doctorDesk.vue
@@ -0,0 +1,207 @@
 
				+<template>
			
 
				+    <div class="main-contain">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container" style="display:flex">
			
 
				+            <div class="mainLeft">
			
 
				+                <div class="mainCell" style="justify-content: space-between;">
			
 
				+                    <p>未就诊：<span>0</span>人</p>
			
 
				+                    <p>已就诊：<span>0</span>人</p>
			
 
				+                </div>
			
 
				+                <div class="mainCell">
			
 
				+                    <el-radio-group v-model="radio">
			
 
				+                        <el-radio :label="1">未就诊</el-radio>
			
 
				+                        <el-radio :label="2">已就诊</el-radio>
			
 
				+                        <el-radio :label="3">全部</el-radio>
			
 
				+                    </el-radio-group>
			
 
				+                </div>
			
 
				+                <div class="mainCell" style="margin-bottom:10px;">
			
 
				+                    <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                </div>
			
 
				+                <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" width="40">
			
 
				+                        <template slot-scope="scope">
			
 
				+                            <el-popover placement="top-start" width="200" trigger="hover">
			
 
				+                                <i slot="reference" class="el-icon-caret-bottom"></i>
			
 
				+                            </el-popover>
			
 
				+                        </template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="姓名" width="100">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="姓名" width="110">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+            </div> 
			
 
				+            <div class="mainRight">
			
 
				+                <div style="display:flex;justify-content: space-between;">
			
 
				+                    <div>
			
 
				+                        <div class="mainCell">
			
 
				+                            <p>姓名：<span class="cellSpan"></span></p>
			
 
				+                            <p>证件号：<span class="cellSpan"></span></p>
			
 
				+                            <p>挂号类型：<span class="cellSpan"></span></p>
			
 
				+                            <p>患者保险类型：<span class="cellSpan"></span></p>
			
 
				+                        </div>
			
 
				+                        <div class="mainCell">
			
 
				+                            <label class="title"><span class="name">诊断</span> : </label>
			
 
				+                            <el-input size="small" style="width:150px;margin:0 10px;" v-model="input" placeholder="请输入内容"></el-input>
			
 
				+                            <label class="title"><span class="name">处方类型</span> : </label>
			
 
				+                            <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
			
 
				+                                <el-option
			
 
				+                                v-for="item in options"
			
 
				+                                :key="item.value"
			
 
				+                                :label="item.label"
			
 
				+                                :value="item.value">
			
 
				+                                </el-option>
			
 
				+                            </el-select>
			
 
				+                        </div>
			
 
				+                    </div>
			
 
				+                    <div class="cost">
			
 
				+                        <p>当用费用总额：</p>
			
 
				+                        <p>药品费用总额：</p>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <div style="display:flex;justify-content: space-between;">
			
 
				+                    <div class="mainCell" style="margin-bottom:10px;">
			
 
				+                        <label class="title"><span class="name">新增</span> : </label>
			
 
				+                        <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">智慧医保</el-button>
			
 
				+                        <el-button size="small" @click="open(2)" type="primary">病历</el-button>
			
 
				+                        <el-button size="small" @click="open(3)" type="primary">新医嘱</el-button>
			
 
				+                        <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
			
 
				+                        <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
			
 
				+                        <el-button size="small" @click="open(6)" type="primary">开检验</el-button>
			
 
				+                    </div>
			
 
				+                    <div><el-button size="small" type="primary">保存打印</el-button></div>
			
 
				+                </div>
			
 
				+                <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                    <el-table-column align="center" prop="name" label="类型">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="名称">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="规格">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="数量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="单次用量">
			
 
				+                        <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                    </el-table-column>
			
 
				+                    <el-table-column align="center" prop="name" label="操作">
			
 
				+                        <template slot-scope="scope">
			
 
				+                            <el-button size="mini" type="danger">删除</el-button>
			
 
				+                        </template>
			
 
				+                    </el-table-column>
			
 
				+                </el-table>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+        <prescription ref='prescription'></prescription>
			
 
				+        <medicalRecord ref='medicalRecord'></medicalRecord>
			
 
				+        <advice ref='advice'></advice>
			
 
				+        <select-template ref='selectTemplate'></select-template>
			
 
				+        <save-template ref='saveTemplate'></save-template>
			
 
				+        <inspection ref='inspection'></inspection>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+import prescription from './components/prescription'
			
 
				+import medicalRecord from './components/medicalRecord'
			
 
				+import advice from './components/advice'
			
 
				+import selectTemplate from './components/selectTemplate'
			
 
				+import saveTemplate from './components/saveTemplate'
			
 
				+import inspection from './components/inspection'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+        prescription,
			
 
				+        medicalRecord,
			
 
				+        advice,
			
 
				+        selectTemplate,
			
 
				+        saveTemplate,
			
 
				+        inspection
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊医生站' },
			
 
				+                { path: false, name: '医生工作台' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        open(index){
			
 
				+            if(index == 1){
			
 
				+                this.$refs.prescription.show()
			
 
				+            }else if(index == 2){
			
 
				+                this.$refs.medicalRecord.show()
			
 
				+            }else if(index == 3){
			
 
				+                this.$refs.advice.show()
			
 
				+            }else if(index == 4){
			
 
				+                this.$refs.selectTemplate.show()
			
 
				+            }else if(index == 5){
			
 
				+                this.$refs.saveTemplate.show()
			
 
				+            }else if(index == 6){
			
 
				+                this.$refs.inspection.show()
			
 
				+            }
			
 
				+            
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.mainCell{
			
 
				+    height:36px;
			
 
				+    display: flex;
			
 
				+    align-items: center;
			
 
				+}
			
 
				+.mainLeft{
			
 
				+    width:250px;
			
 
				+    .el-radio{
			
 
				+        margin-right:20px;
			
 
				+    }
			
 
				+    
			
 
				+}
			
 
				+.mainRight{
			
 
				+    margin-left:20px;
			
 
				+    flex:1;
			
 
				+    .cellSpan{
			
 
				+        min-width: 80px;
			
 
				+        display: inline-block;
			
 
				+        margin-right: 10px;
			
 
				+    }
			
 
				+    .cost{
			
 
				+        border: 1px solid #ccc;
			
 
				+        height: 60px;
			
 
				+        display: flex;
			
 
				+        width: 200px;
			
 
				+        flex-direction: column;
			
 
				+        justify-content: space-around;
			
 
				+        padding: 0 10px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientDoctorStation/pastInquiries.vue
+++ b/src/xt_pages/outpatientDoctorStation/pastInquiries.vue
@@ -0,0 +1,100 @@
 
				+<template>
			
 
				+    <div class="main-contain">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div class="cell clearfix">
			
 
				+                <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" width="60" label="序号">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        1
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="姓名" width="100">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="处方日期" width="110">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者类型">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="处方号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="开立医生">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="诊断">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="状态">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作" width="100">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        <el-button size="mini" type="danger" @click="handerDelete">删除</el-button>
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+            <el-pagination
			
 
				+                @size-change="handleSizeChange"
			
 
				+                @current-change="handleCurrentChange"
			
 
				+                :page-sizes="[10, 50, 100]"
			
 
				+                :page-size="10"
			
 
				+                background
			
 
				+                style="margin-top:20px;float: right"
			
 
				+                layout="total, sizes, prev, pager, next, jumper"
			
 
				+                :total="total"
			
 
				+            >
			
 
				+            </el-pagination>
			
 
				+            <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+import inquiriesDetail from './components/inquiriesDetail'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+        inquiriesDetail
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊医生站' },
			
 
				+                { path: false, name: '既往查询' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        handerDelete(){
			
 
				+            this.$refs.inquiriesDetail.show()
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
--- a/src/xt_pages/outpatientDoctorStation/templateManagement.vue
+++ b/src/xt_pages/outpatientDoctorStation/templateManagement.vue
@@ -0,0 +1,99 @@
 
				+<template>
			
 
				+    <div class="main-contain">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div class="cell clearfix">
			
 
				+                <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                <label class="title"><span class="name">模板类型</span> : </label>
			
 
				+                <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
			
 
				+                    <el-option
			
 
				+                    v-for="item in options"
			
 
				+                    :key="item.value"
			
 
				+                    :label="item.label"
			
 
				+                    :value="item.value">
			
 
				+                    </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" width="60" label="序号">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        1
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="模板名称" width="100">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="模板类型" width="110">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="模板等级">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="创建时间">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作" width="100">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        <el-button size="mini" type="primary" @click="handerDetail">编辑</el-button>
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+            <el-pagination
			
 
				+                @size-change="handleSizeChange"
			
 
				+                @current-change="handleCurrentChange"
			
 
				+                :page-sizes="[10, 50, 100]"
			
 
				+                :page-size="10"
			
 
				+                background
			
 
				+                style="margin-top:20px;float: right"
			
 
				+                layout="total, sizes, prev, pager, next, jumper"
			
 
				+                :total="total"
			
 
				+            >
			
 
				+            </el-pagination>
			
 
				+            <template-detail ref="templateDetail"></template-detail>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+import templateDetail from './components/templateDetail'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+        templateDetail
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊医生站' },
			
 
				+                { path: false, name: '模板管理' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        handerDetail(){
			
 
				+            this.$refs.templateDetail.show()
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
--- a/src/xt_pages/outpatientPharmacy/dispensingInquiry.vue
+++ b/src/xt_pages/outpatientPharmacy/dispensingInquiry.vue
@@ -0,0 +1,101 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div class="cell clearfix">
			
 
				+                <el-input size="small" @keyup.enter.native='searchAction' style="width:150px;" v-model.trim="search_input" class="filter-item"/>
			
 
				+                <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" size="small"></el-date-picker>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" prop="name" label="序号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="药品名称">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者姓名">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="处方号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="数量">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="用量用法">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="规格">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="单位">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="数量">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="金额">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作时间">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作人">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+            <el-pagination
			
 
				+                @size-change="handleSizeChange"
			
 
				+                @current-change="handleCurrentChange"
			
 
				+                :page-sizes="[10, 50, 100]"
			
 
				+                :page-size="10"
			
 
				+                background
			
 
				+                style="margin-top:20px;float: right"
			
 
				+                layout="total, sizes, prev, pager, next, jumper"
			
 
				+                :total="total"
			
 
				+            >
			
 
				+            </el-pagination>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊药房' },
			
 
				+                { path: false, name: '门诊配发药' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }],
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
--- a/src/xt_pages/outpatientPharmacy/drugReturnInquiry.vue
+++ b/src/xt_pages/outpatientPharmacy/drugReturnInquiry.vue
@@ -0,0 +1,107 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div style="display:flex;justify-content: space-between;">
			
 
				+                <div class="cell clearfix">
			
 
				+                    <el-input size="small" @keyup.enter.native='searchAction' style="width:150px;" v-model.trim="search_input" class="filter-item"/>
			
 
				+                    <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                    <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" size="small"></el-date-picker>
			
 
				+                </div>
			
 
				+                <div>
			
 
				+                    <el-button size="small">打印</el-button>
			
 
				+                    <el-button size="small" type="primary">报表下载</el-button>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" prop="name" label="序号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="药品名称">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者姓名">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="处方号">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="数量">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="用量用法">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="规格">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="单位">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="数量">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="金额">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作时间">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作人">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+            <el-pagination
			
 
				+                @size-change="handleSizeChange"
			
 
				+                @current-change="handleCurrentChange"
			
 
				+                :page-sizes="[10, 50, 100]"
			
 
				+                :page-size="10"
			
 
				+                background
			
 
				+                style="margin-top:20px;float: right"
			
 
				+                layout="total, sizes, prev, pager, next, jumper"
			
 
				+                :total="total"
			
 
				+            >
			
 
				+            </el-pagination>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊药房' },
			
 
				+                { path: false, name: '门诊配发药' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }],
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
--- a/src/xt_pages/outpatientPharmacy/pharmacyFormula.vue
+++ b/src/xt_pages/outpatientPharmacy/pharmacyFormula.vue
@@ -0,0 +1,133 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div style="display:flex;">
			
 
				+                <div class="formulaLeft">
			
 
				+                    <div class="mainCell" style="margin-bottom:10px;">
			
 
				+                        <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                        <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                    </div>
			
 
				+                    <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                        <el-table-column align="center" prop="name" label="处方号" width="100">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="姓名" width="99">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="操作" width="100">
			
 
				+                            <template slot-scope="scope">
			
 
				+                                <el-button size="mini" type="primary">发药</el-button>
			
 
				+                            </template>
			
 
				+                        </el-table-column>
			
 
				+                    </el-table>
			
 
				+                </div>
			
 
				+                <div style="flex:1;margin-left:20px;">
			
 
				+                    <el-button size="small" style="margin-bottom:10px;float:right" type="primary" @click="visible = true">出库设置</el-button>
			
 
				+                    <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                        <el-table-column align="center" prop="name" label="药品名称">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="生产厂商">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="单位">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="单价">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="数量">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="总价">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="天数">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="总量">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                    </el-table>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+            <el-dialog
			
 
				+                title="出库设置"
			
 
				+                width="600px"
			
 
				+                :visible.sync="visible"
			
 
				+                :before-close="_close"
			
 
				+            >
			
 
				+                <div>
			
 
				+                    <el-form :model="form" :rules="rules" class="adviceForm" ref="form" label-width="140px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				+                        <el-form-item label="药品出库扣减方式 : " prop="name">
			
 
				+                            <el-radio v-model="radio" label="1">启用系统自动扣减</el-radio>
			
 
				+                            <el-radio v-model="radio" label="2">从药房发药按钮药品扣减</el-radio>
			
 
				+                        </el-form-item>
			
 
				+                    </el-form>
			
 
				+                </div>
			
 
				+                <div slot="footer" class="dialog-footer">
			
 
				+                    <el-button @click="visible = false">取 消</el-button>
			
 
				+                    <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
			
 
				+                </div>
			
 
				+            </el-dialog>  
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊药房' },
			
 
				+                { path: false, name: '门诊配发药' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }],
			
 
				+            visible:false
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+        _close: function(done) {
			
 
				+            done()
			
 
				+        },
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.formulaLeft{
			
 
				+    width:300px;
			
 
				+    .mainCell{
			
 
				+        display: flex;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientPharmacy/prescriptionDrugReturn.vue
+++ b/src/xt_pages/outpatientPharmacy/prescriptionDrugReturn.vue
@@ -0,0 +1,110 @@
 
				+<template>
			
 
				+    <div class="main-contain outpatientChargesManagement">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div style="display:flex;">
			
 
				+                <div class="formulaLeft">
			
 
				+                    <div class="mainCell" style="margin-bottom:10px;">
			
 
				+                        <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                        <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
			
 
				+                    </div>
			
 
				+                    <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                        <el-table-column align="center" prop="name" label="处方号" width="100">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="姓名" width="99">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="操作" width="100">
			
 
				+                            <template slot-scope="scope">
			
 
				+                                <el-button size="mini" type="danger">退药</el-button>
			
 
				+                            </template>
			
 
				+                        </el-table-column>
			
 
				+                    </el-table>
			
 
				+                </div>
			
 
				+                <div style="flex:1;margin-left:20px;">
			
 
				+                    <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-bottom:10px;" type="date" placeholder="选择日期时间" align="right" size="small"></el-date-picker>
			
 
				+                    <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                        <el-table-column align="center" prop="name" label="药品名称">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="生产厂商">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="单位">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="单价">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="数量">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="总价">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="天数">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="总量">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                        <el-table-column align="center" prop="name" label="自付比例">
			
 
				+                            <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                        </el-table-column>
			
 
				+                    </el-table>
			
 
				+                </div>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb,
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊药房' },
			
 
				+                { path: false, name: '门诊配发药' }
			
 
				+            ],
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }],
			
 
				+        }
			
 
				+    },
			
 
				+    methods:{
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.formulaLeft{
			
 
				+    width:300px;
			
 
				+    .mainCell{
			
 
				+        display: flex;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientRegistration/index.vue
+++ b/src/xt_pages/outpatientRegistration/index.vue
@@ -0,0 +1,193 @@
 
				+<template>
			
 
				+    <div class="main-contain">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div class="nameTitle">患者基本信息:</div>
			
 
				+            <div class="formMain">
			
 
				+                <el-form class="basicForm" ref="form" :model="form" label-width="80px">
			
 
				+                    <el-form-item label="结算类型">
			
 
				+                        <el-select v-model="value" placeholder="请选择">
			
 
				+                            <el-option
			
 
				+                            v-for="item in options"
			
 
				+                            :key="item.value"
			
 
				+                            :label="item.label"
			
 
				+                            :value="item.value">
			
 
				+                            </el-option>
			
 
				+                        </el-select>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item class="specialFormItem" label="医保卡号">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                        <el-button type="primary">读卡</el-button>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="患者姓名">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="性别">
			
 
				+                        <el-select v-model="value" placeholder="请选择">
			
 
				+                            <el-option
			
 
				+                            v-for="item in options"
			
 
				+                            :key="item.value"
			
 
				+                            :label="item.label"
			
 
				+                            :value="item.value">
			
 
				+                            </el-option>
			
 
				+                        </el-select>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="证件类型">
			
 
				+                        <el-select v-model="value" placeholder="请选择">
			
 
				+                            <el-option
			
 
				+                            v-for="item in options"
			
 
				+                            :key="item.value"
			
 
				+                            :label="item.label"
			
 
				+                            :value="item.value">
			
 
				+                            </el-option>
			
 
				+                        </el-select>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="医疗类别">
			
 
				+                        <el-select v-model="value" placeholder="请选择">
			
 
				+                            <el-option
			
 
				+                            v-for="item in options"
			
 
				+                            :key="item.value"
			
 
				+                            :label="item.label"
			
 
				+                            :value="item.value">
			
 
				+                            </el-option>
			
 
				+                        </el-select>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="出生日期">
			
 
				+                        <el-date-picker v-model="value1" type="date" placeholder="选择日期"></el-date-picker>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="年龄">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="证件号码">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                    </el-form-item>
			
 
				+                </el-form>
			
 
				+            </div>
			
 
				+            <div class="nameTitle">患者挂号信息:</div>
			
 
				+            <div class="formMain">
			
 
				+                <el-form class="basicForm" ref="form" :model="form" label-width="80px">
			
 
				+                    <el-form-item label="挂号类型">
			
 
				+                        <el-select v-model="value" placeholder="请选择">
			
 
				+                            <el-option
			
 
				+                            v-for="item in options"
			
 
				+                            :key="item.value"
			
 
				+                            :label="item.label"
			
 
				+                            :value="item.value">
			
 
				+                            </el-option>
			
 
				+                        </el-select>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="医生">
			
 
				+                        <el-select v-model="value" placeholder="请选择">
			
 
				+                            <el-option
			
 
				+                            v-for="item in options"
			
 
				+                            :key="item.value"
			
 
				+                            :label="item.label"
			
 
				+                            :value="item.value">
			
 
				+                            </el-option>
			
 
				+                        </el-select>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="科室">
			
 
				+                        <el-select v-model="value" placeholder="请选择">
			
 
				+                            <el-option
			
 
				+                            v-for="item in options"
			
 
				+                            :key="item.value"
			
 
				+                            :label="item.label"
			
 
				+                            :value="item.value">
			
 
				+                            </el-option>
			
 
				+                        </el-select>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item>
			
 
				+                        <el-checkbox v-model="checked">是否需要工本费</el-checkbox>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="挂号费">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="诊疗费">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="工本费">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item label="合计">
			
 
				+                        <el-input v-model="form.name"></el-input>
			
 
				+                    </el-form-item>
			
 
				+                    <el-form-item>
			
 
				+                        <!-- <el-input v-model="form.name"></el-input> -->
			
 
				+                    </el-form-item>
			
 
				+                </el-form>
			
 
				+                <el-button style="float:right" type="primary">挂号</el-button>
			
 
				+            </div>
			
 
				+            
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊挂号' },
			
 
				+                { path: false, name: '门诊挂号' }
			
 
				+            ],
			
 
				+            form:{},
			
 
				+            options: [{
			
 
				+                value: '选项1',
			
 
				+                label: '黄金糕'
			
 
				+                }, {
			
 
				+                value: '选项2',
			
 
				+                label: '双皮奶'
			
 
				+                }, {
			
 
				+                value: '选项3',
			
 
				+                label: '蚵仔煎'
			
 
				+                }, {
			
 
				+                value: '选项4',
			
 
				+                label: '龙须面'
			
 
				+                }, {
			
 
				+                value: '选项5',
			
 
				+                label: '北京烤鸭'
			
 
				+            }],
			
 
				+            value: ''
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.nameTitle{
			
 
				+    font-weight: bold;
			
 
				+    font-size: 16px;
			
 
				+}
			
 
				+.formMain{
			
 
				+    // padding: 10px 90px;
			
 
				+    width:80%;
			
 
				+    margin: 0 auto;
			
 
				+}
			
 
				+.basicForm{
			
 
				+    
			
 
				+    display: flex;
			
 
				+    flex-wrap: wrap;
			
 
				+    justify-content: space-between;
			
 
				+    .el-form-item{
			
 
				+        width: 260px;
			
 
				+    }
			
 
				+    .specialFormItem{
			
 
				+        width:625px;
			
 
				+        .el-input{
			
 
				+            min-width: 150px;
			
 
				+        }
			
 
				+    }
			
 
				+    .el-select{
			
 
				+        width: 180px;
			
 
				+    }
			
 
				+    .el-input{
			
 
				+        width: 180px;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/xt_pages/outpatientRegistration/registrationHistory.vue
+++ b/src/xt_pages/outpatientRegistration/registrationHistory.vue
@@ -0,0 +1,126 @@
 
				+<template>
			
 
				+    <div class="main-contain">
			
 
				+        <div class="position">
			
 
				+            <bread-crumb :crumbs='crumbs'></bread-crumb>
			
 
				+        </div>
			
 
				+        <div class="app-container">
			
 
				+            <div class="cell clearfix">
			
 
				+                <el-input style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
			
 
				+                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
			
 
				+                <el-date-picker
			
 
				+                v-model="value1"
			
 
				+                style="margin-right:10px;"
			
 
				+                type="daterange"
			
 
				+                range-separator="-"
			
 
				+                start-placeholder="开始日期"
			
 
				+                end-placeholder="结束日期">
			
 
				+                </el-date-picker>
			
 
				+                <label class="title"><span class="name">挂号类型</span> : </label>
			
 
				+                <el-select v-model="value" placeholder="请选择" style="width:150px;">
			
 
				+                    <el-option
			
 
				+                    v-for="item in options"
			
 
				+                    :key="item.value"
			
 
				+                    :label="item.label"
			
 
				+                    :value="item.value">
			
 
				+                    </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				+                <el-table-column align="center" prop="dialysis_no" label="序号" width="60">
			
 
				+                    <template slot-scope="scope">1</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="时间" width="100">
			
 
				+                    <template slot-scope="scope">{{ scope.row.date }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
			
 
				+                    <template slot-scope="scope">{{scope.row.name}}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="科室" width="80">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="挂号类型" width="90">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="就诊号" width="80">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="证件号">
			
 
				+                    <template slot-scope="scope">782319204827282917</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="患者保险类型" width="80">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="医生" width="80">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="挂号费" width="70">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="诊疗费" width="70">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="工本费" width="70">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作人" width="70">
			
 
				+                    <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				+                </el-table-column>
			
 
				+                <el-table-column align="center" prop="name" label="操作" width="80">
			
 
				+                    <template slot-scope="scope">
			
 
				+                        <el-button size="mini" type="primary">编辑</el-button>
			
 
				+                    </template>
			
 
				+                </el-table-column>
			
 
				+            </el-table>
			
 
				+
			
 
				+            <el-pagination
			
 
				+                @size-change="handleSizeChange"
			
 
				+                @current-change="handleCurrentChange"
			
 
				+                :page-sizes="[10, 50, 100]"
			
 
				+                :page-size="10"
			
 
				+                background
			
 
				+                style="margin-top:20px;float: right"
			
 
				+                layout="total, sizes, prev, pager, next, jumper"
			
 
				+                :total="total"
			
 
				+            >
			
 
				+            </el-pagination>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+export default {
			
 
				+    components:{
			
 
				+        BreadCrumb
			
 
				+    },
			
 
				+    data(){
			
 
				+        return{
			
 
				+            crumbs: [
			
 
				+                { path: false, name: '门诊挂号' },
			
 
				+                { path: false, name: '挂号历史' }
			
 
				+            ],
			
 
				+            value1:'',
			
 
				+            tableData: [{
			
 
				+            date: '2016-05-02',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1518 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-04',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1517 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-01',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1519 弄'
			
 
				+            }, {
			
 
				+            date: '2016-05-03',
			
 
				+            name: '王小虎',
			
 
				+            address: '上海市普陀区金沙江路 1516 弄'
			
 
				+            }]
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+</style>
			
--- a/src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue
+++ b/src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue
@@ -70,7 +70,7 @@
 
				       </div>
			
 
				       <div style="padding-left:10px;flex:1">
			
 
				         <div class="tableTitle">统计表</div>
			
 
				-        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
			
 
				+        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
			
 
				         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
			
 
				         >
			
 
				           <el-table-column prop="name" label="姓名" width="140">
			
@@ -84,8 +84,7 @@
 
				           </el-table-column>
			
 
				           <el-table-column prop="mode_id" label="透析模式">
			
 
				               <template slot-scope="scope">
			
 
				-                <!-- <span>{{ scope.row.mode_id.join("、") }}</span> -->
			
 
				-                <span>{{getModeIdCount(scope.row.patient_id)}}</span>
			
 
				+                <span>{{ scope.row.mode_id.join("、")}}</span>
			
 
				               </template>
			
 
				            </el-table-column>
			
 
				           <el-table-column prop="address" label="透析总次数" width="140">
			
@@ -141,7 +140,7 @@ export default {
 
				           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
			
 
				           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
			
 
				         }
			
 
				-      }, 
			
 
				+      },
			
 
				       patient_id:0,
			
 
				       modeIdCount:[],
			
 
				     };
			
@@ -155,7 +154,7 @@ export default {
 
				       } else {
			
 
				         this.getDialysisList()
			
 
				       }
			
 
				-      
			
 
				+
			
 
				     },
			
 
				     changeEndTime(val) {
			
 
				       var time =
			
@@ -195,13 +194,13 @@ export default {
 
				          if(response.data.state === 1){
			
 
				           var list = response.data.data.list
			
 
				           var totallist  =  response.data.data.totallist
			
 
				-          this.total = totallist  
			
 
				+          this.total = totallist
			
 
				           var prescriptionList = response.data.data.prescriptionList
			
 
				-         
			
 
				+
			
 
				           this.getModeId(prescriptionList)
			
 
				           var count = response.data.data.count
			
 
				           this.DialysisCount = count
			
 
				-          
			
 
				+
			
 
				           var modeIdCount = response.data.data.modeIdCount
			
 
				           console.log("modeidcount=====",modeIdCount)
			
 
				           for(let i=0;i<modeIdCount.length;i++){
			
@@ -280,7 +279,7 @@ export default {
 
				             }
			
 
				           })
			
 
				           let list = Object.values(dataInfo)
			
 
				-          // console.log("arr",list)    
			
 
				+          // console.log("arr",list)
			
 
				           list.map(item => {
			
 
				             for (let i = 0; i < prescriptionList.length; i++) {
			
 
				               if (item.patient_id === prescriptionList[i].patient_id) {
			
@@ -347,7 +346,7 @@ export default {
 
				          }
			
 
				        })
			
 
				       }
			
 
				-    
			
 
				+
			
 
				     },
			
 
				     unique(arr) {
			
 
				         const res = new Map();
			
@@ -381,7 +380,7 @@ export default {
 
				             // console.log("total",total)
			
 
				           }
			
 
				        })
			
 
				-     
			
 
				+
			
 
				     },
			
 
				     getModeId(patients){
			
 
				       for(let i=0;i<patients.length;i++){
			
@@ -457,10 +456,10 @@ export default {
 
				         }
			
 
				         let str = ''
			
 
				         arr.map(item => {
			
 
				-          str += item.mode_id + '(' + item.Count + '次) 、' 
			
 
				+          str += item.mode_id + '(' + item.Count + '次) 、'
			
 
				         })
			
 
				         var strs = str.substring(0, str.length - 1)
			
 
				-       
			
 
				+
			
 
				         return strs
			
 
				       }
			
 
				   },
			
@@ -485,7 +484,7 @@ export default {
 
				       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
			
 
				       "-" +
			
 
				       (nowDay < 10 ? "0" + nowDay : nowDay);
			
 
				-    
			
 
				+
			
 
				      //获取该机构下的所有患者
			
 
				      this.getCurrentOrgPatients()
			
 
				      //统计列表
			
--- a/src/xt_pages/sign/lineUp.vue
+++ b/src/xt_pages/sign/lineUp.vue
--- a/src/xt_pages/sign/signIn.vue
+++ b/src/xt_pages/sign/signIn.vue
--- a/src/xt_pages/stock/Dialog/goodInfoDailog.vue
+++ b/src/xt_pages/stock/Dialog/goodInfoDailog.vue
@@ -5,11 +5,12 @@
 
				              :close-on-click-modal="isClose"
			
 
				              :close-on-press-escape="isClose">
			
 
				 
			
 
				-    <el-tabs v-model="activeName" >
			
 
				+    <el-tabs v-model="activeName">
			
 
				       <el-tab-pane label="基础数据" name="first">
			
 
				         <div>
			
 
				           <!--:rules="rules"-->
			
 
				-          <el-form :model="form"  ref="form" :rules="rules" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				+          <el-form :model="form" ref="form" :rules="rules" label-width="100px"
			
 
				+                   style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
			
 
				               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
			
 
				             </el-form-item>
			
@@ -52,7 +53,7 @@
 
				             <el-form-item label="规格型号 : " prop="specification_name" style="width:100%">
			
 
				               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
			
 
				             </el-form-item>
			
 
				-            <el-form-item label="生产厂商 : " prop="manufacturer"  style="width:100%">
			
 
				+            <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
			
 
				               <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
			
 
				                 <el-option
			
 
				                   v-for="item,index in form.manufacturers"
			
@@ -82,7 +83,8 @@
 
				               <el-input v-model="form.stock_warn_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
			
 
				             </el-form-item>
			
 
				             <el-form-item label="医保编码 : " prop="medical_insurance_number">
			
 
				-              <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
			
 
				+              <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder=""
			
 
				+                        maxlength="30"></el-input>
			
 
				             </el-form-item>
			
 
				             <el-form-item label="是否特病目录:" prop="is_special_diseases">
			
 
				               <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
			
@@ -115,17 +117,23 @@
 
				               </el-select>
			
 
				             </el-form-item>
			
 
				             <!--<el-form-item label="代理商 : " prop="name" style="visibility: hidden;">-->
			
 
				-              <!--<el-input style="width:160px;" v-model="form.agent" placeholder="" maxlength="30"></el-input>-->
			
 
				+            <!--<el-input style="width:160px;" v-model="form.agent" placeholder="" maxlength="30"></el-input>-->
			
 
				             <!--</el-form-item>-->
			
 
				 
			
 
				 
			
 
				-
			
 
				             <el-form-item label="状态 : " prop="good_status">
			
 
				-              <el-radio-group v-model="form.good_status">
			
 
				-                <el-radio :label="1">停用</el-radio>
			
 
				-                <el-radio :label="2">收费</el-radio>
			
 
				-              </el-radio-group>
			
 
				+              <!--<el-radio-group v-model="form.good_status">-->
			
 
				+              <!--<el-radio :label="1">停用</el-radio>-->
			
 
				+              <!--<el-radio :label="2">收费</el-radio>-->
			
 
				+              <!--</el-radio-group>-->
			
 
				+
			
 
				+              <el-checkbox-group v-model="good_status">
			
 
				+                <el-checkbox label="停用">停用</el-checkbox>
			
 
				+                <el-checkbox label="收费">收费</el-checkbox>
			
 
				+              </el-checkbox-group>
			
 
				             </el-form-item>
			
 
				+
			
 
				+
			
 
				             <el-form-item label="备注 : " prop="name" style="width:100%;">
			
 
				               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
			
 
				             </el-form-item>
			
@@ -133,7 +141,8 @@
 
				         </div>
			
 
				       </el-tab-pane>
			
 
				       <el-tab-pane label="扩展数据" name="second">
			
 
				-        <el-form :model="form"    label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				+        <el-form :model="form" label-width="120px"
			
 
				+                 style="display: flex;flex-wrap: wrap;justify-content: space-between;">
			
 
				           <el-form-item label="默认使用数量:" prop="name">
			
 
				             <el-input v-model="form.default_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
			
 
				           </el-form-item>
			
@@ -215,10 +224,8 @@
 
				     </el-tabs>
			
 
				 
			
 
				 
			
 
				-
			
 
				-
			
 
				     <span slot="footer" class="dialog-footer">
			
 
				-    <el-button  @click="cancle('form')">取 消</el-button>
			
 
				+    <el-button @click="cancle('form')">取 消</el-button>
			
 
				     <el-button type="primary" @click="comfirm('form')">保 存</el-button>
			
 
				   </span>
			
 
				   </el-dialog>
			
@@ -227,15 +234,15 @@
 
				 
			
 
				 
			
 
				 <script>
			
 
				-  import { getDictionaryDataConfig } from "@/utils/data";
			
 
				+  import { getDictionaryDataConfig } from '@/utils/data'
			
 
				 
			
 
				   export default {
			
 
				     name: 'goodInfoDailog',
			
 
				     data() {
			
 
				       return {
			
 
				-        visible:false,
			
 
				-        formTitle:'',
			
 
				-        activeName:'first',
			
 
				+        visible: false,
			
 
				+        formTitle: '',
			
 
				+        activeName: 'first',
			
 
				         options: [{
			
 
				           value: '1',
			
 
				           label: '是'
			
@@ -245,8 +252,9 @@
 
				         }],
			
 
				         good_unit: '',
			
 
				         isClose: false,
			
 
				+        good_status: [],
			
 
				         size: 11,
			
 
				-        visibility:false,
			
 
				+        visibility: false,
			
 
				         form: {
			
 
				           good_id: '',
			
 
				           specification_name: '',
			
@@ -259,28 +267,28 @@
 
				           expiry_date_warn_day_count: '',
			
 
				           stock_warn_count: '',
			
 
				           is_reuse: '2',
			
 
				-          good_name:'',
			
 
				-          pinyin:"",
			
 
				-          wubi:"",
			
 
				-          good_kind:'',
			
 
				-          medical_insurance_level:'',
			
 
				-          good_unit:'',
			
 
				-          retail_price:'',
			
 
				-          medical_insurance_number:'',
			
 
				-          is_special_diseases:'',
			
 
				-          is_record:'',
			
 
				-          statistics_category:'',
			
 
				-          agent:'',
			
 
				-          good_status:'',
			
 
				-          default_count:'',
			
 
				-          sign:'',
			
 
				-          is_default:'',
			
 
				-          is_charge_use:'',
			
 
				-          is_charge_predict:'',
			
 
				-          is_statistics_work:'',
			
 
				-          sort:'',
			
 
				-          is_doctor_use:'',
			
 
				-          good_number:'',
			
 
				+          good_name: '',
			
 
				+          pinyin: '',
			
 
				+          wubi: '',
			
 
				+          good_kind: '',
			
 
				+          medical_insurance_level: '',
			
 
				+          good_unit: '',
			
 
				+          retail_price: '',
			
 
				+          medical_insurance_number: '',
			
 
				+          is_special_diseases: '',
			
 
				+          is_record: '',
			
 
				+          statistics_category: '',
			
 
				+          agent: '',
			
 
				+          good_status: '',
			
 
				+          default_count: '',
			
 
				+          sign: '',
			
 
				+          is_default: '',
			
 
				+          is_charge_use: '',
			
 
				+          is_charge_predict: '',
			
 
				+          is_statistics_work: '',
			
 
				+          sort: '',
			
 
				+          is_doctor_use: '',
			
 
				+          good_number: ''
			
 
				         },
			
 
				 
			
 
				         rules: {
			
@@ -305,18 +313,16 @@
 
				           medical_insurance_level: [
			
 
				             { required: true, message: '请输入医保等级', trigger: 'blur' }
			
 
				           ],
			
 
				-          manufacturer:[
			
 
				+          manufacturer: [
			
 
				             { required: true, message: '请选择生产厂商', trigger: 'blur' }
			
 
				-          ],good_unit:[
			
 
				+          ], good_unit: [
			
 
				             { required: true, message: '请选择单位', trigger: 'blur' }
			
 
				-          ],retail_price:[
			
 
				+          ], retail_price: [
			
 
				             { required: true, message: '请输入零价', trigger: 'blur' }
			
 
				-          ],stock_warn_count:[
			
 
				+          ], stock_warn_count: [
			
 
				             { required: true, message: '请输入库存警戒', trigger: 'blur' }
			
 
				           ]
			
 
				 
			
 
				-
			
 
				-
			
 
				         }
			
 
				       }
			
 
				     },
			
@@ -337,15 +343,66 @@
 
				 
			
 
				     },
			
 
				     methods: {
			
 
				-      getDictionaryDataConfig(module,filed_name){
			
 
				-       return getDictionaryDataConfig(module,filed_name)
			
 
				+      getDictionaryDataConfig(module, filed_name) {
			
 
				+        return getDictionaryDataConfig(module, filed_name)
			
 
				 
			
 
				       },
			
 
				-      show() {
			
 
				+      show(id,form) {
			
 
				         this.visible = true
			
 
				-        console.log(this.getDictionaryDataConfig("system","drug_type"))
			
 
				+        this.good_status =[]
			
 
				+        if (id == 0) {
			
 
				 
			
 
				-      },  hide() {
			
 
				+          var tempform = {
			
 
				+              good_id: '',
			
 
				+              specification_name: '',
			
 
				+              buy_price: '',
			
 
				+              sell_price: '',
			
 
				+              remark: '',
			
 
				+              manufacturer: '',
			
 
				+              good_type_id: '',
			
 
				+              dealer: '',
			
 
				+              expiry_date_warn_day_count: '',
			
 
				+              stock_warn_count: '',
			
 
				+              is_reuse: '2',
			
 
				+              good_name: '',
			
 
				+              pinyin: '',
			
 
				+              wubi: '',
			
 
				+              good_kind: '',
			
 
				+              medical_insurance_level: '',
			
 
				+              good_unit: '',
			
 
				+              retail_price: '',
			
 
				+              medical_insurance_number: '',
			
 
				+              is_special_diseases: '',
			
 
				+              is_record: '',
			
 
				+              statistics_category: '',
			
 
				+              agent: '',
			
 
				+              good_status: '',
			
 
				+              default_count: '',
			
 
				+              sign: '',
			
 
				+              is_default: '',
			
 
				+              is_charge_use: '',
			
 
				+              is_charge_predict: '',
			
 
				+              is_statistics_work: '',
			
 
				+              sort: '',
			
 
				+              is_doctor_use: '',
			
 
				+              good_number: ''
			
 
				+            }
			
 
				+          this.good_status = []
			
 
				+          for (let key in tempform) {
			
 
				+            this.form[key] = tempform[key]
			
 
				+          }
			
 
				+        } else {
			
 
				+          for (let key in form) {
			
 
				+            this.form[key] = form[key]
			
 
				+          }
			
 
				+          if (this.form.good_status.length > 0) {
			
 
				+            for (let i = 0; i < this.form.good_status.split(",").length; i++) {
			
 
				+              this.good_status.push(this.form.good_status.split(',')[i])
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+
			
 
				+      }, hide() {
			
 
				         this.visible = false
			
 
				       },
			
 
				       cancle: function(formName) {
			
@@ -383,7 +440,7 @@
 
				         form['is_special_diseases'] = this.form.is_special_diseases
			
 
				         form['is_record'] = this.form.is_record
			
 
				         form['statistics_category'] = this.form.statistics_category
			
 
				-        form['good_status'] = this.form.good_status
			
 
				+        // form['good_status'] = this.form.good_status
			
 
				         form['default_count'] = this.form.default_count
			
 
				         form['sign'] = this.form.sign
			
 
				         form['is_default'] = this.form.is_default
			
@@ -394,9 +451,7 @@
 
				         form['is_doctor_use'] = this.form.is_doctor_use
			
 
				         form['agent'] = this.form.agent
			
 
				         form['good_number'] = this.form.good_number
			
 
				-
			
 
				-
			
 
				-
			
 
				+        form['good_status'] = this.good_status.join(',')
			
 
				 
			
 
				         return form
			
 
				       }, changeSelected: function(val) {
			
--- a/src/xt_pages/stock/drugs/cancelDrugStockOrder.vue
+++ b/src/xt_pages/stock/drugs/cancelDrugStockOrder.vue
@@ -264,7 +264,7 @@ export default {
 
				     },
			
 
				     AddNewOrder: function() {
			
 
				       this.$router.push({
			
 
				-        name: "cancelStockOrderAdd",
			
 
				+        name: "cancelDrugStockOrderAdd",
			
 
				         query: { type: this.type }
			
 
				       });
			
 
				     },
			
@@ -390,7 +390,7 @@ export default {
 
				     },
			
 
				     handleEdit: function(index, row) {
			
 
				       this.$router.push({
			
 
				-        name: "cancelStockDetail",
			
 
				+        name: "cancelDrugStockDetail",
			
 
				         query: { id: row.id, type: this.type }
			
 
				       });
			
 
				     },
			
--- a/src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue
+++ b/src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue
@@ -120,9 +120,9 @@
 
				 
			
 
				               <el-form-item style="padding-top: 15px">
			
 
				                 <el-input
			
 
				-                  placeholder="请输入商品类型"
			
 
				-                  v-model="scope.row.good_type_id"
			
 
				-                  :value="typeName(scope.row.good_type_id)"
			
 
				+                  placeholder="请输入药品名称"
			
 
				+                  v-model="scope.row.drug_id"
			
 
				+                  :value="typeName(scope.row.drug_id)"
			
 
				                   @focus="showDialog(scope.$index, scope.row)"
			
 
				                 ></el-input>
			
 
				               </el-form-item>
			
@@ -136,14 +136,35 @@
 
				               <el-form-item style="padding-top: 15px">
			
 
				                 <el-input
			
 
				                   placeholder="请输入规格名称"
			
 
				-                  v-model="scope.row.good_id"
			
 
				-                  :value="specificationName(scope.row.good_id)"
			
 
				+                  v-model="scope.row.drug_id"
			
 
				+                  :value="specificationName(scope.row.drug_id)"
			
 
				                   @focus="showDialog(scope.$index, scope.row)"
			
 
				                 ></el-input>
			
 
				               </el-form-item>
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				+          <el-table-column align="center" width="150">
			
 
				+            <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>
			
@@ -162,6 +183,25 @@
 
				               </el-form-item>
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				+
			
 
				+          <el-table-column label="进价总价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.price * scope.row.return_count) }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+
			
 
				+          <el-table-column label="零价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ scope.row.retail_price }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+          <el-table-column label="零价总价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.retail_price * scope.row.return_count) }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				           <el-table-column label="操作" align="center" min-width="20">
			
 
				             <template slot-scope="scope">
			
 
				               <el-tooltip
			
@@ -270,19 +310,20 @@ export default {
 
				       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.selectedGoodInfo[i].good_type_id
			
 
				-            this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
			
 
				-
			
 
				+            this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
			
 
				+            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString();
			
 
				+            this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString();
			
 
				           } else {
			
 
				             const tempForm = {}
			
 
				             tempForm['drug_id'] = val.selectedGoodInfo[i].id
			
 
				             tempForm["return_count"] = "";
			
 
				+            tempForm["price"] = val.selectedGoodInfo[i].last_price.toString();
			
 
				+            tempForm["retail_price"] =  val.selectedGoodInfo[i].retail_price.toString();
			
 
				             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
			
 
				           }
			
 
				         }
			
 
				       }
			
 
				       this.currentIndex = -1
			
 
				-
			
 
				     },
			
 
				 
			
 
				     cancle: function() {
			
@@ -322,7 +363,7 @@ export default {
 
				 
			
 
				     },
			
 
				 
			
 
				-    typeName: function(good_type_id) {
			
 
				+    typeName: function(drug_id) {
			
 
				       let name = "";
			
 
				       for (let i = 0; i < this.goodInfo.length; i++) {
			
 
				         if (this.goodInfo[i].id == drug_id) {
			
@@ -332,7 +373,7 @@ export default {
 
				       }
			
 
				       return name;
			
 
				     },
			
 
				-    specificationName: function(good_info_id) {
			
 
				+    specificationName: function(drug_id) {
			
 
				       let name = "";
			
 
				       for (let i = 0; i < this.goodInfo.length; i++) {
			
 
				         if (this.goodInfo[i].id == drug_id) {
			
@@ -345,6 +386,9 @@ export default {
 
				       const tempObj = {};
			
 
				       tempObj["drug_id"] = 0;
			
 
				       tempObj["return_count"] = "";
			
 
				+      tempObj["price"] = "";
			
 
				+      tempObj["retail_price"] = "";
			
 
				+
			
 
				       this.recordInfo.recordData.push(tempObj);
			
 
				     },
			
 
				     handleDelete: function(index, row) {
			
@@ -495,6 +539,10 @@ export default {
 
				     tempObj["good_type_id"] = 0;
			
 
				     tempObj["good_id"] = 0;
			
 
				     tempObj["return_count"] = "";
			
 
				+    tempObj["price"] = "";
			
 
				+    tempObj["retail_price"] = "";
			
 
				+
			
 
				+
			
 
				     this.recordInfo.recordData.push(tempObj);
			
 
				     this.GetConfigInfo();
			
 
				     this.propForm.goodUnit = this.$store.getters.good_unit;
			
--- a/src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue
+++ b/src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue
@@ -73,8 +73,8 @@
 
				 
			
 
				             <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)"
			
 
				+                <el-input placeholder="请输入药品类型" v-model="scope.row.drug_id"
			
 
				+                          :value="typeName(scope.row.drug_id)"
			
 
				                           @focus="showDialog(scope.$index, scope.row)"></el-input>
			
 
				               </el-form-item>
			
 
				             </template>
			
@@ -86,14 +86,34 @@
 
				             <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)"
			
 
				+                <el-input placeholder="请输入药品规格名称" v-model="scope.row.drug_id"
			
 
				+                          :value="specificationName(scope.row.drug_id)"
			
 
				                           @focus="showDialog(scope.$index, scope.row)"></el-input>
			
 
				               </el-form-item>
			
 
				 
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				+          <el-table-column align="center" width="150">
			
 
				+            <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">
			
@@ -107,6 +127,25 @@
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				+          <el-table-column label="进价总价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.price * scope.row.count) }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+
			
 
				+          <el-table-column label="零价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ scope.row.retail_price }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+          <el-table-column label="零价总价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.retail_price * scope.row.count) }}
			
 
				+            </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">
			
@@ -155,7 +194,7 @@
 
				       return {
			
 
				         crumbs: [
			
 
				           { path: false, name: '库存管理' },
			
 
				-          { path: false, name: '耗材退库单' },
			
 
				+          { path: false, name: '药品退库单' },
			
 
				           { path: false, name: '编辑退库单' }
			
 
				         ],
			
 
				 
			
@@ -220,12 +259,18 @@
 
				         if (val.selectedGoodInfo.length > 0) {
			
 
				           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
			
 
				             if (i == 0) {
			
 
				+
			
 
				               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
			
 
				+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
			
 
				+              this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
			
 
				+
			
 
				             } else {
			
 
				               const tempForm = {}
			
 
				               tempForm['id'] = 0
			
 
				               tempForm['drug_id'] = val.selectedGoodInfo[i].id
			
 
				               tempForm['count'] = ''
			
 
				+              tempForm['price'] = val.selectedGoodInfo[i].last_price.toString()
			
 
				+              tempForm['retail_price'] =  val.selectedGoodInfo[i].retail_price.toString()
			
 
				               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
			
 
				             }
			
 
				           }
			
@@ -234,6 +279,11 @@
 
				         this.currentIndex = -1
			
 
				       }, cancle: function() {
			
 
				         this.$refs.dialog.hide()
			
 
				+      },calculate: function(val) {
			
 
				+        if (val == 0) {
			
 
				+          return ''
			
 
				+        }
			
 
				+        return Math.round(parseFloat(val) * 100) / 100
			
 
				       },
			
 
				       GetConfigInfo: function() {
			
 
				         const loading = this.$loading({
			
@@ -266,7 +316,7 @@
 
				 
			
 
				       },
			
 
				 
			
 
				-      typeName: function(good_type_id) {
			
 
				+      typeName: function(drug_id) {
			
 
				         let name = "";
			
 
				         for (let i = 0; i < this.goodInfo.length; i++) {
			
 
				           if (this.goodInfo[i].id == drug_id) {
			
@@ -275,7 +325,7 @@
 
				           }
			
 
				         }
			
 
				         return name;
			
 
				-      },  specificationName: function(good_info_id) {
			
 
				+      },  specificationName: function(drug_id) {
			
 
				         console.log(this.goodInfo)
			
 
				         let name = "";
			
 
				         for (let i = 0; i < this.goodInfo.length; i++) {
			
@@ -289,6 +339,10 @@
 
				         tempObj['id'] = 0
			
 
				         tempObj['drug_id'] = 0
			
 
				         tempObj['count'] = ''
			
 
				+        tempObj['price'] = ''
			
 
				+        tempObj['retail_price'] = ''
			
 
				+
			
 
				+
			
 
				         this.recordInfo.recordData.push(tempObj)
			
 
				       }, handleDelete: function(index, row) {
			
 
				         if (row.id == 0) {
			
@@ -413,6 +467,8 @@
 
				           } else {
			
 
				             for (let i = 0; i < response.data.data.list.length; i++) {
			
 
				               response.data.data.list[i].count = response.data.data.list[i].count.toString()
			
 
				+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
			
 
				+              response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
			
 
				               this.recordInfo.recordData.push(response.data.data.list[i])
			
 
				             }
			
 
				             this.cancelStock = response.data.data.info
			
@@ -425,6 +481,8 @@
 
				             tempObj['id'] = 0
			
 
				             tempObj['drug_id'] = 0
			
 
				             tempObj['count'] = ''
			
 
				+            tempObj['price'] = ''
			
 
				+            tempObj['retail_price'] = ''
			
 
				             this.recordInfo.recordData.push(tempObj)
			
 
				           }
			
 
				         })
			
--- a/src/xt_pages/stock/drugs/drugSalesReturnEdit.vue
+++ b/src/xt_pages/stock/drugs/drugSalesReturnEdit.vue
@@ -106,6 +106,33 @@
 
				               </template>
			
 
				             </el-table-column>
			
 
				 
			
 
				+            <el-table-column align="center" width="150">
			
 
				+              <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 label="进货总价" align="center" width="80">
			
 
				+              <template slot-scope="scope">
			
 
				+                {{ calculate(scope.row.price * scope.row.count) }}
			
 
				+              </template>
			
 
				+            </el-table-column>
			
 
				+
			
 
				+
			
 
				 
			
 
				             <el-table-column min-width="23" align="center">
			
 
				               <template slot="header" slot-scope="scope">
			
@@ -119,6 +146,19 @@
 
				               </template>
			
 
				             </el-table-column>
			
 
				 
			
 
				+            <el-table-column label="零价" align="center" width="80">
			
 
				+              <template slot-scope="scope">
			
 
				+                {{ scope.row.retail_price }}
			
 
				+              </template>
			
 
				+            </el-table-column>
			
 
				+
			
 
				+            <el-table-column label="零价总价" align="center" width="80">
			
 
				+              <template slot-scope="scope">
			
 
				+                {{ calculate(scope.row.retail_price * scope.row.count) }}
			
 
				+              </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">
			
@@ -227,12 +267,16 @@
 
				           for (let i = val.selectedGoodInfo.length -1; i >= 0 ; i--) {
			
 
				             if (i == 0) {
			
 
				               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
			
 
				+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
			
 
				+              this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
			
 
				+
			
 
				             } else {
			
 
				               const tempForm = {}
			
 
				               tempForm['id'] = 0
			
 
				               tempForm['drug_id'] = val.selectedGoodInfo[i].id
			
 
				-              tempForm['return_count'] = ''
			
 
				-              tempForm['price'] = ''
			
 
				+              tempForm['count'] = ''
			
 
				+              tempForm['price'] = val.selectedGoodInfo[i].last_price.toString()
			
 
				+              tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
			
 
				               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
			
 
				             }
			
 
				           }
			
@@ -295,6 +339,8 @@
 
				         tempObj['id'] = 0
			
 
				         tempObj['drug_id'] = 0
			
 
				         tempObj['count'] = ''
			
 
				+        tempObj['price'] = ''
			
 
				+        tempObj['retail_price'] = ''
			
 
				         this.recordInfo.recordData.push(tempObj)
			
 
				       }, handleDelete: function(index, row) {
			
 
				         console.log(row.id)
			
@@ -327,6 +373,12 @@
 
				         } else {
			
 
				           return ''
			
 
				         }
			
 
				+      },calculate: function(val) {
			
 
				+        if (val == 0) {
			
 
				+          return ''
			
 
				+        }
			
 
				+
			
 
				+        return Math.round(parseFloat(val) * 100) / 100
			
 
				       },
			
 
				       showDialog(index, row) {
			
 
				         this.currentIndex = index;
			
@@ -418,6 +470,9 @@
 
				           } else {
			
 
				             for (let i = 0; i < response.data.data.list.length; i++) {
			
 
				               response.data.data.list[i].count = response.data.data.list[i].count.toString()
			
 
				+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
			
 
				+              response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
			
 
				+
			
 
				               this.recordInfo.recordData.push(response.data.data.list[i])
			
 
				             }
			
 
				             this.salesReturn = response.data.data.salesReturn
			
@@ -431,6 +486,10 @@
 
				             tempObj['id'] = 0
			
 
				             tempObj['drug_id'] = 0
			
 
				             tempObj['count'] = ''
			
 
				+            tempObj['price'] = ''
			
 
				+            tempObj['retail_price'] = ''
			
 
				+
			
 
				+
			
 
				             this.recordInfo.recordData.push(tempObj)
			
 
				           }
			
 
				         })
			
--- a/src/xt_pages/stock/drugs/drugSalesReturnOrder.vue
+++ b/src/xt_pages/stock/drugs/drugSalesReturnOrder.vue
@@ -260,7 +260,7 @@ export default {
 
				     },
			
 
				     AddNewOrder: function() {
			
 
				       this.$router.push({
			
 
				-        name: "salesReturnOrderAdd",
			
 
				+        name: "drugSalesReturnOrderAdd",
			
 
				         query: { type: this.type }
			
 
				       });
			
 
				     },
			
@@ -387,7 +387,7 @@ export default {
 
				     },
			
 
				     handleEdit: function(index, row) {
			
 
				       this.$router.push({
			
 
				-        name: "salesReturnDetail",
			
 
				+        name: "drugSalesReturnDetail",
			
 
				         query: { id: row.id, type: this.type }
			
 
				       });
			
 
				     },
			
--- a/src/xt_pages/stock/drugs/drugSalesReturnOrderAdd.vue
+++ b/src/xt_pages/stock/drugs/drugSalesReturnOrderAdd.vue
@@ -96,7 +96,34 @@
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				-          <el-table-column min-width="23" align="center">
			
 
				+          <el-table-column align="center" width="150">
			
 
				+            <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 label="进货总价" align="center" width="80">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.price * scope.row.return_count) }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+
			
 
				+          <el-table-column align="center"  width="150">
			
 
				             <template slot="header" slot-scope="scope">
			
 
				               <span>退货数量<span style="color: red">*</span></span>
			
 
				             </template>
			
@@ -108,7 +135,21 @@
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				-          <el-table-column label="操作" align="center" min-width="20">
			
 
				+          <el-table-column label="零价" align="center" width="80">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ scope.row.retail_price }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+          <el-table-column label="零价总价" align="center" width="80">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.retail_price * scope.row.return_count) }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+
			
 
				+
			
 
				+          <el-table-column label="操作" align="center" min-width="60">
			
 
				             <template slot-scope="scope">
			
 
				               <el-tooltip class="item" effect="dark" content="新增" placement="top">
			
 
				 
			
@@ -155,7 +196,7 @@
 
				       return {
			
 
				         crumbs: [
			
 
				           { path: false, name: '库存管理' },
			
 
				-          { path: false, name: '耗材退货单' },
			
 
				+          { path: false, name: '药品退货单' },
			
 
				           { path: false, name: '新增退货单' }
			
 
				         ],
			
 
				         crumbs2: [
			
@@ -198,7 +239,8 @@
 
				         manufacturer: [],
			
 
				         dealer: [],
			
 
				         goodType: [],
			
 
				-        goodInfo:[]
			
 
				+        goodInfo:[],
			
 
				+        numbers:[],
			
 
				 
			
 
				       }
			
 
				     },
			
@@ -208,13 +250,16 @@
 
				         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.selectedGoodInfo[i].good_type_id
			
 
				-                this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
			
 
				+                this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
			
 
				+                this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
			
 
				+                this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
			
 
				+
			
 
				               } else {
			
 
				                 const tempForm = {}
			
 
				                 tempForm['drug_id'] = val.selectedGoodInfo[i].id
			
 
				                 tempForm['return_count'] = ''
			
 
				-                tempForm['price'] = ''
			
 
				+                tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
			
 
				+                tempForm['price'] =val.selectedGoodInfo[i].last_price.toString()
			
 
				                 this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
			
 
				               }
			
 
				           }
			
@@ -249,6 +294,11 @@
 
				                 }
			
 
				               }
			
 
				             }
			
 
				+            // for (let i = 0; i < response.data.data.numbers.length; i++){
			
 
				+            //   if( response.data.data.numbers[i].number.length > 0) {
			
 
				+            //     this.numbers.push(response.data.data.numbers[i])
			
 
				+            //   }
			
 
				+            // }
			
 
				             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
			
 
				             this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
			
 
				 
			
@@ -296,6 +346,15 @@
 
				         } else {
			
 
				           return ''
			
 
				         }
			
 
				+      },handleEdit: function(index, row) {
			
 
				+        const tempObj = {}
			
 
				+        tempObj['id'] = 0
			
 
				+        tempObj['drug_id'] = 0
			
 
				+        tempObj['return_count'] = ''
			
 
				+        tempObj['retail_price'] = ''
			
 
				+        tempObj['price'] = ''
			
 
				+        tempObj['remark'] = ''
			
 
				+        this.recordInfo.recordData.push(tempObj)
			
 
				       },
			
 
				       showDialog(index, row) {
			
 
				         const loading = this.$loading({
			
@@ -410,6 +469,8 @@
 
				       const tempObj = {}
			
 
				       tempObj['drug_id'] = 0
			
 
				       tempObj['return_count'] = ''
			
 
				+      tempObj['number'] = ''
			
 
				+      tempObj['retail_price'] = ''
			
 
				       tempObj['price'] = ''
			
 
				       this.recordInfo.recordData.push(tempObj)
			
 
				       console.log(this.recordInfo.recordData)
			
--- a/src/xt_pages/stock/drugs/drugSalesReturnOrderDetail.vue
+++ b/src/xt_pages/stock/drugs/drugSalesReturnOrderDetail.vue
@@ -92,7 +92,7 @@
 
				       return {
			
 
				         crumbs: [
			
 
				           { path: false, name: '库存管理' },
			
 
				-          { path: false, name: '耗材退货单' },
			
 
				+          { path: false, name: '退货药品单' },
			
 
				           { path: false, name: '退货单详情' }
			
 
				         ],
			
 
				         crumbs2: [
			
--- a/src/xt_pages/stock/drugs/drugStockInOrderAdd.vue
+++ b/src/xt_pages/stock/drugs/drugStockInOrderAdd.vue
@@ -149,13 +149,13 @@
 
				 
			
 
				           <el-table-column label="零价" align="center" width="150">
			
 
				             <template slot-scope="scope">
			
 
				-              <!--{{ // calculate(scope.row.price * scope.row.warehousing_count) }}-->
			
 
				+              {{ scope.row.retail_price }}
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				           <el-table-column label="零价总价" align="center" width="150">
			
 
				             <template slot-scope="scope">
			
 
				-              <!--{{ calculate(scope.row.price * scope.row.warehousing_count) }}-->
			
 
				+              {{ calculate(scope.row.retail_price * scope.row.warehousing_count) }}
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				           <el-table-column align="center" width="150">
			
@@ -279,8 +279,8 @@
 
				       return {
			
 
				         crumbs: [
			
 
				           { path: false, name: '库存管理' },
			
 
				-          { path: false, name: '耗材入库单' },
			
 
				-          { path: false, name: '新增入库单' }
			
 
				+          { path: false, name: "药品入库单" },
			
 
				+          { path: false, name: "新增入库单" }
			
 
				         ],
			
 
				         crumbs2: [
			
 
				           { path: false, name: '库存管理' },
			
@@ -397,6 +397,8 @@
 
				           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
			
 
				             if (i == 0) {
			
 
				               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
			
 
				+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
			
 
				+              this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
			
 
				 
			
 
				             } else {
			
 
				               const tempForm = {}
			
@@ -406,7 +408,8 @@
 
				               tempForm['product_date'] = ''
			
 
				               tempForm['expiry_date'] = ''
			
 
				               tempForm['warehousing_count'] = ''
			
 
				-              tempForm['price'] = ''
			
 
				+              tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
			
 
				+              tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
			
 
				               tempForm['remark'] = ''
			
 
				               tempForm['dealer'] = ''
			
 
				               tempForm['manufacturer'] = ''
			
@@ -474,6 +477,7 @@
 
				         tempObj['product_date'] = ''
			
 
				         tempObj['expiry_date'] = ''
			
 
				         tempObj['warehousing_count'] = ''
			
 
				+        tempObj['retail_price'] = ''
			
 
				         tempObj['price'] = ''
			
 
				         tempObj['remark'] = ''
			
 
				         tempObj['dealer'] = ''
			
@@ -598,6 +602,7 @@
 
				         this.$refs['tableForm'].validate((valid) => {
			
 
				           if (valid) {
			
 
				             const array = this.recordInfo.recordData
			
 
				+            console.log(array)
			
 
				             for (let i = 0; i < array.length; i++) {
			
 
				 
			
 
				               if (array[i].drug_id == 0) {
			
@@ -654,6 +659,7 @@
 
				       tempObj['product_date'] = ''
			
 
				       tempObj['expiry_date'] = ''
			
 
				       tempObj['warehousing_count'] = ''
			
 
				+      tempObj['retail_price'] = ''
			
 
				       tempObj['price'] = ''
			
 
				       tempObj['remark'] = ''
			
 
				       tempObj['dealer'] = ''
			
--- a/src/xt_pages/stock/drugs/drugStockInOrderEdit.vue
+++ b/src/xt_pages/stock/drugs/drugStockInOrderEdit.vue
@@ -186,13 +186,13 @@
 
				 
			
 
				           <el-table-column label="零价" align="center" width="150">
			
 
				             <template slot-scope="scope">
			
 
				-              <!--{{ // calculate(scope.row.price * scope.row.warehousing_count) }}-->
			
 
				+              {{ scope.row.retail_price }}
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				           <el-table-column label="零价总价" align="center" width="150">
			
 
				             <template slot-scope="scope">
			
 
				-              <!--{{ calculate(scope.row.price * scope.row.warehousing_count) }}-->
			
 
				+              {{ calculate(scope.row.retail_price * scope.row.warehousing_count) }}
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				           <el-table-column align="center" width="150">
			
@@ -318,8 +318,8 @@ export default {
 
				     return {
			
 
				       crumbs: [
			
 
				         { path: false, name: "库存管理" },
			
 
				-        { path: false, name: "耗材入库单" },
			
 
				-        { path: false, name: "编辑入库单" }
			
 
				+        { path: false, name: "药品入库单" },
			
 
				+        { path: false, name: "药品入库单" }
			
 
				       ],
			
 
				       crumbs2: [
			
 
				         { path: false, name: "库存管理" },
			
@@ -380,6 +380,11 @@ export default {
 
				           if (i == 0) {
			
 
				             this.recordInfo.recordData[this.currentIndex].drug_id =
			
 
				               val.selectedGoodInfo[i].id;
			
 
				+            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
			
 
				+            this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
			
 
				+
			
 
				+
			
 
				+
			
 
				           } else {
			
 
				 
			
 
				             const tempForm = {};
			
@@ -389,10 +394,12 @@ export default {
 
				             tempForm["product_date"] = "";
			
 
				             tempForm["expiry_date"] = "";
			
 
				             tempForm["warehousing_count"] = "";
			
 
				-            tempForm["price"] = "";
			
 
				+            tempForm["price"] = val.selectedGoodInfo[i].last_price.toString();
			
 
				             tempForm["remark"] = "";
			
 
				             tempForm["dealer"] = "";
			
 
				             tempForm["manufacturer"] = "";
			
 
				+            tempForm["retail_price"] = val.selectedGoodInfo[i].retail_price.toString();
			
 
				+
			
 
				             this.recordInfo.recordData.splice(
			
 
				               this.currentIndex + 1,
			
 
				               0,
			
@@ -472,6 +479,9 @@ export default {
 
				       tempObj["remark"] = "";
			
 
				       tempObj["dealer"] = "";
			
 
				       tempObj["manufacturer"] = "";
			
 
				+      tempObj['retail_price'] = ""
			
 
				+
			
 
				+
			
 
				       this.recordInfo.recordData.push(tempObj);
			
 
				     },
			
 
				     handleDelete: function(index, row) {
			
@@ -623,6 +633,11 @@ export default {
 
				             response.data.data.info[i].price = response.data.data.info[
			
 
				               i
			
 
				             ].price.toString();
			
 
				+
			
 
				+            response.data.data.info[i].retail_price = response.data.data.info[
			
 
				+              i
			
 
				+              ].retail_price.toString();
			
 
				+
			
 
				             response.data.data.info[
			
 
				               i
			
 
				             ].warehousing_count = response.data.data.info[
			
@@ -653,6 +668,8 @@ export default {
 
				             tempObj["remark"] = "";
			
 
				             tempObj["dealer"] = "";
			
 
				             tempObj["manufacturer"] = "";
			
 
				+            tempObj['retail_price'] = ""
			
 
				+
			
 
				             this.recordInfo.recordData.push(tempObj);
			
 
				           }
			
 
				         }
			
--- a/src/xt_pages/stock/drugs/drugStockOutOrder.vue
+++ b/src/xt_pages/stock/drugs/drugStockOutOrder.vue
@@ -373,7 +373,7 @@ export default {
 
				 
			
 
				     handleEdit: function(index, row) {
			
 
				       this.$router.push({
			
 
				-        name: "stockOutDetail",
			
 
				+        name: "drugStockOutDetail",
			
 
				         query: { id: row.id, type: this.type }
			
 
				       });
			
 
				     },
			
--- a/src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue
+++ b/src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue
@@ -138,7 +138,7 @@
 
				 
			
 
				           <el-table-column min-width="23" align="center">
			
 
				             <template slot="header" slot-scope="scope">
			
 
				-              <span>单价<span style="color: red">*</span></span>
			
 
				+              <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>-->
			
@@ -148,7 +148,7 @@
 
				                 style="padding-top: 17px"
			
 
				               >
			
 
				                 <el-input
			
 
				-                  placeholder="请输入单价"
			
 
				+                  placeholder="请输入进价"
			
 
				                   type="number"
			
 
				                   v-model="scope.row.price"
			
 
				                 ></el-input>
			
@@ -175,11 +175,26 @@
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				-          <el-table-column label="总价" min-width="20" align="center">
			
 
				+          <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="零价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ scope.row.retail_price }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+          <el-table-column label="零价总价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.retail_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>
			
@@ -239,7 +254,7 @@ export default {
 
				     return {
			
 
				       crumbs: [
			
 
				         { path: false, name: "库存管理" },
			
 
				-        { path: false, name: "耗材出库单" },
			
 
				+        { path: false, name: "药品出库单" },
			
 
				         { path: false, name: "新增出库单" }
			
 
				       ],
			
 
				       crumbs2: [
			
@@ -295,12 +310,15 @@ export default {
 
				         for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
			
 
				           if (i == 0) {
			
 
				             this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
			
 
				+            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
			
 
				+            this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
			
 
				 
			
 
				           } else {
			
 
				             const tempForm = {}
			
 
				             tempForm['drug_id'] = val.selectedGoodInfo[i].id
			
 
				+            tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
			
 
				+            tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
			
 
				             tempForm['count'] = ''
			
 
				-            tempForm['price'] = ''
			
 
				             tempForm['remark'] = ''
			
 
				             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
			
 
				           }
			
@@ -400,6 +418,7 @@ export default {
 
				       tempObj["drug_id"] = 0;
			
 
				       tempObj["count"] = "";
			
 
				       tempObj["price"] = "";
			
 
				+      tempObj["retail_price"] = "";
			
 
				       tempObj["remark"] = "";
			
 
				 
			
 
				       this.recordInfo.recordData.push(tempObj);
			
@@ -492,12 +511,8 @@ export default {
 
				           const array = this.recordInfo.recordData;
			
 
				           let total = 0;
			
 
				           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("规格名称不能为空");
			
 
				+            if (array[i].drug_id == 0) {
			
 
				+              this.$message.error("药品名称或者药品规格名称不能为空");
			
 
				               return;
			
 
				             }
			
 
				             total = total + array[i].price * array[i].return_count;
			
@@ -510,7 +525,6 @@ export default {
 
				           const params = {
			
 
				             stockOut: this.recordInfo.recordData
			
 
				           };
			
 
				-          console.log(this.form.dealer);
			
 
				 
			
 
				           postDrugWarehouseOut(
			
 
				             params,
			
@@ -557,6 +571,7 @@ export default {
 
				     tempObj["price"] = "";
			
 
				     tempObj["remark"] = "";
			
 
				 
			
 
				+
			
 
				     this.recordInfo.recordData.push(tempObj);
			
 
				     this.GetConfigInfo();
			
 
				     this.propForm.goodUnit = this.$store.getters.good_unit;
			
--- a/src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue
+++ b/src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue
@@ -114,7 +114,7 @@
 
				     components: { BreadCrumb },
			
 
				     created() {
			
 
				       const order_id = this.$route.query.id
			
 
				-      this.GetConfigInfo()
			
 
				+      // this.GetConfigInfo()
			
 
				       this.GetOrderDetail(order_id)
			
 
				     },
			
 
				     data() {
			
@@ -225,7 +225,7 @@
 
				             this.pos = 0
			
 
				           } else {
			
 
				             // 判断当前元素与上一个元素是否相同
			
 
				-            if (this.warehousingOutInfo.warehousingOutData[i].good_type_id === this.warehousingOutInfo.warehousingOutData[i - 1].good_type_id) {
			
 
				+            if (this.warehousingOutInfo.warehousingOutData[i].drug_id === this.warehousingOutInfo.warehousingOutData[i - 1].drug_id) {
			
 
				               this.tempArr[this.pos] += 1
			
 
				               this.tempArr.push(0)
			
 
				             } else {
			
@@ -241,7 +241,7 @@
 
				           if (index === 0) {
			
 
				             sameRowArr.push([index])
			
 
				           } else {
			
 
				-            if (item.good_type_id === this.warehousingOutInfo.warehousingOutData[index - 1].good_type_id) {
			
 
				+            if (item.drug_id === this.warehousingOutInfo.warehousingOutData[index - 1].drug_id) {
			
 
				               sameRowArr[sIdx].push(index)
			
 
				             } else {
			
 
				               sIdx = sIdx + 1
			
--- a/src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue
+++ b/src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue
@@ -113,7 +113,7 @@
 
				 
			
 
				           <el-table-column min-width="23" align="center">
			
 
				             <template slot="header" slot-scope="scope">
			
 
				-              <span>单价<span style="color: red">*</span></span>
			
 
				+              <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>-->
			
@@ -138,11 +138,26 @@
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				-          <el-table-column label="总价" min-width="20" align="center">
			
 
				+          <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="零价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ scope.row.retail_price }}
			
 
				+            </template>
			
 
				+          </el-table-column>
			
 
				+
			
 
				+          <el-table-column label="零价总价" align="center" width="150">
			
 
				+            <template slot-scope="scope">
			
 
				+              {{ calculate(scope.row.retail_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>
			
@@ -194,7 +209,7 @@
 
				       return {
			
 
				         crumbs: [
			
 
				           { path: false, name: '库存管理' },
			
 
				-          { path: false, name: '耗材出库单' },
			
 
				+          { path: false, name: '药品出库单' },
			
 
				           { path: false, name: '编辑出库单' }
			
 
				         ],
			
 
				         crumbs2: [
			
@@ -258,18 +273,26 @@
 
				         this.propForm.goods = [];
			
 
				 
			
 
				         if (val.selectedGoodInfo.length > 0) {
			
 
				-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
			
 
				+          for (let i = val.selectedGoodInfo.length - 1;i >= 0 ; i--) {
			
 
				             if (i == 0) {
			
 
				 
			
 
				               this.recordInfo.recordData[this.currentIndex].drug_id =
			
 
				                 val.selectedGoodInfo[i].id;
			
 
				 
			
 
				+              this.recordInfo.recordData[this.currentIndex].price =
			
 
				+                val.selectedGoodInfo[i].last_price.toString();
			
 
				+
			
 
				+              this.recordInfo.recordData[this.currentIndex].retail_price =
			
 
				+                val.selectedGoodInfo[i].retail_price.toString();
			
 
				+
			
 
				             } else {
			
 
				               const tempForm = {};
			
 
				               tempForm["id"] = 0;
			
 
				               tempForm["drug_id"] = val.selectedGoodInfo[i].id;
			
 
				+              tempForm["retail_price"] = val.selectedGoodInfo[i].retail_price.toString();
			
 
				+
			
 
				               tempForm["count"] = "";
			
 
				-              tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
			
 
				+              tempForm["price"] = val.selectedGoodInfo[i].last_price.toString();
			
 
				               tempForm["remark"] = "";
			
 
				               this.recordInfo.recordData.splice(
			
 
				                 this.currentIndex + 1,
			
@@ -336,6 +359,8 @@
 
				         const tempObj = {}
			
 
				         tempObj['id'] = 0
			
 
				         tempObj['drug_id'] = 0
			
 
				+        tempObj['retail_price'] = ''
			
 
				+
			
 
				         tempObj['count'] = ''
			
 
				         tempObj['price'] = ''
			
 
				         tempObj['remark'] = ''
			
@@ -390,7 +415,7 @@
 
				             this.$message.error(response.data.msg);
			
 
				             return false;
			
 
				           } else {
			
 
				-            if (response.data.data.goodInfo.length <= 0) {
			
 
				+            if (response.data.data.drugs.length <= 0) {
			
 
				               this.$message.error("该厂商或经销商没有药品信息");
			
 
				               return;
			
 
				             }
			
@@ -460,6 +485,7 @@
 
				           } else {
			
 
				             for (let i = 0; i < response.data.data.list.length; i++) {
			
 
				               response.data.data.list[i].price = response.data.data.list[i].price.toString()
			
 
				+              response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
			
 
				               response.data.data.list[i].count = response.data.data.list[i].count.toString()
			
 
				               this.recordInfo.recordData.push(response.data.data.list[i])
			
 
				             }
			
@@ -474,6 +500,8 @@
 
				             const tempObj = {}
			
 
				             tempObj['id'] = 0
			
 
				             tempObj['drug_id'] = 0
			
 
				+            tempObj['retail_price'] = ''
			
 
				+
			
 
				             tempObj['count'] = ''
			
 
				             tempObj['price'] = ''
			
 
				             tempObj['remark'] = ''
			
--- a/src/xt_pages/stock/drugs/drugsStockDialog/index.vue
+++ b/src/xt_pages/stock/drugs/drugsStockDialog/index.vue
@@ -54,23 +54,34 @@
 
				             property="drug_spec"
			
 
				             style="word-break: keep-all;white-space:nowrap;"
			
 
				           ></el-table-column>
			
 
				+          <!--<el-table-column-->
			
 
				+            <!--align="center"-->
			
 
				+            <!--label="单位"-->
			
 
				+            <!--property="good_unit"-->
			
 
				+          <!--&gt;-->
			
 
				+            <!--<template slot-scope="scope">-->
			
 
				+              <!--&lt;!&ndash;<span>{{getName(scope.row.good_unit)}}</span>&ndash;&gt;-->
			
 
				+            <!--</template>-->
			
 
				+          <!--</el-table-column>-->
			
 
				+
			
 
				           <el-table-column
			
 
				             align="center"
			
 
				-            label="单位"
			
 
				-            property="good_unit"
			
 
				+            label="上次进货价"
			
 
				+            property="buy_price"
			
 
				           >
			
 
				             <template slot-scope="scope">
			
 
				-              <!--<span>{{getName(scope.row.good_unit)}}</span>-->
			
 
				+              <span>{{scope.row.last_price}}</span>
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
 
				+
			
 
				           <el-table-column
			
 
				             align="center"
			
 
				-            label="单价"
			
 
				+            label="零售价"
			
 
				             property="buy_price"
			
 
				           >
			
 
				             <template slot-scope="scope">
			
 
				-              <!--<span>{{scope.row.buy_price}}</span>-->
			
 
				+              <span>{{scope.row.retail_price}}</span>
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				 
			
--- a/src/xt_pages/stock/drugs/query.vue
+++ b/src/xt_pages/stock/drugs/query.vue
@@ -1,193 +1,402 @@
 
				 <template>
			
 
				   <div class="main-contain">
			
 
				     <div class="position">
			
 
				-      <!--<bread-crumb :crumbs='crumbs'></bread-crumb>-->
			
 
				       <bread-crumb :crumbs="crumbs"></bread-crumb>
			
 
				-      <el-button
			
 
				-        size="small"
			
 
				-        @click="handleWarehouse"
			
 
				-        class="filter-item"
			
 
				-        style="float:right;"
			
 
				-        type="primary"
			
 
				-        icon="el-icon-circle-plus-outline"
			
 
				-        >新增</el-button
			
 
				-      >
			
 
				     </div>
			
 
				+    <div class="app-container ">
			
 
				+      <div class="cell clearfix">
			
 
				+        <el-input
			
 
				+          size="small"
			
 
				+          style="width: 400px;"
			
 
				+          class="filter-item"
			
 
				+          v-model.trim="keywords"
			
 
				+          placeholder="商品名称/规格名称"
			
 
				+        />
			
 
				+        <el-button
			
 
				+          size="small"
			
 
				+          class="filter-item"
			
 
				+          type="primary"
			
 
				+          icon="el-icon-search"
			
 
				+          @click="search"
			
 
				+        >搜索</el-button
			
 
				+        >
			
 
				+      </div>
			
 
				 
			
 
				-    <div class="app-container">
			
 
				-        <div class="cell clearfix">
			
 
				-            <el-input
			
 
				-            size="small"
			
 
				-            style="width: 400px;"
			
 
				-            v-model.trim="searchKey"
			
 
				-            class="filter-item"
			
 
				-            placeholder="单据编码/制单人/厂商"
			
 
				-            />
			
 
				-            <el-button
			
 
				-            style="margin-right:10px;"
			
 
				-            size="small"
			
 
				-            class="filter-item"
			
 
				-            type="primary"
			
 
				-            icon="el-icon-search"
			
 
				-            @click="search"
			
 
				-            >搜索</el-button
			
 
				-            >
			
 
				-            <label class="title"><span class="name">报损日期</span> : </label>
			
 
				-            <el-date-picker
			
 
				-            size="small"
			
 
				-            v-model="start_time"
			
 
				-            prefix-icon="el-icon-date"
			
 
				-            :editable="false"
			
 
				-            style="width: 196px;"
			
 
				-            type="date"
			
 
				-            placeholder="选择日期时间"
			
 
				-            align="right"
			
 
				-            format="yyyy-MM-dd"
			
 
				-            value-format="yyyy-MM-dd"
			
 
				-            @change="startTimeChange"
			
 
				-            ></el-date-picker>
			
 
				-            <span class="cellLine"> - </span>
			
 
				-            <el-date-picker
			
 
				-            size="small"
			
 
				-            v-model="end_time"
			
 
				-            prefix-icon="el-icon-date"
			
 
				-            :editable="false"
			
 
				-            style="width: 196px;"
			
 
				-            type="date"
			
 
				-            placeholder="选择日期时间"
			
 
				-            align="right"
			
 
				-            format="yyyy-MM-dd"
			
 
				-            value-format="yyyy-MM-dd"
			
 
				-            @change="endTimeChange"
			
 
				-            ></el-date-picker>
			
 
				-        </div>
			
 
				-
			
 
				-        <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
			
 
				-            <el-table-column align="center" prop="dialysis_no" label="单据编码">
			
 
				-                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column align="center" prop="name" label="药品名称">
			
 
				-                <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column align="center" prop="dialysis_no" label="规格名称">
			
 
				-                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column align="center" prop="name" label="批号">
			
 
				-                <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column align="center" prop="name" label="数量">
			
 
				-                <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column align="center" prop="name" label="原零价">
			
 
				-                <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column align="center" prop="name" label="现零价">
			
 
				-                <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				-            </el-table-column>
			
 
				-            <el-table-column align="center" prop="name" label="操作人">
			
 
				-                <template slot-scope="scope">{{ scope.row.name }}</template>
			
 
				-            </el-table-column>
			
 
				-        </el-table>
			
 
				-
			
 
				-
			
 
				-      
			
 
				-
			
 
				-        <el-pagination
			
 
				-            @size-change="handleSizeChange"
			
 
				-            @current-change="handleCurrentChange"
			
 
				-            :page-sizes="[10, 50, 100]"
			
 
				-            :page-size="10"
			
 
				-            background
			
 
				-            style="margin-top:20px;float: right"
			
 
				-            layout="total, sizes, prev, pager, next, jumper"
			
 
				-            :total="total"
			
 
				+      <div class="cell clearfix">
			
 
				+        <el-button
			
 
				+          size="small"
			
 
				+          class="filter-item"
			
 
				+          type="primary"
			
 
				+          icon="el-icon-search"
			
 
				+          @click="setting"
			
 
				+        >设置</el-button
			
 
				         >
			
 
				-        </el-pagination>
			
 
				+      </div>
			
 
				+
			
 
				+      <el-table
			
 
				+        :row-style="{ color: '#303133' }"
			
 
				+        :header-cell-style="{
			
 
				+          backgroundColor: 'rgb(245, 247, 250)',
			
 
				+          color: '#606266'
			
 
				+        }"
			
 
				+        :data="WarehouseInfo.warehouseInfoDate"
			
 
				+        :class="signAndWeighBoxPatients"
			
 
				+        border
			
 
				+        v-loading="WarehouseInfo.loading"
			
 
				+        :span-method="merge"
			
 
				+
			
 
				+      >
			
 
				+        <el-table-column label="药品名称" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            {{ scope.row.drug_name }}
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column label="规格名称" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            <span>{{ scope.row.drug_spec }}</span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column label="入库数量" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            <span
			
 
				+              @click="showStockInDetailDialog(scope.row.drug_id)"
			
 
				+            >{{ stockInCount(scope.row) }}</span
			
 
				+            >
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column label="入库退货" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            <span
			
 
				+              @click="showSaleReturnDetailDialog(scope.row)"
			
 
				+            >{{ salesReturnCount(scope.row) }}</span
			
 
				+            >
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column label="实际入库" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            {{ stockInCount(scope.row) - salesReturnCount(scope.row) }}
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column label="出库数量" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            <span
			
 
				+              @click="showStockOutDetailDialog(scope.row.drug_id)"
			
 
				+            >{{ stockOutCount(scope.row) }}</span
			
 
				+            >
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column label="出库退库" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            <span
			
 
				+              @click="showCancelStockDetailDialog(scope.row)"
			
 
				+            >{{ cancelStockCount(scope.row) }}</span
			
 
				+            >
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+        <el-table-column label="实际出库" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            {{ stockOutCount(scope.row) - cancelStockCount(scope.row) }}
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+
			
 
				+        <el-table-column label="剩余库存" align="center">
			
 
				+          <template slot-scope="scope">
			
 
				+            <span>{{
			
 
				+              stockInCount(scope.row) -
			
 
				+                salesReturnCount(scope.row) -
			
 
				+                stockOutCount(scope.row) +
			
 
				+                cancelStockCount(scope.row)
			
 
				+            }}</span>
			
 
				+          </template>
			
 
				+        </el-table-column>
			
 
				+      </el-table>
			
 
				+      <el-pagination
			
 
				+        @size-change="handleSizeChange"
			
 
				+        @current-change="handleCurrentChange"
			
 
				+        :page-sizes="[10, 50, 100]"
			
 
				+        :page-size="10"
			
 
				+        background
			
 
				+        align="right"
			
 
				+        style="margin-top:20px;"
			
 
				+        layout="total, sizes, prev, pager, next, jumper"
			
 
				+        :total="total"
			
 
				+      >
			
 
				+      </el-pagination>
			
 
				     </div>
			
 
				+
			
 
				+    <setting-dialog
			
 
				+      ref="dialog"
			
 
				+    ></setting-dialog>
			
 
				+
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				-import BreadCrumb from "../../components/bread-crumb";
			
 
				-
			
 
				-export default {
			
 
				-  name: "stockIn",
			
 
				-  components: { BreadCrumb },
			
 
				-  created() {
			
 
				-    
			
 
				-  },
			
 
				-  data() {
			
 
				-    return {
			
 
				+  import { uParseTime } from '@/utils/tools'
			
 
				+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
			
 
				+  import { getAllDrugStockQueryList } from '@/api/drug/drug_stock'
			
 
				+  import SettingDialog from './settingDialog/index'
			
 
				+
			
 
				+  export default {
			
 
				+    name: "stockIn",
			
 
				+    created() {
			
 
				+      this.GetAllDrugStockQueryList();
			
 
				+    },
			
 
				+    components: {
			
 
				+      SettingDialog,
			
 
				+      BreadCrumb
			
 
				+    },
			
 
				+    data() {
			
 
				+      return {
			
 
				         crumbs: [
			
 
				-            { path: false, name: "库存管理" },
			
 
				-            { path: false, name: "入库单" }
			
 
				+          { path: false, name: "库存管理" },
			
 
				+          { path: "/stock/drugs/stock/query", name: "药品库存查询" }
			
 
				         ],
			
 
				-        searchKey: "",
			
 
				-        tableData: [{
			
 
				-            date: '2016-05-02',
			
 
				-            name: '王小虎',
			
 
				-            address: '上海市普陀区金沙江路 1518 弄'
			
 
				-            }, {
			
 
				-            date: '2016-05-04',
			
 
				-            name: '王小虎',
			
 
				-            address: '上海市普陀区金沙江路 1517 弄'
			
 
				-            }, {
			
 
				-            date: '2016-05-01',
			
 
				-            name: '王小虎',
			
 
				-            address: '上海市普陀区金沙江路 1519 弄'
			
 
				-            }, {
			
 
				-            date: '2016-05-03',
			
 
				-            name: '王小虎',
			
 
				-            address: '上海市普陀区金沙江路 1516 弄'
			
 
				-        }]
			
 
				-      
			
 
				-    };
			
 
				-  },
			
 
				-  methods: {
			
 
				-    
			
 
				-  }
			
 
				-};
			
 
				+        keywords: "",
			
 
				+        total: 0,
			
 
				+        multipleSelection: [],
			
 
				+        signAndWeighBoxPatients: "sign-and-weigh-box-patients",
			
 
				+        start_time: "",
			
 
				+        end_time: "",
			
 
				+        page: 1,
			
 
				+        limit: 10,
			
 
				+        goodType: [],
			
 
				+        goodInfo: [],
			
 
				+        tempArr:[],
			
 
				+        sameRowArr: [],
			
 
				+        WarehouseInfo: {
			
 
				+          loading: false,
			
 
				+          warehouseInfoDate: []
			
 
				+        }
			
 
				+      };
			
 
				+    },
			
 
				+    methods: {
			
 
				+      handleSpanTempArr(){
			
 
				+        this.tempArr = []
			
 
				+
			
 
				+        for (let i = 0; i < this.WarehouseInfo.warehouseInfoDate.length; i++) {
			
 
				+          if (i === 0) {
			
 
				+            this.tempArr.push(1)
			
 
				+            this.pos = 0
			
 
				+          } else {
			
 
				+            // 判断当前元素与上一个元素是否相同
			
 
				+            if (this.WarehouseInfo.warehouseInfoDate[i].drug_name === this.WarehouseInfo.warehouseInfoDate[i - 1].drug_name) {
			
 
				+              this.tempArr[this.pos] += 1
			
 
				+              this.tempArr.push(0)
			
 
				+            } else {
			
 
				+              this.tempArr.push(1)
			
 
				+              this.pos = i
			
 
				+            }
			
 
				+          }
			
 
				+        }
			
 
				+
			
 
				+        let sameRowArr = [], sIdx = 0
			
 
				+        this.WarehouseInfo.warehouseInfoDate.forEach((item, index) => {
			
 
				+          item.index = index
			
 
				+          if (index === 0) {
			
 
				+            sameRowArr.push([index])
			
 
				+          } else {
			
 
				+            if (item.drug_name === this.WarehouseInfo.warehouseInfoDate[index - 1].drug_name) {
			
 
				+              sameRowArr[sIdx].push(index)
			
 
				+            } else {
			
 
				+              sIdx = sIdx + 1
			
 
				+              sameRowArr.push([index])
			
 
				+            }
			
 
				+          }
			
 
				+        })
			
 
				+        this.sameRowArr = sameRowArr
			
 
				+
			
 
				+
			
 
				+
			
 
				+      },
			
 
				+      merge({ row, column, rowIndex, columnIndex }) {
			
 
				+        if (columnIndex === 0) {
			
 
				+          const _row = this.tempArr[rowIndex]
			
 
				+          const _col = _row > 0 ? 1 : 0
			
 
				+          return {
			
 
				+            rowspan: _row,
			
 
				+            colspan: _col
			
 
				+          }
			
 
				+        }
			
 
				+      },
			
 
				+      GetAllDrugStockQueryList: function() {
			
 
				+        console.log(this.keywords);
			
 
				+        const Params = {
			
 
				+          page: this.page,
			
 
				+          limit: this.limit,
			
 
				+          keyword: this.keywords
			
 
				+        };
			
 
				+        this.WarehouseInfo.loading = true;
			
 
				+        this.WarehouseInfo.warehouseInfoDate = [];
			
 
				+        getAllDrugStockQueryList(Params).then(response => {
			
 
				+          if (response.data.state == 0) {
			
 
				+            this.WarehouseInfo.loading = false;
			
 
				+            this.$message.error(response.data.msg);
			
 
				+            return false;
			
 
				+          } else {
			
 
				+            this.WarehouseInfo.loading = false;
			
 
				+            this.total = response.data.data.total;
			
 
				+            for (let i = 0; i < response.data.data.list.length; i++) {
			
 
				+
			
 
				+              this.WarehouseInfo.warehouseInfoDate.push(
			
 
				+                response.data.data.list[i]
			
 
				+              );
			
 
				+            }
			
 
				+            this.handleSpanTempArr()
			
 
				+          }
			
 
				+        });
			
 
				+      },
			
 
				+      getSpecificationName: function(id) {
			
 
				+        let name = "";
			
 
				+        for (let i = 0; i < this.goodInfo.length; i++) {
			
 
				+          if (this.goodInfo[i].id == id) {
			
 
				+            name = this.goodInfo[i].specification_name;
			
 
				+          }
			
 
				+        }
			
 
				+        return name;
			
 
				+      },
			
 
				+      getTypeName: function(id) {
			
 
				+        let name = "";
			
 
				+        for (let i = 0; i < this.goodType.length; i++) {
			
 
				+          if (this.goodType[i].id == id) {
			
 
				+            name = this.goodType[i].type_name;
			
 
				+          }
			
 
				+        }
			
 
				+        return name;
			
 
				+      },
			
 
				+      GetAllGoodType: function() {
			
 
				+        GetAllGoodType().then(response => {
			
 
				+          if (response.data.state == 0) {
			
 
				+            this.$message.error(response.data.msg);
			
 
				+            return false;
			
 
				+          } else {
			
 
				+            for (let i = 0; i < response.data.data.goodType.length; i++) {
			
 
				+              this.goodType.push(response.data.data.goodType[i]);
			
 
				+            }
			
 
				+          }
			
 
				+        });
			
 
				+      },
			
 
				+      GetAllGoodInfo: function() {
			
 
				+        GetAllGoodInfo().then(response => {
			
 
				+          if (response.data.state == 0) {
			
 
				+            this.$message.error(response.data.msg);
			
 
				+            return false;
			
 
				+          } else {
			
 
				+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
			
 
				+              this.goodInfo.push(response.data.data.goodInfo[i]);
			
 
				+            }
			
 
				+          }
			
 
				+        });
			
 
				+      },
			
 
				+      handleBack: function() {
			
 
				+        this.$router.go(-1);
			
 
				+      },
			
 
				+      handleSizeChange(val) {
			
 
				+        this.limit = val;
			
 
				+        this.GetAllStockQuery();
			
 
				+      },
			
 
				+      handleCurrentChange(val) {
			
 
				+        this.page = val;
			
 
				+        this.GetAllStockQuery();
			
 
				+      },
			
 
				+      calculate: function(val) {
			
 
				+        return Math.round(parseFloat(val) * 100) / 100;
			
 
				+      },
			
 
				+      startTimeChange: function() {
			
 
				+        this.GetAllStockQuery();
			
 
				+      },
			
 
				+      endTimeChange: function() {
			
 
				+        this.GetAllStockQuery();
			
 
				+      },
			
 
				+      stockInCount: function(row) {
			
 
				+        let total = 0;
			
 
				+        for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
			
 
				+          total = total + row.query_drug_warehousing_info[i].warehousing_count;
			
 
				+        }
			
 
				+        return total;
			
 
				+      },
			
 
				+      salesReturnCount: function(row) {
			
 
				+        let total = 0;
			
 
				+        for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
			
 
				+          total = total + row.query_drug_sales_return_info[i].count;
			
 
				+        }
			
 
				+        return total;
			
 
				+      },
			
 
				+      stockOutCount: function(row) {
			
 
				+        let total = 0;
			
 
				+        for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
			
 
				+          total = total + row.query_drug_warehouseout_info[i].count;
			
 
				+        }
			
 
				+        return total;
			
 
				+      },
			
 
				+      cancelStockCount: function(row) {
			
 
				+        let total = 0;
			
 
				+        for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
			
 
				+          total = total + row.query_drug_cancel_stock_info[i].count;
			
 
				+        }
			
 
				+        return total;
			
 
				+      },
			
 
				+      showStockInDetailDialog: function(val) {},
			
 
				+      showSaleReturnDetailDialog: function() {},
			
 
				+      showStockOutDetailDialog: function() {},
			
 
				+      showCancelStockDetailDialog: function() {},
			
 
				+      search: function() {
			
 
				+        this.GetAllStockQuery();
			
 
				+      },setting:function() {
			
 
				+        this.$refs.dialog.show()
			
 
				+      }
			
 
				+    }
			
 
				+  };
			
 
				 </script>
			
 
				 
			
 
				 <style rel="stylesheet/css" lang="scss" scoped>
			
 
				-.information {
			
 
				-  border: 1px #dcdfe6 solid;
			
 
				-  padding: 30px 20px 30px 20px;
			
 
				+  .information {
			
 
				+    border: 1px #dcdfe6 solid;
			
 
				+    padding: 30px 20px 30px 20px;
			
 
				 
			
 
				   .border {
			
 
				     border-bottom: 1px #dcdfe6 solid;
			
 
				     margin: 0px 0 20px 0;
			
 
				   }
			
 
				-}
			
 
				+  }
			
 
				+
			
 
				+  .title {
			
 
				+    background: #409eff;
			
 
				+    height: 44px;
			
 
				+    line-height: 44px;
			
 
				+    padding: 0 0 0 10px;
			
 
				+    color: #fff;
			
 
				+    margin: 0 0 10px 0;
			
 
				+  }
			
 
				 
			
 
				-.edit_separater {
			
 
				-  border-top: 1px solid rgb(233, 233, 233);
			
 
				-  margin-top: 15px;
			
 
				-  margin-bottom: 15px;
			
 
				-}
			
 
				+  .edit_separater {
			
 
				+    border-top: 1px solid rgb(233, 233, 233);
			
 
				+    margin-top: 15px;
			
 
				+    margin-bottom: 15px;
			
 
				+  }
			
 
				 </style>
			
 
				 
			
 
				 <style>
			
 
				-.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
			
 
				-  font-size: 12px;
			
 
				-}
			
 
				-
			
 
				-.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
			
 
				-  background: #6fb5fa;
			
 
				-}
			
 
				-
			
 
				-.count {
			
 
				-  color: #bd2c00;
			
 
				-}
			
 
				-.el-table td,
			
 
				-.el-table th.is-leaf,
			
 
				-.el-table--border,
			
 
				-.el-table--group {
			
 
				-  border-color: #d0d3da;
			
 
				-}
			
 
				-.el-table--border::after,
			
 
				-.el-table--group::after,
			
 
				-.el-table::before {
			
 
				-  background-color: #d0d3da;
			
 
				-}
			
 
				+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
			
 
				+    font-size: 12px;
			
 
				+  }
			
 
				+
			
 
				+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
			
 
				+    background: #6fb5fa;
			
 
				+  }
			
 
				+
			
 
				+  .count {
			
 
				+    color: #bd2c00;
			
 
				+  }
			
 
				+  .el-table td,
			
 
				+  .el-table th.is-leaf,
			
 
				+  .el-table--border,
			
 
				+  .el-table--group {
			
 
				+    border-color: #d0d3da;
			
 
				+  }
			
 
				+  .el-table--border::after,
			
 
				+  .el-table--group::after,
			
 
				+  .el-table::before {
			
 
				+    background-color: #d0d3da;
			
 
				+  }
			
 
				 </style>
			
--- a/src/xt_pages/stock/drugs/settingDialog/index.vue
+++ b/src/xt_pages/stock/drugs/settingDialog/index.vue
@@ -0,0 +1,107 @@
 
				+<template>
			
 
				+  <el-dialog title="设置" :visible.sync="visibility" :close-on-click-modal="isClose"
			
 
				+             :close-on-press-escape="isClose">
			
 
				+    <div style="text-align: center;">
			
 
				+
			
 
				+      <div>
			
 
				+        <el-button type="primary" v-if="!is_open" @click="changeOpen(1)">启用自动扣减</el-button>
			
 
				+        <el-button type="danger" v-if="is_open" @click="changeOpen(2)">关闭自动扣减</el-button>
			
 
				+        <div style="margin-top: 40px;"><p style="color:#909399;text-align: center;">
			
 
				+          启用“药品管理”后，在开透析医嘱时，医生可以选择药品后将自动产生出库单</p></div>
			
 
				+      </div>
			
 
				+    </div>
			
 
				+
			
 
				+    <span slot="footer" class="dialog-footer">
			
 
				+    <el-button @click="hide()">取 消</el-button>
			
 
				+  </span>
			
 
				+  </el-dialog>
			
 
				+
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+  import { createDrugStockAutomaticReduceConfig, getDrugStockAutomaticReduceConfig } from '@/api/drug/drug_stock'
			
 
				+
			
 
				+  export default {
			
 
				+    name: 'settingDialog',
			
 
				+    data() {
			
 
				+      return {
			
 
				+        is_open: false,
			
 
				+        visibility: false,
			
 
				+        isClose: false
			
 
				+      }
			
 
				+    },
			
 
				+    props: {
			
 
				+      propForm: {
			
 
				+        type: Object
			
 
				+      }
			
 
				+    },
			
 
				+    methods: {
			
 
				+      hide: function() {
			
 
				+        this.visibility = false
			
 
				+      },
			
 
				+      show: function() {
			
 
				+        this.getConfig()
			
 
				+        this.visibility = true
			
 
				+
			
 
				+      }, changeOpen(val) {
			
 
				+        var message = ''
			
 
				+        if (val == 1) {
			
 
				+          message = '启用药品自动扣减功能'
			
 
				+        } else {
			
 
				+          message = '关闭药品自动扣减功能'
			
 
				+        }
			
 
				+
			
 
				+        this.$confirm(message, '提示', {
			
 
				+          confirmButtonText: '确定',
			
 
				+          cancelButtonText: '取消',
			
 
				+          type: 'info'
			
 
				+        }).then(() => {
			
 
				+          createDrugStockAutomaticReduceConfig(val).then(response => {
			
 
				+            if (response.data.state == 0) {
			
 
				+              this.$message.error(response.data.msg)
			
 
				+              return false
			
 
				+            } else {
			
 
				+              if (response.data.data.is_open == 1) {
			
 
				+                this.is_open = true
			
 
				+                this.$message({
			
 
				+                  type: 'success',
			
 
				+                  message: '已启用'
			
 
				+                })
			
 
				+              } else {
			
 
				+                this.is_open = false
			
 
				+                this.$message({
			
 
				+                  type: 'success',
			
 
				+                  message: '已关闭'
			
 
				+                })
			
 
				+              }
			
 
				+            }
			
 
				+          })
			
 
				+        }).catch(() => {
			
 
				+
			
 
				+        })
			
 
				+
			
 
				+      },
			
 
				+      getConfig() {
			
 
				+        getDrugStockAutomaticReduceConfig().then(response => {
			
 
				+          if (response.data.state == 0) {
			
 
				+            this.$message.error(response.data.msg)
			
 
				+            return false
			
 
				+          } else {
			
 
				+            var config = response.data.data.config
			
 
				+            if (config.is_open == 1) {
			
 
				+              this.is_open = true
			
 
				+            } else {
			
 
				+              this.is_open = false
			
 
				+            }
			
 
				+          }
			
 
				+        })
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+  }
			
 
				+
			
 
				+</script>
			
 
				+
			
 
				+<style scoped>
			
 
				+
			
 
				+</style>