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

config/dev.env.js

@@ -6,5 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API:'"http://localhost:9529"', //'"http://112.74.16.180:9527"', //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://112.74.16.180:9527"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/api/stock.js

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

src/icons/svg/dashboard.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1509611822979" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10379" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M219.428571 658.285714q0-30.285714-21.428571-51.714285T146.285714 585.142857t-51.714285 21.428572T73.142857 658.285714t21.428572 51.714286T146.285714 731.428571t51.714286-21.428571T219.428571 658.285714z m109.714286-256q0-30.285714-21.428571-51.714285T256 329.142857t-51.714286 21.428572T182.857143 402.285714t21.428571 51.714286T256 475.428571t51.714286-21.428571T329.142857 402.285714z m244.571429 274.857143l57.714285-218.285714q3.428571-14.857143-4.285714-27.714286T605.142857 414.285714t-27.428571 3.714286-17.142857 22.571429l-57.714286 218.285714q-34.285714 2.857143-61.142857 24.857143t-36 56.285714q-11.428571 44 11.428571 83.428571t66.857143 50.857143 83.428571-11.428571 50.857143-66.857143q9.142857-34.285714-3.428571-66.857143t-41.142857-52z m377.142857-18.857143q0-30.285714-21.428572-51.714285T877.714286 585.142857t-51.714286 21.428572-21.428571 51.714285 21.428571 51.714286 51.714286 21.428571 51.714285-21.428571 21.428572-51.714286z m-365.714286-365.714285q0-30.285714-21.428571-51.714286T512 219.428571t-51.714286 21.428572T438.857143 292.571429t21.428571 51.714285T512 365.714286t51.714286-21.428572T585.142857 292.571429z m256 109.714285q0-30.285714-21.428571-51.714285T768 329.142857t-51.714286 21.428572T694.857143 402.285714t21.428571 51.714286T768 475.428571t51.714286-21.428571T841.142857 402.285714z m182.857143 256q0 149.142857-80.571429 276-10.857143 16.571429-30.857142 16.571429H111.428571q-20 0-30.857142-16.571429Q0 808 0 658.285714q0-104 40.571429-198.857143t109.142857-163.428571 163.428571-109.142857 198.857143-40.571429 198.857143 40.571429 163.428571 109.142857 109.142857 163.428571 40.571429 198.857143z" p-id="10380"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559126278025" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4738" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M553.86203002 156.61769104a59.43740844 59.43740844 0 0 0-79.86785887 0L151.037323 463.27838135a29.79286192 29.79286192 0 0 0 39.89685059 44.25361632l5.13542175-4.87586974V822.72082519a59.58572388 59.58572388 0 0 0 59.58572388 59.6598816h173.39927672v-179.3875122a41.95472718 41.95472718 0 0 1 41.97326661-42.01034547h81.59202576a41.95472718 41.95472718 0 0 1 41.97326659 42.01034547v179.3875122h177.51502992a59.58572388 59.58572388 0 0 0 59.6042633-59.6598816V506.56794739c13.2371521 11.97647094 32.01759338 11.06803894 43.03001403-1.20506286a29.79286192 29.79286192 0 0 0-2.15057372-42.08450318L553.86203002 156.63623047z" fill="#333333" p-id="4739"></path></svg>

src/icons/svg/sign.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1558939526756" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9518" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M 879.646 245.609 v 599.999 h -728.57 V 245.609 h 728.57 m 0 -85.714 h -728.57 c -47.338 0 -85.716 38.377 -85.716 85.715 v 599.999 c 0 47.338 38.378 85.715 85.716 85.715 h 728.57 c 47.338 0 85.715 -38.377 85.715 -85.715 v -600 c -0.001 -47.338 -38.378 -85.714 -85.715 -85.714 Z" p-id="9519"></path><path d="M 482.506 755.331 h -0.021 c -16.541 0 -32.059 -6.495 -43.695 -18.276 L 306.62 603.377 c -16.637 -16.835 -16.479 -43.967 0.348 -60.613 c 16.822 -16.625 43.954 -16.479 60.609 0.343 l 114.93 116.248 l 220.668 -223.211 c 16.646 -16.813 43.778 -16.972 60.614 -0.348 c 16.826 16.646 16.98 43.778 0.347 60.614 L 526.2 737.076 c -11.644 11.778 -27.161 18.255 -43.694 18.255 Z M 707.145 318.818 c -23.669 0 -42.86 -19.187 -42.86 -42.855 V 104.532 c 0 -23.665 19.191 -42.855 42.86 -42.855 c 23.664 0 42.855 19.19 42.855 42.855 v 171.431 c 0 23.669 -19.191 42.855 -42.855 42.855 Z M 318.211 318.818 c -23.67 0 -42.855 -19.187 -42.855 -42.855 V 104.532 c 0 -23.665 19.186 -42.855 42.855 -42.855 c 23.668 0 42.855 19.19 42.855 42.855 v 171.431 c 0 23.669 -19.187 42.855 -42.855 42.855 Z" p-id="9520"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1509611822979" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10379" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M219.428571 658.285714q0-30.285714-21.428571-51.714285T146.285714 585.142857t-51.714285 21.428572T73.142857 658.285714t21.428572 51.714286T146.285714 731.428571t51.714286-21.428571T219.428571 658.285714z m109.714286-256q0-30.285714-21.428571-51.714285T256 329.142857t-51.714286 21.428572T182.857143 402.285714t21.428571 51.714286T256 475.428571t51.714286-21.428571T329.142857 402.285714z m244.571429 274.857143l57.714285-218.285714q3.428571-14.857143-4.285714-27.714286T605.142857 414.285714t-27.428571 3.714286-17.142857 22.571429l-57.714286 218.285714q-34.285714 2.857143-61.142857 24.857143t-36 56.285714q-11.428571 44 11.428571 83.428571t66.857143 50.857143 83.428571-11.428571 50.857143-66.857143q9.142857-34.285714-3.428571-66.857143t-41.142857-52z m377.142857-18.857143q0-30.285714-21.428572-51.714285T877.714286 585.142857t-51.714286 21.428572-21.428571 51.714285 21.428571 51.714286 51.714286 21.428571 51.714285-21.428571 21.428572-51.714286z m-365.714286-365.714285q0-30.285714-21.428571-51.714286T512 219.428571t-51.714286 21.428572T438.857143 292.571429t21.428571 51.714285T512 365.714286t51.714286-21.428572T585.142857 292.571429z m256 109.714285q0-30.285714-21.428571-51.714285T768 329.142857t-51.714286 21.428572T694.857143 402.285714t21.428571 51.714286T768 475.428571t51.714286-21.428571T841.142857 402.285714z m182.857143 256q0 149.142857-80.571429 276-10.857143 16.571429-30.857142 16.571429H111.428571q-20 0-30.857142-16.571429Q0 808 0 658.285714q0-104 40.571429-198.857143t109.142857-163.428571 163.428571-109.142857 198.857143-40.571429 198.857143 40.571429 163.428571 109.142857 109.142857 163.428571 40.571429 198.857143z" p-id="10380"></path></svg>

