1、路由的图标

src/components/Tinymce/components/editorImage.vue

@@ -16,7 +16,7 @@
         <el-button size="small" type="primary">点击上传</el-button>
       </el-upload>
       <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit">确 定</el-button>
+      <el-button type="primary" @click="handleSubmit">保 存</el-button>
     </el-dialog>
   </div>
 </template>

src/icons/svg/role.svg

@@ -0,0 +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="1558939093484" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6723" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M889.536 359.36c20.992 20.992 32.064 47.232 33.28 78.72v370.112c-1.152 31.488-12.224 57.728-33.28 78.72s-47.232 32.064-78.72 33.28H205.248c-31.488-1.152-57.728-12.224-78.72-33.28s-32.064-47.232-33.28-78.72V438.144c1.152-31.488 12.224-57.728 33.28-78.72s47.232-32.064 78.72-33.28h11.392c15.168-68.224 49.024-124.096 101.504-167.552 52.48-43.456 115.776-66.048 189.888-67.84 74.048 1.728 137.344 24.384 189.888 67.84 52.48 43.456 86.336 99.328 101.504 167.552h11.392c31.488 1.152 57.728 12.224 78.72 33.216z m-208.256-33.216c-11.648-36.736-33.408-66.368-65.216-88.832-31.808-22.464-67.84-33.664-108.032-33.664s-76.288 11.264-108.032 33.664c-31.808 22.464-53.504 52.032-65.216 88.832h346.496zM609.536 624.064c9.344-17.792 12.8-36.864 10.496-57.344-0.576-33.856-11.84-61.696-33.664-83.584s-49.728-33.088-83.584-33.664c-34.432 0.576-62.592 11.84-84.416 33.664s-33.088 49.728-33.664 83.584c0.576 22.72 6.72 42.432 18.368 59.072 11.648 16.64 26.24 30.784 43.776 42.432v77.888c0 16.896 4.928 30.464 14.848 40.704 9.92 10.24 23.616 15.296 41.152 15.296h10.496c17.472 0 31.232-5.12 41.152-15.296 9.92-10.176 14.848-23.744 14.848-40.704v-77.888c17.408-11.648 30.848-26.368 40.192-44.16z" p-id="6724"></path></svg>

src/icons/svg/sign.svg

@@ -0,0 +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>

src/icons/svg/statistics.svg

@@ -0,0 +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="1558938925324" class="icon" style="" viewBox="0 0 1080 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5956" xmlns:xlink="http://www.w3.org/1999/xlink" width="210.9375" height="200"><defs><style type="text/css"></style></defs><path d="M568.765217 0h-14.469565v458.573913h466.365218v-7.791304C1020.66087 202.573913 818.086957 0 568.765217 0z" p-id="5957"></path><path d="M467.478261 548.730435V57.878261C208.13913 65.669565 0 279.373913 0 540.93913 0 808.069565 215.930435 1024 483.06087 1024c126.886957 0 242.643478-48.973913 329.460869-130.226087l-345.043478-345.043478z" p-id="5958"></path><path d="M1080.765217 540.93913H606.608696L934.956522 869.286957c87.930435-82.365217 143.582609-198.121739 145.808695-328.347827z" p-id="5959"></path></svg>

src/icons/svg/stock.svg

@@ -0,0 +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="1558936835104" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1125" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M938.688 322.176c10.816 18.368 16.448 38.912 17.088 61.696v441.856c-1.152 36.16-13.696 66.176-37.632 90.112-23.936 23.936-53.952 36.48-90.112 37.632H187.52c-36.16-1.152-66.24-13.696-90.112-37.632-23.936-23.936-36.48-53.952-37.632-90.112V383.872c0-22.72 5.824-43.328 17.472-61.696 11.648-18.368 27.136-33.984 46.4-46.784l320.256-198.656c19.84-12.8 42.112-19.264 66.944-19.264 24.768 0 47.104 6.4 66.944 19.264l320.256 198.656c16.256 12.8 29.824 28.416 40.64 46.784zM805.248 526.08c-4.672-11.392-16.32-20.288-35.008-26.688-9.92-6.4-20.288-7.424-31.04-3.072-10.816 4.352-19.712 11.84-26.688 22.336l-38.528 89.28-57.728-217.856c-3.52-12.8-10.944-24.64-22.336-35.456-11.392-10.816-25.216-17.92-41.536-21.44-23.36-5.824-44.16-2.496-62.592 10.048-18.368 12.544-29.632 30.464-33.664 53.824l-50.752 274.752-19.264-57.728c-3.52-12.8-9.6-23.616-18.368-32.384s-19.52-14.848-32.384-18.368c-20.416-6.4-40.832-5.12-61.248 3.968-20.416 9.024-34.432 24.64-41.984 46.784l-18.368 63.872c-6.4 13.44-7.168 25.536-2.176 36.288 4.928 10.816 14.144 17.92 27.584 21.44 12.8 6.4 24.64 6.976 35.456 1.728 10.816-5.248 18.24-14.272 22.336-27.136l12.16-44.672 13.12 57.728c6.4 9.344 13.12 17.472 20.096 24.512s15.168 13.696 24.512 20.096c6.4 2.944 12.8 4.672 19.264 5.248 6.4 0.576 12.8 0.896 19.264 0.896 3.52 0 7.744-1.024 12.672-3.072 4.928-2.048 9.216-3.072 12.672-3.072 16.32-6.976 29.312-16.192 38.912-27.584s15.872-23.488 18.816-36.288L546.24 441.6l50.752 204.8c3.52 13.44 8.448 25.536 14.848 36.288 6.4 10.816 14.464 17.92 24.064 21.44s20.288 6.144 31.936 7.872c11.648 1.728 22.336 1.024 31.936-2.176s18.944-8.896 28.032-17.088c9.024-8.192 16.768-17.216 23.168-27.136l50.752-102.4c7.04-13.376 8.192-25.792 3.52-37.12z" p-id="1126"></path></svg>

