Merge branch 'superman' of http://git.shengws.com/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/lang/zh.js

@@ -136,22 +136,22 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
-    stockInOrder: '入库单',
-    salesReturnOrder: '退货单',
-    stockOutOrder: '出库单',
-    cancelStockOrder: '出库退库单',
+    stockInOrder: '耗材入库单',
+    salesReturnOrder: '耗材退货单',
+    stockOutOrder: '耗材出库单',
+    cancelStockOrder: '耗材退库单',
     otherStockInOrder: '其他入库单',
     otherSalesReturnOrder: '其他退货单',
     otherStockOutOrder: '其他出库单',
-    otherCancelStockOrder: '其他出库退库单',
+    otherCancelStockOrder: '其他退库单',
     stockInOrderAdd: '新增入库单',
     salesReturnOrderAdd: '新增退货单',
     stockOutOrderAdd: '新增出库单',
-    cancelStockOrderAdd: '新增出库退库单',
+    cancelStockOrderAdd: '新增退库单',
     stockInDetail: '入库单详情',
     salesReturnDetail: '退货单详情',
     stockOutDetail: '出库单详情',
-    cancelStockDetail: '出库退库单详情',
+    cancelStockDetail: '退库单详情',
     stockDetail:'出入库明细查询',
 
   },

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/
 ]
 
@@ -712,13 +715,13 @@ export const xt_asyncRouterMap = [
   // {
   //   path: '/sign',
   //   component: Layout,
-  //   redirect: '/sign/index',
-  //   name: 'sign',
-  //   alwaysShow: true,
-  //   meta: { title: 'signWeight', icon: 'sign' },
-  //   children: [
-  //     { path: '/sign/index', component: () => import('@/xt_pages/sign/index'), name: 'signWeight', meta: { title: 'signWeight' }}
-  //   ]
+  //   redirct: '/sign/index',
+  //   children: [{
+  //     path: '/sign',
+  //     component: () => import('@/xt_pages/sign/index'),
+  //     name: 'sign',
+  //     meta: { title: 'signWeight', icon: 'sign', noCache: true }
+  //   }]
   // },
   // {
   //   path: '/dialysis/',

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;

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/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="" style="margin-right:20px;">
-    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row @current-change="handleRowChange"
+    <el-table style="margin-top: 42px;" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row @current-change="handleRowChange"
       >
       <el-table-column  align="center" label="名称">
         <template slot-scope="scope">

src/xt_pages/data/components/tableson.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button 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/dialysis/details/index.vue

@@ -249,7 +249,6 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
         {path:false, name:'透析管理'},
         {path:false, name:'透析记录'},
         {path:false, name:'透析单'},

src/xt_pages/role/admin.vue

@@ -2,22 +2,22 @@
 <div class="main-contain">
   <div class="position">
     <bread-crumb :crumbs='crumbs'></bread-crumb>
-        <router-link to="/role/admin/create">
-          <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="float:right;">新增</el-button>
-        </router-link>
+        <!-- <router-link to="/role/admin/create"> -->
+          <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="float:right;" @click="openForm(0)">新增</el-button>
+        <!-- </router-link> -->
   </div>
   <div class="app-container">
-    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" style="width:100%;" ref="table" :data="admins" v-loading="is_loading_admins">
-      <el-table-column label="用户名" prop="user_name" width="160"></el-table-column>
-      <el-table-column label="最后登录IP" prop="ip" width="150"></el-table-column>
-      <el-table-column label="最后登录时间" prop="last_login_time" width="170">
+    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" style="width:100%;" ref="table" border :data="admins" v-loading="is_loading_admins">
+      <el-table-column label="用户名" prop="user_name" min-width="160"></el-table-column>
+      <el-table-column label="最后登录IP" prop="ip" min-width="150"></el-table-column>
+      <el-table-column label="最后登录时间" prop="last_login_time" min-width="170">
         <template slot-scope="scope">
           <span>{{ scope.row.last_login_time == 0 ? '' : (_parseTime(scope.row.last_login_time, '{y}-{m}-{d} {h}:{i}'))}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="角色" prop="role_name" width="160"></el-table-column>
-      <el-table-column label="职称" prop="title_name" width="160"></el-table-column>
-      <el-table-column label="状态" width="100">
+      <el-table-column label="角色" prop="role_name" min-width="160"></el-table-column>
+      <el-table-column label="职称" prop="title_name" min-width="160"></el-table-column>
+      <el-table-column label="状态" min-width="100">
         <template slot-scope="scope">
           <div v-if="scope.row.status == 1" style="color: #67C23A; font-size:20px;">
             <li class="el-icon-success"></li>
@@ -27,13 +27,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" >
+      <el-table-column label="操作" width="120">
         <template slot-scope="scope">
-          <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}">
+          <!-- <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}"> -->
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-              <el-button type="primary" icon="el-icon-edit-outline" size="small"></el-button>
+              <el-button type="primary" icon="el-icon-edit-outline" size="small" @click="openForm(scope.row.user_id)"></el-button>
             </el-tooltip> 