src/router/index.js

@@ -125,44 +125,6 @@ export const xt_constantRouterMap = [
   // ////////////////////////////
   // 本地开始
   // /////////////////////////////
-  {
-    path: '/sign',
-    component: Layout,
-    redirct: '/sign/index',
-    children: [{
-      path: '/sign',
-      component: () => import('@/xt_pages/sign/index'),
-      name: 'sign',
-      meta: { title: 'signWeight', icon: 'sign', noCache: true }
-    }]
-  },
-  {
-    path: '/qcd',
-    component: Layout,
-    redirect: '/qcd/dialysistotal',
-    name: 'qcd',
-    alwaysShow: true,
-    meta: { title: '科室质控', icon: 'statistics' },
-    children: [
-      { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
-      { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
-      { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
-      { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
-      { path: '/qcd/outcomeIndicators/query', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
-      { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '患者分析' }},
-      { path: '/qcd/patientanalysis/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
-      { path: '/qcd/patientanalysis/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
-      { path: '/qcd/patientanalysis/dialysisage', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
-      { path: '/qcd/patientanalysis/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
-      { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
-      { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
-      { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
-      { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
-      { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
-      { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
-      { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }}
-    ]
-  },
   {
     path: '/patients',
     component: Layout,
@@ -323,6 +285,17 @@ export const xt_constantRouterMap = [
       }
     ]
   },
+  {
+    path: '/sign',
+    component: Layout,
+    redirct: '/sign/index',
+    children: [{
+      path: '/sign',
+      component: () => import('@/xt_pages/sign/index'),
+      name: 'sign',
+      meta: { title: 'signWeight', icon: 'sign', noCache: true }
+    }]
+  },
   {
     path: '/dialysis/',
     component: Layout,
@@ -367,24 +340,6 @@ export const xt_constantRouterMap = [
     ]
   },
   {
-    path: '/fullscreenboard',
-    component: () => import('@/xt_pages/fullscreenboard/index'),
-    hidden: true
-  },
-  {
-    path: '/device',
-    component: Layout,
-    redirect: '/device/main',
-    name: 'device',
-    alwaysShow: true,
-    meta: { title: 'deviceManage', icon: 'shebei' },
-    children: [
-      { path: '/device/zones', component: () => import('@/xt_pages/device/zone_main'), name: 'deviceZoneManage', meta: { title: 'deviceZoneManage' }},
-      { path: '/device/groups', component: () => import('@/xt_pages/device/group_main'), name: 'deviceGroupManage', meta: { title: 'deviceGroupManage' }},
-      { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
-      { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
-    ]
-  }, {
     path: '/stock/',
     component: Layout,
     redirect: 'noredirect',
@@ -508,6 +463,34 @@ export const xt_constantRouterMap = [
       }
     ]
   },
+
+  {
+    path: '/qcd',
+    component: Layout,
+    redirect: '/qcd/dialysistotal',
+    name: 'qcd',
+    alwaysShow: true,
+    meta: { title: '科室质控', icon: 'statistics' },
+    children: [
+      { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
+      { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
+      { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
+      { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
+      { path: '/qcd/outcomeIndicators/query', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
+      { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '患者分析' }},
+      { path: '/qcd/patientanalysis/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
+      { path: '/qcd/patientanalysis/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
+      { path: '/qcd/patientanalysis/dialysisage', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
+      { path: '/qcd/patientanalysis/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
+      { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
+      { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
+      { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
+      { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
+      { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
+      { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
+      { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }}
+    ]
+  },
   {
     path: '/data/',
     component: Layout,
@@ -520,6 +503,20 @@ export const xt_constantRouterMap = [
       { path: '/data/druguse', component: () => import('@/xt_pages/data/druguseTemplate'), name: 'druguse', meta: { title: 'druguse' }}
     ]
   },
+  {
+    path: '/device',
+    component: Layout,
+    redirect: '/device/main',
+    name: 'device',
+    alwaysShow: true,
+    meta: { title: 'deviceManage', icon: 'shebei' },
+    children: [
+      { path: '/device/zones', component: () => import('@/xt_pages/device/zone_main'), name: 'deviceZoneManage', meta: { title: 'deviceZoneManage' }},
+      { path: '/device/groups', component: () => import('@/xt_pages/device/group_main'), name: 'deviceGroupManage', meta: { title: 'deviceGroupManage' }},
+      { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
+      { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
+    ]
+  },
   {
     path: '/role',
     component: Layout,
@@ -535,7 +532,13 @@ export const xt_constantRouterMap = [
       { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
       { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
     ]
-  }
+  },
+
+  {
+    path: '/fullscreenboard',
+    component: () => import('@/xt_pages/fullscreenboard/index'),
+    hidden: true
+  },
   // /////////////本地要end/
 ]
 

src/styles/index.scss

@@ -458,7 +458,7 @@ code {
   // z-index: 9999!important;
 }
 .el-message{
-  z-index: 2004!important;
+  z-index: 99999!important;
 }
 .el-select-dropdown{
   // z-index: 2003!important;
@@ -481,7 +481,6 @@ code {
   border-bottom: 1px #E4E7ED solid;
   margin: 0 18px;
   flex: 1;
-  
 }
 .el-button+.el-button{
   // margin-left: 0;
@@ -495,4 +494,8 @@ code {
 .Total{
  margin:0 0 10px 0;
  float: right;
+}
+.cellLine{
+  color: #C0C4CC;
+  padding: 0 3px;
 }

src/views/layout/components/Navbar.vue

@@ -255,4 +255,10 @@ export default {
     left: 0;
   }
 }
+.el-dropdown-menu{
+  z-index: 9999!important;
+}
+.v-modal{
+  z-index: 9999!important;  
+}
 </style>

src/views/layout/components/TagsView.vue

@@ -1,8 +1,14 @@
 <template>
   <div class="tags-view-container">
     <scroll-pane class='tags-view-wrapper' ref='scrollPane'>
-      <router-link ref='tag' class="tags-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)"
-        :to="tag" :key="tag.path" @contextmenu.prevent.native="openMenu(tag,$event)">
+      <router-link 
+        ref='tag' 
+        class="tags-view-item" 
+        :class="isActive(tag)?'active':''" 
+        v-for="tag in Array.from(visitedViews)"
+        :to="tag" 
+        :key="tag.path" 
+        @contextmenu.prevent.native="openMenu(tag,$event)">
         {{generateTitle(tag.title)}}
         <span class='el-icon-close' @click.prevent.stop='closeSelectedTag(tag)'></span>
       </router-link>
@@ -18,7 +24,7 @@
 <script>
 import ScrollPane from '@/components/ScrollPane'
 import { generateTitle } from '@/utils/i18n'
-
+  
 export default {
   components: { ScrollPane },
   data() {

src/xt_pages/data/components/tableson.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button style="float: right;margin-right: 20px" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button style="float: right" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
 
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -536,10 +536,7 @@ export default {
       },
       openDeleteGroupAdvice() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: '错误',
-            message: '未选择要删除的医嘱内容'
-          })
+          this.$message.error("未选择要删除的医嘱内容")
           return
         }
         this.DeleteGroupAdvice(this.groupSelectRow.groupno)
@@ -556,10 +553,9 @@ export default {
       openAdviceName(isEdit) {
         if (isEdit) {
           if (this.groupSelectRow === null) {
-            this.$notify.error({
-              title: '错误',
-              message: '未选择要修改的医嘱内容'
-            })
+
+            this.$message.error("未选择要修改的医嘱内容")
+
             return
           }
           this.nameForm = {
@@ -855,10 +851,7 @@ export default {
 
       openEditGroupAdvice() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: '错误',
-            message: '未选择要修改的医嘱内容'
-          })
+          this.$message.error("未选择要修改的医嘱内容")
           return
         }
 

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -651,10 +651,9 @@ export default {
 
       openDeleteGroupAdvice() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: '错误',
-            message: '未选择要删除的医嘱内容'
-          })
+
+          this.$message.error("未选择要删除的医嘱内容")
+
           return
         }
         var content = ''
@@ -770,10 +769,9 @@ export default {
 
       openGroupChild() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: '错误',
-            message: '未选择医嘱内容,无法添加子药'
-          })
+
+          this.$message.error("未选择医嘱内容,无法添加子药")
+
           return
         } else if (this.groupSelectRow.parent_row > 0) {
           this.$notify.error({
@@ -807,10 +805,9 @@ export default {
         this.isChild = false
         if (isEdit) {
           if (this.groupSelectRow === null) {
-            this.$notify.error({
-              title: '错误',
-              message: '未选择要修改的医嘱内容'
-            })
+
+            this.$message.error("未选择要修改的医嘱内容")
+
             return
           }
           if (this.groupSelectRow.parent_row) {

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -594,10 +594,7 @@ export default {
       },
       openDeleteGroupAdvice() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: '错误',
-            message: '未选择要删除的医嘱内容'
-          })
+          this.$message.error("未选择要删除的医嘱内容")
           return
         }
         console.log(this.groupSelectRow)
@@ -997,10 +994,9 @@ export default {
 
       openGroupChild() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: '错误',
-            message: '未选择医嘱内容,无法添加子药'
-          })
+
+          this.$message.error("未选择医嘱内容,无法添加子药")
+
           return
         } else if (this.groupSelectRow.parent_row > 0) {
           this.$notify.error({
@@ -1034,11 +1030,9 @@ export default {
         this.isChild = false
         if (isEdit) {
           if (this.groupSelectRow === null) {
-            this.$notify.error({
-              title: '错误',
-              message: '未选择要修改的医嘱内容'
-            })
+            this.$message.error("未选择要修改的医嘱内容")
             return
+
           }
           if (this.groupSelectRow.parent_row) {
             this.isChild = true

src/xt_pages/sign/index.vue

@@ -51,80 +51,36 @@
                       <span class="button"><el-button  @click="change()">修改</el-button></span>
                     </div>
                     <div class="border"></div>
-
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="透前称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.weight_before" :disabled="disa" ></el-input>
-                            </el-form-item>
-                        </el-col> 
-                        <el-col :span="8">
-                            <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                        <el-col :span="4">
-                            <el-form-item label="体温(℃):" label-width="80px">
-                               <el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="脉搏(次/分):" label-width="90px">
-                                <el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="9">
-                            <el-form-item label="血压(mmHg):" label-width="100px">
-                                <el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                                <span> / </span>
-                                <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <div class="border"></div>                  
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="透后称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_infor.weight_after"  :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
+                    <div style="margin-bottom:20px;color:rgb(96,96,96)">
+                    透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
+                    </div>
+                    <div style="margin-bottom:12px;color:rgb(96,96,96)">
+                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
+                    </div>
+                    <div class="border"></div>  
+                    <div style="margin-bottom:20px;color:rgb(96,96,96)">
+                     透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    </div> 
+                    <div style="margin-bottom:12px;color:rgb(96,96,96)">
+                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
+                    </div>               
+                    <!-- <el-row :gutter="20">
                     </el-row>
                     <el-row :gutter="20">
-                        <el-col :span="4">
-                            <el-form-item label="体温(℃):" label-width="80px">
-                                <el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
                         <el-col :span="5">
                             <el-form-item label="脉搏(次/分):" label-width="90px">
                                 <el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="9">
-                            <el-form-item label="血压(mmHg):" label-width="100px">
-                                <el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                                <span> / </span>
-                                <el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
+                    </el-row> -->
                     
                     <div class="border"></div>
                     <div v-if="show">
@@ -209,7 +165,7 @@ export default {
         diastolic_blood_pressure: ''
       },
       shiftOptions: [
-        { value: 0, label: '班次' },
+        { value: 0, label: '全部' },
         { value: 1, label: '上午' },
         { value: 2, label: '下午' },
         { value: 3, label: '晚上' }
@@ -248,6 +204,8 @@ export default {
         this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
+          console.log("排班数据是什么呢?")
+          console.log(this.patients)
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
            
@@ -540,10 +498,14 @@ export default {
                     var sl = this.schedules.length
                     for(let j = 0; j < sl; j++){
                          if(this.schedules[j].type === this.patients[index].schedule.schedule_type){
-                              if(this.weigh_form.id > 0){
-                                  this.schedules[j].sign++
+                              // if(this.weigh_form.id>= 0){
+                              //     this.schedules[j].sign++
+                              // }
+                              if((signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0)||(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)){
+                                    this.schedules[j].sign++
                               }
                               if(signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0){
+                                   
                                    this.schedules[j].before++
                               }
                               if(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0){

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -41,61 +41,38 @@
       </el-row>
 
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="生产厂家" prop="dealer">
-            <el-select  v-model="form.manufacturer" placeholder="请选择">
-              <el-option
-                v-for="item in form.manufacturers"
-                :key="item.id"
-                :label="item.manufacturer_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="经销商" prop="manufacturer">
-            <el-select  v-model="form.dealer" placeholder="请选择">
-              <el-option
-                v-for="item in form.dealers"
-                :key="item.id"
-                :label="item.dealer_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
 
         <el-col :span="8">
           <el-form-item label="进货价" prop="buy_price">
             <el-input  type="number" v-model="form.buy_price"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row>
         <el-col :span="8">
           <el-form-item label="出货价" prop="sell_price">
             <el-input  type="number" v-model="form.sell_price"></el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="8">
           <el-form-item label="有效期预警天数" prop="expiry_date_warn_day_count">
             <el-input type="number" v-model="form.expiry_date_warn_day_count"></el-input>
           </el-form-item>
         </el-col>
 
+
+      </el-row>
+
+
+      <el-row>
+
         <el-col :span="8">
           <el-form-item label="库存预警数量" prop="stock_warn_count">
             <el-input  type="number" v-model="form.stock_warn_count"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row>
-       <el-col :span="16">
+
+        <el-col :span="16">
         <el-form-item label="是否可复用" prop="is_reuse">
             <el-radio v-model="form.is_reuse" label="1">可以</el-radio>
             <el-radio v-model="form.is_reuse" label="2">不可以</el-radio>

src/xt_pages/stock/cancelStockOrder.vue

@@ -21,7 +21,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -302,7 +302,7 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id).then(response => {
+            editCancelStockInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -11,7 +11,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>
@@ -53,7 +53,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center" width="200">
             <template slot-scope="scope">
               {{scope.row.order_number}}
             </template>

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -11,7 +11,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>
@@ -56,9 +56,9 @@
 
 
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
-              {{scope.row.order_number}}
+              {{scope.row.SalesReturn.order_number}}
             </template>
           </el-table-column>
 

src/xt_pages/stock/detail/stockInDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -11,7 +11,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>
@@ -53,7 +53,7 @@
 
         >
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
               {{scope.row.warehousing_order}}
             </template>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -11,7 +11,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>
@@ -57,7 +57,7 @@
 
 
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
               {{scope.row.warehouse_out_order_number}}
             </template>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -21,7 +21,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -21,7 +21,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/otherStockInOrder.vue

@@ -20,7 +20,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/otherStockOutOrder.vue

@@ -19,7 +19,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/salesReturnEdit.vue

@@ -315,7 +315,7 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id).then(response => {
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/salesReturnOrder.vue

@@ -20,7 +20,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/stockDetail.vue

@@ -21,7 +21,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/stockInOrder.vue

@@ -18,7 +18,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/stockInOrderDetail.vue

@@ -84,7 +84,7 @@
           </template>
         </el-table-column>
         <el-table-column label="有效日期" min-width="40" align="center">
-          <template v-if="scope.row.product_date != 0" slot-scope="scope">
+          <template v-if="scope.row.expiry_date != 0" slot-scope="scope">
             {{ scope.row.expiry_date | parseTime('{y}-{m}-{d}')}}
           </template>
         </el-table-column>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -423,7 +423,7 @@ export default {
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id).then(response => {
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockOutOrder.vue

@@ -16,7 +16,7 @@
         <el-date-picker 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="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker 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>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -336,7 +336,7 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -552,11 +552,10 @@
 
       openDeleteGroupAdvice() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: "错误",
-            message: "未选择要删除的医嘱内容"
-          });
+          this.$message.error("未选择要删除的医嘱内容")
+
           return;
+
         }
         console.log(this.groupSelectRow)
         var content = ""
@@ -966,10 +965,9 @@
 
       openGroupChild() {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: "错误",
-            message: "未选择医嘱内容,无法添加子药"
-          });
+
+          this.$message.error("未选择医嘱内容,无法添加子药")
+
           return;
         } else if (this.groupSelectRow.parent_row > 0) {
           this.$notify.error({
@@ -1003,10 +1001,7 @@
         this.isChild = false;
         if (isEdit) {
           if (this.groupSelectRow === null) {
-            this.$notify.error({
-              title: "错误",
-              message: "未选择要修改的医嘱内容"
-            });
+            this.$message.error("未选择要修改的医嘱内容")
             return;
           }
           if (this.groupSelectRow.parent_row) {

src/xt_pages/user/components/PatientDetail.vue

@@ -1,19 +1,13 @@
 <template>
   <div class="app-container ">
     <el-form ref="form" :rules="rules" :model="form" label-width="134px" class="clearfix" id="patient-info" >
-    <div style="float:right;z-index:8;position: absolute;right: 30px;">
+    <div style="float:right;z-index:8;position: absolute;right: 16px;">
       <el-button size="small" type="primary" @click="printCard()" style="margin:0 6px 6px 0;z-index:1;">打印签到卡</el-button>
       <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="margin:0 0 6px 0;z-index:1;">修改</el-button>
       <el-button size="small" type="primary" @click="printThisInfo()" style="margin:0 6px 6px 0;z-index:1;">打印</el-button>
     </div>
       <div class="dataTitle">一般资料</div>
       <el-row >
-        <el-col :span="4" align="center">
-          <img width="100%" height="100%" v-if="form.avatar" :src="form.avatar" class="avatar">
-          <el-form-item prop="avatar">
-            <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="20" >
           <el-row :gutter="10">
             <el-col :span="8">
@@ -168,21 +162,27 @@
             </el-col>
           </el-row>
         </el-col>
+         <el-col :span="4" align="center">
+          <img width="146px" height="146px" v-if="form.avatar" :src="form.avatar" class="avatar">
+          <el-form-item prop="avatar">
+            <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <div class="dataTitle">治疗信息</div>
-      <el-row :gutter="10">
-        <el-col :span="24">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="主诉 : " prop="patient_complains">
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder="" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="现病史 : " prop="present_history">
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder="" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="既往史 : " prop="past_history">
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder="" readonly></el-input>
           </el-form-item>

src/xt_pages/user/components/PatientForm.vue

@@ -1,17 +1,14 @@
 <template>
 <div class="main-contain">
-  <div class="position">
-    <bread-crumb :crumbs="crumbs"></bread-crumb>
-
-    <div class="" style="float:right;">
-       <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
-       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
-       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
-       <el-button v-if="this.isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
-    </div>
-  </div>
+    
   <div class="app-container " v-loading="pageLoad">
     <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
+        <div class="" style="z-index: 9999;position: absolute;right: 20px;">
+        <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
+        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="primary" icon="el-icon-setting" >保存</el-button>
+        <el-button v-if="this.isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
+      </div>
       <div class="dataTitle">一般资料</div>
       <el-row >
         <el-col :span="20" class="form-table" >
@@ -37,7 +34,7 @@
               </el-col> -->
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="透析号 : " class="is-required">
-                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
+                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input>
                     <el-button style="width:36%;padding:10px 0;" disabled type="primary">自动生成</el-button>
                 </el-form-item>
               </el-col>
@@ -59,12 +56,12 @@
               </el-col>
               <el-col :span="8" >
                 <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
-                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
+                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input>
                     <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
                 </el-form-item>
               </el-col>
             </template>
-            
+
             <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="出生日期 : "  class="is-required" prop="birth" >
                   <el-date-picker v-model="form.birth" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'" @change="hadSelectBirth" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
@@ -107,7 +104,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8" >
+            <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="家庭住址 : " prop="homeAddress">
                 <el-input v-model="form.homeAddress"></el-input>
               </el-form-item>
@@ -179,12 +176,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="工作单位 : " prop="work">
                 <el-input v-model="form.work"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="单位地址 : " prop="unit_address">
                 <el-input v-model="form.unit_address"></el-input>
               </el-form-item>
@@ -235,17 +232,17 @@
 
       <div class="dataTitle">治疗信息</div>
       <el-row :span="24">
-        <el-col :span="8">
+        <el-col :span="12">
           <el-form-item label="主诉 : " prop="patient_complains">
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder=""></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="12">
           <el-form-item label="现病史 : " prop="present_history">
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder=""></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="12">
           <el-form-item label="既往史 : " prop="past_history">
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder=""></el-input>
           </el-form-item>
@@ -300,7 +297,7 @@
             </el-checkbox-group>
           </el-form-item>
         </el-col>
-        
+
         <el-col :span="24">
           <el-form-item label="诊断 : " prop="diagnose">
             <el-input type="textarea" :rows="3" v-model="form.diagnose" resize="none" placeholder=""></el-input>
@@ -489,10 +486,6 @@ export default {
     }
 
     return {
-      crumbs: [
-        { path: false, name: '病人管理' },
-        { path: '/patients/create', name: '新增病人' },
-      ],
       generic_info_fold: true,
       treat_info_fold: true,
 
@@ -993,9 +986,8 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-.uploadHead {
-  // margin-top: 25%;
+.app-container{
+  margin: 0;
 }
 .uploadHeadBtn {
   width: 148px;
@@ -1006,7 +998,6 @@ export default {
     width: 430px;
     }
   .el-form-item {
-    // margin-bottom: 17px !important;
     .el-select {
       width: 100%;
     }
@@ -1021,5 +1012,9 @@ export default {
     }
   }
 }
+.el-select-dropdown,
+.el-popper{
+  z-index: 2000!important;
+}
 </style>
 

src/xt_pages/user/components/PatientSidebar.1.vue

@@ -1,9 +1,8 @@
 <template>
   <div>
     <div class="patient-menu">
-
       <el-autocomplete
-        style="margin:13px 5px"
+        style="margin:16px 5px"
         popper-class="my-autocomplete"
         v-model="value"
         :fetch-suggestions="querySearchAsync"

src/xt_pages/user/components/PatientSidebar.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="patient-menu">
       <el-autocomplete
-        style="margin:13px 5px"
+        style="margin:16px 5px"
         popper-class="my-autocomplete"
         v-model="value"
         :fetch-suggestions="querySearchAsync"
@@ -232,7 +232,6 @@ export default {
 }
 .patient-menu .el-tree-node .el-tree-node.is-current > .el-tree-node__content {
   color:#409eff;
-  /* background-color: transparent; */
 }
 .patient-menu .el-tree {
   background: #f6f8f9;

src/xt_pages/user/courseOfDisease.vue

@@ -3,19 +3,31 @@
     <div class="position">
        <bread-crumb></bread-crumb>
     </div> -->
-    <div class="patient-container ">
+    <div class="patient-container">
         <patient-sidebar :id="patient_id" defaultActive="1-2"></patient-sidebar>
         <!-- <div class="app-container"> -->
-            <div class="container" v-loading="loading">
-                <div>
+            <div  v-loading="loading">
+              <div class="patient-app-container advice-container app-container">
+
+              <div>
                     <span style="margin-left: 10px;float:right;">
                         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="show_dialog = true">新增</el-button>
                         <el-button  size="small" v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
                     </span>
-                    <span class="filter_title">日期查询</span>
-                    <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>
-                    
+                    <!--<span class="filter_title">日期查询</span>-->
+                    <!--<el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>-->
                 </div>
+              <!--<div></div>-->
+              <div class="cell clearfix">
+                <label class="title"><span class="name">日期查询</span> : </label>
+                <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+                <span class="">-</span>
+                <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+              </div>
                 <div class="record">
                     <el-row :gutter="15">
                         <el-col :span="10">
@@ -35,7 +47,7 @@
                         </el-col>
                         <el-col :span="14">
                             <div class="record_content_panel">
-                                <div class="title">病程内容</div>
+                                <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
                                 <div class="content">
                                     {{ current_select_record == null ? "" : current_select_record.content }}
                                 </div>
@@ -45,7 +57,7 @@
                 </div>
             </div>
         <!-- </div> -->
-        <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog" :before-close="willCloseDialog">
+        <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog">
             <div>
                 <div class="new_record_form">
                     <diV>
@@ -60,13 +72,15 @@
 
                     <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
                         <el-button @click="show_dialog = false">取消</el-button>
-                        <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction" :loading="uploading_new_record">确定</el-button>
+                        <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction" :loading="uploading_new_record">保存</el-button>
                     </div>
                 </div>
             </div>
         </el-dialog>
     </div>
-<!-- </div> -->
+    </div>
+
+  <!-- </div> -->
 </template>
 
 <script>
@@ -77,7 +91,7 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {
     name: "CourseOfDisease",
-    components: { 
+    components: {
         PatientSidebar,
         BreadCrumb
     },
@@ -87,6 +101,8 @@ export default {
 
             patient_id: 0,
             date: [],
+            start_time: '',
+            end_time: '',
 
             records: [],
             doctors: [],
@@ -95,7 +111,7 @@ export default {
             show_dialog: false,
             uploading_new_record: false,
             templates: this.$store.getters.configlist.course_disease,
-            select_template: [],
+            select_template: '',
             new_content: "",
 
             selectingRows: [],
@@ -114,21 +130,50 @@ export default {
         var now = new Date()
         this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
-        this.requestCourseRecords()
+
+
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+
+
+      this.requestCourseRecords()
+
+
+
     },
     methods: {
         requestCourseRecords: function() {
-            var startTime = new Date(this.date[0])
-            var endTime = new Date(this.date[1])
             this.loading = true
-            getCourseOfDiseaseRecords(this.patient_id, parseTime(startTime, "{y}-{m}-{d}"), parseTime(endTime, "{y}-{m}-{d}")).then(rs => {
+            getCourseOfDiseaseRecords(this.patient_id, this.start_time,this.end_time).then(rs => {
                 this.loading = false
                 var resp = rs.data
                 if (resp.state == 1) {
                     this.current_select_record = null
                     this.records = resp.data.records
                     this.doctors = resp.data.doctors
-                    
+
                 } else {
                     this.$message.error(resp.msg)
                 }
@@ -155,9 +200,7 @@ export default {
             return ""
         },
 
-        willCloseDialog: function() {
 
-        },
         createAction: function() {
             if (this.new_content.length == 0) {
                 this.$message.error("请填写病程内容")
@@ -187,7 +230,6 @@ export default {
         didSelectTemplate: function(templateContent) {
             this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
 
-            this.select_template = ""
         },
 
         didSelectionChange: function(selectRows) {
@@ -226,7 +268,11 @@ export default {
                 this.loading = false
                 this.$message.error(err)
             })
-        },
+        },startTimeChange(val) {
+        this.requestCourseRecords()
+      }, endTimeChange(val) {
+        this.requestCourseRecords()
+      }
     },
 }
 </script>

src/xt_pages/user/dialysisRecord.vue

@@ -16,7 +16,7 @@
                     <!-- <el-col :span="11"> -->
                       <el-date-picker size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间" style="width:150px" v-model="queryParams.start_time" @change="changeSearch" ></el-date-picker>
                     <!-- </el-col> -->
-                    <span>-</span>
+                    <span class="cellLine">-</span>
                     <!-- <el-col :span="11"> -->
                       <el-date-picker size="small"   type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束时间" style="width:150px" v-model="queryParams.end_time" @change="changeSearch" ></el-date-picker>
                     <!-- </el-col> -->
@@ -33,49 +33,49 @@
         </div>
         <div>
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
-              <el-table-column prop="dialysis_date" label="透析日期" align="center" min-width="60">
+              <el-table-column prop="dialysis_date" label="透析日期" align="center" width="110" fixed>
                 <template slot-scope="scope"><span>{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
               </el-table-column>
-              <el-table-column prop="schedule_type" label="班次" align="center" min-width="40">
+              <el-table-column prop="schedule_type" label="班次" align="center" width="80">
                 <template slot-scope="scope"><span>{{scheduleType(scope.row.schedule_type)}}</span></template>
               </el-table-column>
-              <el-table-column prop="partition" min-width="60" align="center" label="分区 - 机号">
+              <el-table-column prop="partition" width="100" align="center" label="分区 - 机号">
                 <template slot-scope="scope"><span>{{scope.row.partition_name}}-{{scope.row.device_number}}</span></template>
               </el-table-column>
-              <el-table-column prop="mode" min-width="60" align="center" label="透析模式">
+              <el-table-column prop="mode" width="90" align="center" label="透析模式">
                 <template slot-scope="scope">{{modeName(scope.row.prescription.mode_id)}}</template>
               </el-table-column>
-              <el-table-column prop="prescription.dialysis_duration" width="80" align="center" label="透析时长 h">
+              <el-table-column prop="prescription.dialysis_duration" width="100" align="center" label="透析时长(h)">
               </el-table-column>
-              <el-table-column prop="prescription.dry_weight" width="70" align="center" label="干体重 kg">
+              <el-table-column prop="prescription.dry_weight" width="96" align="center" label="干体重(kg)">
               </el-table-column>
-              <el-table-column prop="predialysis_evaluation.weight_before" width="80" align="center" label="透前体重 kg">
+              <el-table-column prop="predialysis_evaluation.weight_before" width="110" align="center" label="透前体重(kg)">
               </el-table-column>
-              <el-table-column prop="assessment_after_dislysis.weight_after" width="80" align="center" label="透后体重 kg">
+              <el-table-column prop="assessment_after_dislysis.weight_after" width="110" align="center" label="透后体重(kg)">
               </el-table-column>
-              <el-table-column prop="predialysis_evaluation" width="80" align="center" label="透前血压 mmhg">
+              <el-table-column prop="predialysis_evaluation" width="140" align="center" label="透前血压(mmhg)">
                 <template slot-scope="scope"><span>{{scope.row.predialysis_evaluation.systolic_blood_pressure}}/{{scope.row.predialysis_evaluation.diastolic_blood_pressure}}</span></template>
               </el-table-column>
-              <el-table-column prop="assessment_after_dislysis" width="80" align="center" label="透后血压 mmhg">
+              <el-table-column prop="assessment_after_dislysis" width="140" align="center" label="透后血压(mmhg)">
                 <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis.systolic_blood_pressure}}/{{scope.row.assessment_after_dislysis.diastolic_blood_pressure}}</span></template>
               </el-table-column>
-              <el-table-column prop="predialysis_evaluation.ultrafiltration_amount" width="80" align="center" label="超滤总量 L">
+              <el-table-column prop="predialysis_evaluation.ultrafiltration_amount" width="110" align="center" label="超滤总量(L)">
               </el-table-column>
-              <el-table-column  prop="access" min-width="60" align="center" label="血管通路">
+              <el-table-column  prop="access" width="100" align="center" label="血管通路">
                 <template slot-scope="scope"><span>{{setVascularAccess(scope.row.prescription)}}</span></template>
               </el-table-column>
-              <el-table-column prop="type" width="145" align="center" label="抗凝剂种类 首剂/维持/总量">
+              <el-table-column prop="type" width="200" align="center" label="抗凝剂种类 首剂/维持/总量">
               <template slot-scope="scope">
                 <span>{{setAnticoagulantsConfit(scope.row.prescription)}}</span>
               </template>
               </el-table-column>
-              <el-table-column prop="model" min-width="60" align="center" label="透析器型号">
+              <el-table-column prop="model" width="100" align="center" label="透析器型号">
                 <template slot-scope="scope"><span>{{setDialyzerModel(scope.row.prescription)}}</span></template>
               </el-table-column>
-              <el-table-column  prop="nurse" min-width="60" align="center" label="治疗护士">
+              <el-table-column  prop="nurse" width="90" align="center" label="治疗护士">
                 <template slot-scope="scope"><span>{{getNurseName(scope.row.treatment_summary)}}</span></template>
               </el-table-column>
-              <el-table-column prop="doctor" min-width="60" align="center" label="治疗医生">
+              <el-table-column prop="doctor" width="90" align="center" label="治疗医生">
                 <template slot-scope="scope"><span>{{getDoctorName(scope.row.treatment_summary)}}</span></template>
               </el-table-column>
           </el-table>
@@ -384,8 +384,6 @@ export default {
     justify-content: space-between;
     padding: 30px 2em;
 }
-</style>
-<style>
 .record-order .el-table__body{
     border: 1px solid #333;
 }
@@ -396,4 +394,5 @@ export default {
 .record-order th, .record-order td {
     padding: 5px 10px;
 }
+
 </style>

src/xt_pages/user/doctorAdvice.vue

@@ -27,7 +27,7 @@
             <div class="cell clearfix">
                 <label class="title"><span class="name">日期查询</span> : </label>
                 <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
-                <span class="">-</span>
+                <span class="cellLine"> - </span>
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
             </div>
             <el-table @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" >
@@ -1459,16 +1459,14 @@ export default {
     },
     openGroupChild() {
       if (this.groupSelectRow === null) {
-        this.$notify.error({
-          title: "错误",
-          message: "未选择医嘱内容,无法添加子药"
-        });
+
+        this.$message.error("未选择医嘱内容,无法添加子药")
+
         return;
       } else if (this.groupSelectRow.parent_row > 0) {
-        this.$notify.error({
-          title: "错误",
-          message: "子药不能添加子药"
-        });
+
+        this.$message.error("子药不能添加子药")
+
         return;
       }
       this.nameForm = {
@@ -1495,11 +1493,11 @@ export default {
       this.isChild = false;
       if (isEdit) {
         if (this.groupSelectRow === null) {
-          this.$notify.error({
-            title: "错误",
-            message: "未选择要修改的医嘱内容"
-          });
+
+          this.$message.error("未选择要修改的医嘱内容")
+
           return;
+
         }
         if (this.groupSelectRow.parent_row) {
           this.isChild = true;
@@ -1550,10 +1548,7 @@ export default {
     },
     openDeleteGroupAdvice() {
       if (this.groupSelectRow === null) {
-        this.$notify.error({
-          title: "错误",
-          message: "未选择要删除的医嘱内容"
-        });
+        this.$message.error("未选择要删除的医嘱内容")
         return;
       }
       var content = "";

src/xt_pages/user/editPatient.vue

@@ -37,3 +37,9 @@ export default {
 
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container{
+  margin: 0;
+}
+</style>

src/xt_pages/user/patient.vue

@@ -14,7 +14,7 @@
     <div class="cell clearfix">
 	    <label class="title"><span class="name">日期查询</span> : </label>
        <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
-       <span class="">-</span>
+       <span class="cellLine"> - </span>
        <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
     </div>
     <div class="cell clearfix">

src/xt_pages/user/patients.vue

@@ -14,7 +14,7 @@
     <div class="cell clearfix">
       <label class="title"><span class="name">日期查询</span> : </label>
       <el-date-picker size="small" clearable v-model="listQuery.start_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
-      <span class="">-</span>
+      <span class="cellLine"> - </span>
       <el-date-picker size="small" clearable v-model="listQuery.end_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
     </div>
     <div class="cell clearfix">

src/xt_pages/user/proeducation.vue

@@ -5,7 +5,7 @@
             <div class="cell clearfix">
                 <label class="title"><span class="name">日期查询</span> : </label>
                 <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
-                <span class="">-</span>
+                <span class="cellLine"> - </span> 
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
             </div>  
             <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="multipleTable" :data="edusTableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" >

src/xt_pages/user/rescueRecord.vue

@@ -248,6 +248,7 @@ export default {
         border-bottom-width: 1px;
         border-bottom-style: solid;
         border-bottom-color: #ebeef5;
+        background-color: rgb(245, 247, 250);
     }
     .content {
         padding: 12px 15px;

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -11,8 +11,8 @@
             </el-form-item>
         </el-form>
         <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
-            <el-button @click="hide">取消</el-button>
-            <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary" @click="saveAction">确定</el-button>
+            <el-button @click="hide">取 消</el-button>
+            <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary" @click="saveAction">保 存</el-button>
         </div>
     </el-dialog>
 </template>
@@ -73,7 +73,7 @@ export default {
             if (msg.length == 0) {
                 this.submit()
             } else {
-                this.$confirm(msg, '提示', {confirmButtonText: '是', cancelButtonText: '否', type: 'warning'})
+                this.$confirm(msg, '提示', {confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning'})
                 .then(() => {
                     this.submit()
                 })

src/xt_pages/workforce/components/tableData.vue

@@ -96,15 +96,6 @@
         <el-table-column prop="total" label="总数" width="60" align="center" fixed="right"></el-table-column>
       </el-table>
 
-
-
-
-
-
-
-
-
-
       <el-dialog title="排班" :visible.sync="dialogTableVisible" width="1000px;" :v-model="dialog" >
         <div>
            <div class="cell clearfix">
@@ -174,8 +165,8 @@
       <el-dialog
         title="调整排班"
         :visible.sync="tzDialogVisible"
-        width="365px"
-        center>
+        width="500px"
+        >
         <div style="width:100%;margin:0 auto">
           <el-radio-group v-model="tiaoZhengType" :class="tiaozhengclass" >
             <el-radio :label="1">取消排班</el-radio>
@@ -191,9 +182,9 @@
       <el-dialog
         title="调整模式"
         :visible.sync="msDialogVisible"
-        width="350px"
-        center>
-        <div style="width:100%;margin:0 auto">
+        width="500px"
+        >
+        <div>
           <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" >
             <el-form-item label="" prop="mode_id">
               <el-select v-model="changeSchedule.mode_id" placeholder="请选择" style="width:100%">
@@ -216,14 +207,14 @@
       <el-dialog
         title="调整机号"
         :visible.sync="jhDialogVisible"
-        width="400px"
-        center>
-        <div style="width:100%;margin:0 auto">
-          <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" label-width="90px" label-position="left">
-            <el-form-item label="排班日期">
+        width="500px"
+        >
+        <div >
+          <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" label-width="90px" >
+            <el-form-item label="排班日期: ">
               <el-input v-model="currentData.schedule_date" disabled></el-input>
             </el-form-item>
-            <el-form-item label="班次" prop="schedule_type">
+            <el-form-item label="班次: " prop="schedule_type">
               <el-select v-model="changeSchedule.schedule_type" placeholder="请选择" style="width:100%">
                 <el-option
                   v-for="item in scheduleType"
@@ -233,7 +224,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="病房" prop="partition_id">
+            <el-form-item label="病房: " prop="partition_id">
               <el-select v-model="changeSchedule.partition_id" placeholder="请选择" style="width:100%" @change="changePartition">
                 <el-option
                   v-for="item in partitions"
@@ -243,8 +234,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
-            <el-form-item label="透析机" prop="bed_id">
+            <el-form-item label="透析机: " prop="bed_id">
               <el-select v-model="changeSchedule.bed_id" placeholder="请选择" style="width:100%">
                 <el-option
                   v-for="item in jihaos"
@@ -784,7 +774,7 @@ export default {
                 }
               }
               if (!cflag) {
-                this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+                this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
                 .then(() => {
                   this.changeSchedule.change_action = "change_device";
                   this.changeScheduleActon(formName);
@@ -795,7 +785,7 @@ export default {
                 this.changeScheduleActon(formName);
               }
             }else if (this.changeSchedule.partition_type > 1) {
-              this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+              this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
                 .then(() => {
                   this.changeSchedule.change_action = "change_device";
                   this.changeScheduleActon(formName);
@@ -929,7 +919,7 @@ export default {
             }
           });
           if (!cflag) {
-            this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+            this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
             }).catch(() => {
@@ -938,7 +928,7 @@ export default {
             this.CreateSchedule(this.currentData.patient_id, this.currentData);
           }
         }else if (that.currentData.partition_type > 1) {
-          this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+          this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
             }).catch(() => {
@@ -1124,7 +1114,7 @@ export default {
   white-space:nowrap !important;
 }
 .schedule-table-cell-disable {
-    background-color: rgb(245, 245, 245);
+    background-color: rgb(245, 245, 245)!important;
 }
 #table_data{
    min-height:calc(100vh - 350px);

src/xt_pages/workforce/components/template_table.vue

@@ -466,7 +466,7 @@ export default {
             // 此患者没有传染病，与此透析机不匹配，确定在此排班吗?
             // 此患者有传染病，与此透析机不匹配，确定在此排班吗?
             var msg = havePatientDisease ? '此患者有传染病，与此透析机不匹配，确定在此排班吗?' : '此患者没有传染病，与此透析机不匹配，确定在此排班吗?'
-            this.$confirm(msg, '提示', { confirmButtonText: '是', cancelButtonText: '否', type: 'warning' })
+            this.$confirm(msg, '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
               .then(() => {
                 this.add_schedule(patient, device_number, treat_mode, weekday, time_type)
               })