src/router/index.js

@@ -133,7 +133,7 @@ export const xt_constantRouterMap = [
       path: '/sign',
       component: () => import('@/xt_pages/sign/index'),
       name: 'sign',
-      meta: { title: 'signWeight', icon: 'table', noCache: true }
+      meta: { title: 'signWeight', icon: 'sign', noCache: true }
     }]
   },
   {
@@ -142,7 +142,7 @@ export const xt_constantRouterMap = [
     redirect: '/qcd/dialysistotal',
     name: 'qcd',
     alwaysShow: true,
-    meta: { title: '科室质控', icon: 'table' },
+    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: '透析总量' }},
@@ -160,7 +160,7 @@ export const xt_constantRouterMap = [
       { 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: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }}
     ]
   },
   {
@@ -389,7 +389,7 @@ export const xt_constantRouterMap = [
     component: Layout,
     redirect: 'noredirect',
     name: 'stockManage',
-    meta: { title: 'stockManage', icon: 'excel' },
+    meta: { title: 'stockManage', icon: 'stock' },
     children: [
       {
         path: '/stock/config',
@@ -526,7 +526,7 @@ export const xt_constantRouterMap = [
     redirect: '/role/admin/manage',
     name: 'role',
     alwaysShow: true,
-    meta: { title: 'permissionManage', icon: 'table' },
+    meta: { title: 'permissionManage', icon: 'role' },
     children: [
       { path: '/role/admin/manage', component: () => import('@/xt_pages/role/admin'), name: 'adminManage', meta: { title: 'adminManage' }},
       { path: '/role/manage', component: () => import('@/xt_pages/role/role'), name: 'roleManage', meta: { title: 'roleManage' }},
@@ -715,7 +715,7 @@ export const xt_asyncRouterMap = [
   //   redirect: '/sign/index',
   //   name: 'sign',
   //   alwaysShow: true,
-  //   meta: { title: 'signWeight', icon: 'table' },
+  //   meta: { title: 'signWeight', icon: 'sign' },
   //   children: [
   //     { path: '/sign/index', component: () => import('@/xt_pages/sign/index'), name: 'signWeight', meta: { title: 'signWeight' }}
   //   ]
@@ -787,7 +787,7 @@ export const xt_asyncRouterMap = [
   //   component: Layout,
   //   redirect: 'noredirect',
   //   name: 'stockManage',
-  //   meta: { title: 'stockManage', icon: 'excel' },
+  //   meta: { title: 'stockManage', icon: 'stock' },
   //   children: [
   //     {
   //       path: '/stock/config',
@@ -914,7 +914,7 @@ export const xt_asyncRouterMap = [
   // //     path: '/statistics',
   // //     component: () => import('@/xt_pages/statistics/index'),
   // //     name: 'statistics',
-  // //     meta: { title: 'statistics', icon: 'chart', noCache: true }
+  // //     meta: { title: 'statistics', icon: 'statistics', noCache: true }
   // //   }]
   // // },
   //  {
@@ -962,7 +962,7 @@ export const xt_asyncRouterMap = [
     redirect: '/role/admin/manage',
     name: 'role',
     alwaysShow: true,
-    meta: { title: 'permissionManage', icon: 'table' },
+    meta: { title: 'permissionManage', icon: 'role' },
     children: [
       { path: '/role/admin/manage', component: () => import('@/xt_pages/role/admin'), name: 'adminManage', meta: { title: 'adminManage' }},
       { path: '/role/manage', component: () => import('@/xt_pages/role/role'), name: 'roleManage', meta: { title: 'roleManage' }},

src/xt_pages/device/group_main.vue

@@ -31,7 +31,7 @@
                 </el-form-item>
                 <!-- <el-form-item>
                     <el-button @click="cancelModifyGroup">取 消</el-button>
-                    <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="editGroupSubmitAction">确 定</el-button>
+                    <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="editGroupSubmitAction">保 存</el-button>
                 </el-form-item> -->
             </el-form>
             <div slot="footer" class="dialog-footer">

src/xt_pages/role/components/EditRole.vue

@@ -1,18 +1,17 @@
 <template>
-    <el-dialog title='新增角色' width="40%" :visible.sync="visible" :before-close="_close">
+    <el-dialog title='新增角色' width="600px" :visible.sync="visible" :before-close="_close">
         <el-form :model="form" :rules="rules" ref="form" label-width="80px">
             <el-form-item label="角色名称" prop="name">
-                <el-input v-model="form.name" placeholder="" maxlength="30" style="width: 95%;"></el-input>
+                <el-input v-model="form.name" placeholder="" maxlength="30" ></el-input>
             </el-form-item>
             <el-form-item label="角色描述" prop="intro">
-                <el-input type="textarea" v-model="form.intro" placeholder="" resize="none" rows="4" style="width: 95%;"></el-input>
-            </el-form-item>
-
-            <el-form-item>
-                <el-button @click="hide">取消</el-button>
-                <el-button type="primary" @click="submitAction()">确定</el-button>
+                <el-input type="textarea" v-model="form.intro" placeholder="" resize="none" rows="4" ></el-input>
             </el-form-item>
         </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" @click="submitAction()">保 存</el-button>
+        </div>
     </el-dialog>
 </template>
 

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -59,7 +59,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancle()">取 消</el-button>
-    <el-button type="primary" @click="comfirm()">确 定</el-button>
+    <el-button type="primary" @click="comfirm()">保 存</el-button>
   </span>
   </el-dialog>
 

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -59,7 +59,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancle('form')">取 消</el-button>
-    <el-button type="primary" @click="comfirm('form')">确 定</el-button>
+    <el-button type="primary" @click="comfirm('form')">保 存</el-button>
   </span>
   </el-dialog>
 

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
       </div>
     </div>
 

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
       </div>
     </div>
     <div class="app-container">

src/xt_pages/stock/salesReturnEdit.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
       </div>
     </div>
 

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item">确 定</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
       </div>
     </div>
 

src/xt_pages/stock/stockInOrderAdd.vue

@@ -5,7 +5,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
       <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-      <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
       </div>
     </div>
     <div class="app-container">

src/xt_pages/stock/stockInOrderEdit.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
       </div>
     </div>
 

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -5,7 +5,7 @@
     <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
       </div>
   </div>
 

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
       </div>
     </div>
 

src/xt_pages/user/courseOfDisease.vue

@@ -8,12 +8,13 @@
         <!-- <div class="app-container"> -->
             <div class="container" v-loading="loading">
                 <div>
-                    <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 style="margin-left: 10px;">
+                    <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>
+                    
                 </div>
                 <div class="record">
                     <el-row :gutter="15">

src/xt_pages/user/dialysisRecord.vue

@@ -3,39 +3,40 @@
   <div class="patient-container">
    <patient-sidebar :id="patientID" defaultActive="2-2" v-on:tran-patient="onTranPatient"></patient-sidebar>
     <div class="patient-app-container app-container">
-        <div>
-          <el-form ref="form" :model="queryParams" label-width="80px" :inline="true">
+        <div style="clearfix">
+          <el-button style="float:right;" size="small" @click="printThisInfo()" type="primary" icon="el-icon-printer" >打印</el-button>          
+          <el-form ref="form"  :model="queryParams" label-width="80px" >
             <!-- <el-form-item label="患者时间 : " >
               <el-select v-model="form.date"   >
               <el-option v-for="item in dateOptions " :label="item.label" :value="item.value" :key="item.value" ></el-option>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="患者时间 :" >
-                  <el-col :span="11">
-                    <el-date-picker 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>
-                  <el-col class="line" :span="2">-</el-col>
-                  <el-col :span="11">
-                    <el-date-picker 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>
-            </el-form-item>
-            <el-form-item label="透析模式 : "  style="margin-left:15px;">
-              <el-select v-model="queryParams.mode_id" @change="changeSearch" clearable style="width:150px"  >
-              <el-option v-for="item in modeOptions " :label="item.name" :value="item.id" :key="item.id" ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="" >
-                <el-button style="float:right;" @click="printThisInfo()" type="primary" icon="el-icon-printer" >打印</el-button>
-            </el-form-item>
+            <el-col :span="20">
+              <el-form-item label="患者时间 :" >
+                    <!-- <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>
+                    <!-- <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> -->
+              </el-form-item>
+            </el-col>   
+            <el-col :span="20">     
+              <el-form-item label="透析模式 : "  >
+                <el-select v-model="queryParams.mode_id" @change="changeSearch" clearable style="width:314px" size="small" >
+                <el-option v-for="item in modeOptions " :label="item.name" :value="item.id" :key="item.id" ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>       
           </el-form>
         </div>
         <div>
-          <!-- <span class="total">共0条记录</span> -->
           <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="50">
+              <el-table-column prop="dialysis_date" label="透析日期" align="center" min-width="60">
                 <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="60">
+              <el-table-column prop="schedule_type" label="班次" align="center" min-width="40">
                 <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="分区 - 机号">
@@ -63,7 +64,7 @@
               <el-table-column  prop="access" min-width="60" align="center" label="血管通路">
                 <template slot-scope="scope"><span>{{setVascularAccess(scope.row.prescription)}}</span></template>
               </el-table-column>
-              <el-table-column prop="type" width="110" align="center" label="抗凝剂种类 首剂/维持/总量">
+              <el-table-column prop="type" width="145" align="center" label="抗凝剂种类 首剂/维持/总量">
               <template slot-scope="scope">
                 <span>{{setAnticoagulantsConfit(scope.row.prescription)}}</span>
               </template>

src/xt_pages/user/patients.vue

@@ -177,13 +177,13 @@
       </span>
     </el-dialog>
     <el-dialog title="转归" :visible.sync="LapsetoDialogVisible">
-      <el-form :model="lapsetoForm" :rules="lapsetoRules" ref="lapsetoForm" >
-        <el-form-item label="治疗状态（转归）" prop="lapseto_type" required>
+      <el-form :model="lapsetoForm" :rules="lapsetoRules" ref="lapsetoForm" label-width="140px" >
+        <el-form-item label="治疗状态（转归）:" prop="lapseto_type" required>
           <el-radio-group v-model="lapsetoForm.lapseto_type">
             <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="转归时间" prop="lapseto_time" required>
+        <el-form-item label="转归时间 :" prop="lapseto_time" required>
           <el-date-picker
             v-model="lapsetoForm.lapseto_time"
             type="datetime"
@@ -196,7 +196,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="LapsetoDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="EditLapseto()">确 定</el-button>
+        <el-button type="primary" @click="EditLapseto()">保 存</el-button>
       </div>
     </el-dialog>
 

src/xt_pages/user/proeducation.vue

@@ -19,7 +19,7 @@
             </el-table>
             
             <el-pagination
-          align="right"
+                align="right"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :current-page="listQuery.page"
@@ -46,7 +46,6 @@ let rowIndex = 1;
 
 export default {
     name:'proeducation',
-
     data(){
         return {
             total:0,

src/xt_pages/user/registration.vue

@@ -304,8 +304,8 @@
       <el-row >
          <el-col :span="24" align="center">
             <el-form-item>
-              <el-button type="primary" @click="onSubmit('form')">确定</el-button>
-              <el-button>确定并继续新增</el-button>
+              <el-button type="primary" @click="onSubmit('form')">保存</el-button>
+              <el-button>保存并继续新增</el-button>
               <el-button>取消</el-button>
             </el-form-item>
          </el-col>

src/xt_pages/user/rescueRecord.vue

@@ -3,12 +3,12 @@
         <patient-sidebar :id="patient_id" defaultActive="1-5"></patient-sidebar>
         <div class="container" v-loading="loading">
             <div>
-                <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="requestRescueRecords()"></el-date-picker>
-                <span style="margin-left: 10px;">
+                <span style="margin-left: 10px;float:right;">
                     <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="show_dialog = true">新增</el-button>
                     <el-button size="small" icon="el-icon-delete" 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="requestRescueRecords()"></el-date-picker>
             </div>
             <div class="record">
                 <el-row :gutter="15">

src/xt_pages/workforce/components/template_schedule_selector_dialog.vue

@@ -15,7 +15,7 @@
             </el-form-item>
             <el-form-item>
                 <el-button type="danger" @click="cancelScheduleAction">取消排班</el-button>
-                <el-button type="primary" @click="saveAction">确定</el-button>
+                <el-button type="primary" @click="saveAction">保存</el-button>
             </el-form-item>
         </el-form>
     </el-dialog>

src/xt_pages/workforce/components/template_table.vue

@@ -7,7 +7,7 @@
                 </div>
                 <div v-show="editable && is_editing">
                     <el-button type="info" size="small" @click="is_editing = false" icon="el-icon-delete">取消</el-button>
-                    <el-button type="warning" size="small" icon="el-icon-document" @click="saveAction">确定</el-button>
+                    <el-button type="primary" size="small" icon="el-icon-document" @click="saveAction">保存</el-button>
                 </div>
             </el-col>
         </el-row>