-          </router-link>
+          <!-- </router-link> -->
           <el-tooltip class="item" effect="dark" content="移除" placement="top">
             <el-button type="danger" size="small" icon="el-icon-delete" v-if="scope.row.status == 1" @click="disableAdminAction(scope.row)"></el-button>
           </el-tooltip>
@@ -49,6 +49,7 @@
         <el-pagination :total="admin_total_count" :current-page.sync="current_page" @current-change="pageChange" :page-size="10" layout="total, prev, pager, next, jumper"></el-pagination>
       </el-col>
     </el-row>
+    <admin-info-form ref="admininfoform"  ></admin-info-form>
   </div>
 </div>
 
@@ -58,6 +59,7 @@
 import {adminMainView, getAdmins, setAdminStatus} from '@/api/role/admin'
 import { parseTime } from '@/utils'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import AdminInfoForm from "./components/AdminInfoForm";
 
 export default {
   name: 'adminManage',
@@ -75,8 +77,8 @@ export default {
     }
   },
   components:{
-    BreadCrumb
-    
+    BreadCrumb,
+    AdminInfoForm
   },
   created: function() {
     adminMainView().then(rs => {
@@ -103,6 +105,9 @@ export default {
     }
   },
   methods: {
+    openForm(adminId) {
+      this.$refs['admininfoform'].open(adminId);
+    },
     _parseTime(time, format) {
       return parseTime(time, format)
     },

src/xt_pages/role/components/AdminInfoForm.vue

@@ -0,0 +1,238 @@
+<template>
+    <el-dialog :title="formTitle" :visible.sync="dialogFormVisible">
+        <el-form :model="form" ref="form" :rules="rules" label-width="100px">
+                <el-form-item label="账号" prop="mobile">
+                    <el-input v-model="form.mobile" placeholder="用户手机号" :disabled="form.id !==  0"></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="职称">
+                    <el-select v-model="form.user_type" placeholder="用户类型">
+                        <el-option v-for="item in user_types" :label="item.name" :value="item.index" :key="item.index"></el-option>
+                    </el-select>
+
+                    <el-select v-model="form.user_title" placeholder="用户职称">
+                        <el-option v-for="item in user_titles" :label="item.name" :value="item.index" :key="item.index"></el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="角色">
+                    <el-select v-model="form.role" placeholder="角色">
+                        <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="介绍">
+                    <Tinymce :height=400 menubar='' ref="editor" v-model="form.intro" :show_upload_img="false" />
+                </el-form-item>
+
+            </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+            <el-button type="primary" @click="submitAction">保 存</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import Tinymce from '@/components/Tinymce'
+import {getAddAdminInitData, addAdmin, getModifyAdminInitData, modifyAdmin} from '@/api/role/admin'
+export default {
+    name:"AdminInfoForm",
+    components: {
+        Tinymce
+    },
+    // props: {
+    //     admin_id: {
+    //         type: Number,
+    //         require: true
+    //     }
+    // },
+    data() {
+        var checkMobile = (rule, value, callback) => {
+            if (!value || value.length == 0) {
+                return callback(new Error('手机号不能为空'))
+            }
+            if (/^1\d{10}$/.test(value) == false) {
+                return callback(new Error('手机号格式错误'))
+            } else {
+                callback()
+            }
+        }
+        var checkName = (rule, value, callback) => {
+            if (!value || value.length == 0) {
+                return callback(new Error('姓名不能为空'))
+            } else {
+                callback()
+            }
+        }
+        return {
+            admin_id:0,
+            dialogFormVisible:false,
+            user_types: [
+                { index: 2, name: '医生' },
+                { index: 3, name: '护士' },
+            ],
+            user_titles: [
+                { index: 1, name: '医士' },
+                { index: 2, name: '医师' },
+                { index: 3, name: '住院医师' },
+                { index: 4, name: '主治医师' },
+                { index: 5, name: '副主任医师' },
+                { index: 6, name: '主任医师' },
+                { index: 7, name: '护士' },
+                { index: 8, name: '护师' },
+                { index: 9, name: '主管护师' },
+                { index: 10, name: '副主任护师' },
+                { index: 11, name: '主任护师' },
+                { index: 12, name: '运营专员' },
+                { index: 13, name: '运营主管' },
+            ],
+            roles: [], // [{id, name, intro, status}]
+            loading: true,
+            qntoken: '',
+            formTitle:'',
+            form: {
+                id: 0,
+                mobile: '',
+                name: '',
+                user_type: '',
+                user_title: '',
+                role: '', // 其实应该是 int 类型
+                intro: '',
+            },
+            rules: {
+                mobile: [
+                    {validator: checkMobile, trigger: 'blur'}
+                ],
+                name: [
+                    {validator: checkName, trigger: 'blur'}
+                ]
+            }
+        }
+    },
+    methods: {
+        open:function(adminId){
+            this.admin_id = adminId;
+            if (this.admin_id < 0) {
+                this.$message.error("参数错误")
+                this.loading = false
+                return
+            }
+
+            this.form.id = this.admin_id
+            if (this.admin_id === 0) {
+                this.formTitle = '新增用户';
+                this.form.user_type = this.user_types[0].index
+                this.form.user_title = this.user_titles[0].index
+                getAddAdminInitData().then(rs => {
+                    this.loading = false
+                    var resp = rs.data
+                    if (resp.state === 1) {
+                        this.roles.push(...resp.data.roles)
+                        this.qntoken = resp.data.qntoken
+                        if (this.roles.length > 0) {
+                            this.form.role = this.roles[0].id
+                        }
+
+                    } else {
+                        this.$message.error(resp.msg)
+                    }
+
+                }).catch(err => {
+                    this.loading = false
+                    this.$message.error(err)
+                })
+                
+            } else {
+                this.formTitle = '编辑用户';
+                getModifyAdminInitData(this.form.id).then(rs => {
+                    this.loading = false
+                    var resp = rs.data
+                    if (resp.state === 1) {
+                        this.roles.push(...resp.data.roles)
+                        this.qntoken = resp.data.qntoken
+                        
+                        var admin = resp.data.admin
+                        this.form.name = admin.user_name
+                        this.form.mobile = admin.mobile
+                        this.form.user_type = admin.user_type
+                        this.form.user_title = admin.user_title
+                        this.form.role = admin.role_id
+                        this.form.intro = admin.intro
+                        
+                    } else {
+                        this.$message.error(resp.msg)
+                    }
+
+                }).catch(err => {
+                    this.loading = false
+                    this.$message.error(err)
+                })
+            }
+            
+            this.dialogFormVisible = true;
+        },
+        submitAction: function() {
+            if (this.admin_id < 0) {
+                return
+            }
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.loading = true
+                    if (this.form.id === 0) {
+                        addAdmin(this.form.mobile, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
+                            this.loading = false
+                            var resp = rs.data
+                            if (resp.state === 1) {
+                                this.$store.dispatch('DidChangeAdmins')
+                                var _this = this
+                                setTimeout(() => {
+                                    _this.$store.dispatch('RecoverAdminsChangeState')
+                                }, 500)
+                                this.dialogFormVisible = false;
+                                
+                            } else {
+                                this.$message.error(resp.msg)
+                            }
+
+                        }).catch(err => {
+                            this.loading = false
+                            this.$message.error(err)
+                        })
+                        
+                    } else {
+                        modifyAdmin(this.form.id, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
+                            this.loading = false
+                            var resp = rs.data
+                            if (resp.state === 1) {
+                                this.$store.dispatch('DidChangeAdmins')
+                                var _this = this
+                                setTimeout(() => {
+                                    _this.$store.dispatch('RecoverAdminsChangeState')
+                                }, 500)
+
+                                this.dialogFormVisible = false;
+                                
+                            } else {
+                                this.$message.error(resp.msg)
+                            }
+
+                        }).catch(err => {
+                            this.loading = false
+                            this.$message.error(err)
+                        })
+                    }
+                    
+                } else {
+                    return false
+                }
+            })
+        }
+    },
+
+}
+</script>

src/xt_pages/role/role.vue

@@ -5,7 +5,7 @@
     <el-button type="primary" size="small" icon="el-icon-circle-plus" style="float:right;" @click="addRoleAction">新增</el-button>
   </div>
   <div class="app-container">
-    <el-table :data="roles" v-loading="loading_roles" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
+    <el-table :data="roles" v-loading="loading_roles" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
       <el-table-column label="角色名称" prop="name" min-width="20%"></el-table-column>
       <el-table-column label="角色描述" prop="intro" min-width="25%"></el-table-column>
       <el-table-column label="状态" min-width="15%">
@@ -18,7 +18,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" min-width="40%">
+      <el-table-column label="操作" width="180">
         <template slot-scope="scope">
           <router-link :to='{ path:"/role/perview", query:{ id:scope.row.id }}'>
             <el-tooltip class="item" effect="dark" content="权限设置" placement="top">

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/cancelStockOrderAdd.vue

@@ -194,11 +194,8 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
-              // this.recordInfo.recordData.push(tempForm)
               this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
 
-
-
             }
           }
         }

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -6,18 +6,18 @@
   <div class="app-container">
 
     <div class="filter-container">
-      <span style="font-size: 20px">退库单详情</span>
+      <span style="font-size: 20px;color: #606266">退库单详情</span>
       <el-row style="float:right;">
-        <span>{{CancelStockInfo.cancelStock.order_number}}</span>
+        <span style="color: #606266">{{CancelStockInfo.cancelStock.order_number}}</span>
       </el-row>
     </div>
 
 
 
     <div class="cell clearfix">
-      <span style="width: 300px">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span style="width: 300px">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
-      <span style="width: 300px">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
+      <span style="width: 300px;color: #606266">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
+      <span style="width: 300px;color: #606266">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
     </div>
 
     <div class="filter-container" style="margin-top: 10px">

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

@@ -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>
 
@@ -53,13 +53,13 @@
           :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>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </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>
 
@@ -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>
 
@@ -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>
 
@@ -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/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/salesReturnOrderDetail.vue

@@ -7,17 +7,17 @@
     <div class="app-container">
 
       <div class="filter-container">
-        <span style="font-size: 18px">退货单详情</span>
-        <el-row style="float:right;">
-          <span>{{ReturnInfo.salesReturn.order_number}}</span>
+        <span style="font-size: 18px;color: #606266">退货单详情</span>
+        <el-row style="float:right;color: #606266">
+          <span style="color: #606266">{{ReturnInfo.salesReturn.order_number}}</span>
         </el-row>
       </div>
 
 
       <div class="cell clearfix">
-        <span style="width: 300px">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
-        <span style="width: 300px">厂商: {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
-        <span style="width: 300px">经销商: {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
+        <span style="width: 300px;color: #606266">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266">厂商: {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
+        <span style="width: 300px;color: #606266">经销商: {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
       </div>
 
       <div class="filter-container" style="margin-top: 10px">

src/xt_pages/stock/stockInOrderDetail.vue

@@ -5,16 +5,16 @@
     </div>
   <div class="app-container">
     <div class="filter-container">
-      <span style="font-size: 18px">入库单详情</span>
+      <span style="font-size: 18px;color: #606266">入库单详情</span>
       <el-row style="float:right;">
-        <span>入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
+        <span style="color: #606266">入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
       </el-row>
     </div>
 
     <div class="cell clearfix">
-      <span style="width: 300px">单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}}</span>
-      <span style="width: 300px">厂商: {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
-      <span style="width: 300px">经销商: {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
+      <span style="width: 300px;color: #606266">单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}}</span>
+      <span style="width: 300px;color: #606266">厂商: {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
+      <span style="width: 300px;color: #606266">经销商: {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
     </div>
 
     <div class="cell clearfix" style="margin-top: 10px">
@@ -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/stockOutOrderDetail.vue

@@ -7,17 +7,17 @@
     <div class="app-container">
 
       <div class="filter-container">
-        <span style="font-size: 18px">出库单详情</span>
+        <span style="font-size: 18px;color: #606266">出库单详情</span>
         <el-row style="float:right;">
-          <span>{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
         </el-row>
       </div>
 
 
       <div class="cell clearfix">
-        <span style="width: 300px;">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
-        <span style="width: 300px;">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
-        <span style="width: 300px;">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
+        <span style="width: 300px;color: #606266">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
+        <span style="width: 300px;color: #606266">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
       </div>
 
       <div class="filter-container" style="margin-top: 10px">

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/PatientForm.vue

@@ -1,7 +1,6 @@
 <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>
@@ -37,7 +36,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 +58,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>
@@ -300,7 +299,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 +488,6 @@ export default {
     }
 
     return {
-      crumbs: [
-        { path: false, name: '病人管理' },
-        { path: '/patients/create', name: '新增病人' },
-      ],
       generic_info_fold: true,
       treat_info_fold: true,
 
@@ -994,9 +989,6 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 
-.uploadHead {
-  // margin-top: 25%;
-}
 .uploadHeadBtn {
   width: 148px;
   margin-top: 10px;
@@ -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/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/doctorAdvice.vue

@@ -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/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>