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

config/dev.env.js

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

src/components/Hamburger/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="" viewBox="0 0 1024 1024"
+    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="fill:#bfcbd9" viewBox="0 0 1024 1024"
       version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1691" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
       <path d="M966.8023 568.849776 57.196677 568.849776c-31.397081 0-56.850799-25.452695-56.850799-56.850799l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 543.397081 998.200404 568.849776 966.8023 568.849776z"
         p-id="1692"></path>

src/router/index.js

@@ -123,8 +123,8 @@ export const xt_constantRouterMap = [
   },
 
   // ////////////////////////////
-  //本地开始
-  ///////////////////////////////
+  // 本地开始
+  // /////////////////////////////
   {
     path: 'statistics',
     component: Layout,
@@ -157,14 +157,31 @@ export const xt_constantRouterMap = [
     children: [
       { 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/outcomeIndicators',
+        name: 'outcomeIndicators',
+        meta: { title: '结果指标' },
+        redirect: '/qcd/outcomeIndicators/control',
+        component: () => import('@/xt_pages/qcd/outcomeIndicators/parent'), // Parent router-view
+        children: [
+          { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '指标控制' }},
+          { path: '/qcd/outcomeIndicators/query', component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }}
+        ]
+      },
+      {
+        path: '/qcd/patientanalysis',
+        name: 'patientanalysis',
+        meta: { title: '患者分析' },
+        redirect: '/qcd/patientanalysis/total',
+        component: () => import('@/xt_pages/qcd/patientAnalysis/parent'), // Parent router-view
+        children: [
+          { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '总量分析' }},
+          { path: '/qcd/patientanalysis/weight', component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
+          { path: '/qcd/patientanalysis/bloodpressure', component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
+          { path: '/qcd/patientanalysis/dialysisage', component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
+          { path: '/qcd/patientanalysis/lapseto', component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', 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: '转归' }},
     ]
@@ -926,8 +943,33 @@ export const xt_asyncRouterMap = [
   //     { 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/outcomeIndicators',
+  //   name: 'outcomeIndicators',
+  //   meta: { title: '结果指标' },
+  //   redirect: '/qcd/outcomeIndicators/control',
+  //   component: () => import('@/xt_pages/qcd/outcomeIndicators/parent'), // Parent router-view
+  //   children:[
+  //     { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '指标控制' }},
+  //     { path: '/qcd/outcomeIndicators/query', component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
   //   ]
   // },
+  // {
+  //   path: '/qcd/patientanalysis',
+  //   name: 'patientanalysis',
+  //   meta: { title: '患者分析' },
+  //   redirect: '/qcd/patientanalysis/total',
+  //   component: () => import('@/xt_pages/qcd/patientAnalysis/parent'), // Parent router-view
+  //   children:[
+  //     { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '总量分析' }},
+  //     { path: '/qcd/patientanalysis/weight', component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
+  //     { path: '/qcd/patientanalysis/bloodpressure', component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
+  //     { path: '/qcd/patientanalysis/dialysisage', component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
+  //     { path: '/qcd/patientanalysis/lapseto', component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
+  //   ]
+  // },
+  // ]
+  // },
   // /////////////////////////////////////线在end
   {
     path: '/role',

src/styles/index.scss

@@ -139,7 +139,7 @@ code {
   padding: 20px;
   background: #fff;
   margin: 0 15px 15px 15px;
-  min-height: calc(100vh - 185px);
+  min-height: calc(100vh - 178px);
 }
 
 .components-container {
@@ -347,7 +347,7 @@ code {
 
 // 筛选全局样式
 .app-container {
-  .cell {
+  .cell.clearfix {
     margin: 0px 0 12px 0;
     display: flex;
     align-items:center;
@@ -375,12 +375,12 @@ code {
       }
     }
     .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
+      // -webkit-box-flex: 1;
+      // -ms-flex: 1;
+      // flex: 1;
       ul {
         margin: 0;
-        padding-left: 5px;
+        // padding-left: 5px;
         li {
           float: left;
           list-style: none;
@@ -452,4 +452,8 @@ code {
   top: 50% !important;
   transform: translate(-50%,-50%) !important;
   margin-top: 0 !important; 
+}
+
+.el-message{
+  z-index: 2004!important;
 }

src/styles/sidebar.scss

@@ -47,7 +47,7 @@
     }
     .el-menu {
       border: none;
-      min-height: 100%;
+      min-height: 130%;
       width: 100% !important;
     }
   }

src/views/layout/components/Navbar.vue

@@ -1,123 +1,124 @@
 <template>
-<div class="top-nav">
-   <div class="nav-logo">
-       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
+  <div class="top-nav">
+    <div class="nav-logo">
+      <img :src="require(`../../../assets/logo/logo.png`)" alt="">
     </div>
-  <el-menu class="navbar" mode="horizontal">
-    <div>
-      <el-dropdown trigger="click" style="color:#fff;">
-        <span class="el-dropdown-link">
-          南山市人民医院<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown" style="margin-top:21px;">
-          <el-dropdown-item >深圳市人民医院</el-dropdown-item>
-          <el-dropdown-item >长沙是透析中心</el-dropdown-item>
-          <el-dropdown-item >东莞血液透析中心</el-dropdown-item>
-          <el-dropdown-item >东莞血液透析中心</el-dropdown-item>
-          <el-dropdown-item >东莞血液透析中心</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="system-nav">
-       <div class="system-nav-menu">
-          <a  href="http://jk.kuyicloud.com/">
-          <!-- <a  href="http://test1.sgjyun.com/"> -->
-             <span ><i class="iconfont icon-pengyou"></i> SCRM</span>
-          </a>
-       </div>
-       <div class="system-nav-menu">
-        <a href="http://mall.kuyicloud.com/">
-        <!-- <a href="http://mall.test.sgjyun.com/"> -->
-          <span ><i class="icon iconfont icon-service_fill"></i> 微商城</span>
-        </a>
-      </div>
-      <div class="system-nav-menu active">
-        <a>
-          <span><i class="icon iconfont icon-jiankangshuidi"></i> 血透管理</span>
-        </a>
-      </div>
-      <div class="system-nav-menu">
-        <a href="http://cdm.kuyicloud.com/">
-          <span ><i class="icon iconfont icon-manbing-xuanzhong"></i> 慢病管理</span>
-        </a>
+    <el-menu class="navbar" mode="horizontal">
+      <div>
+        <!--<el-dropdown trigger="click" style="color:#fff;">-->
+        <!--<span class="el-dropdown-link">-->
+          <!--南山市人民医院<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+        <!--</span>-->
+          <!--&lt;!&ndash;<el-dropdown-menu slot="dropdown" style="margin-top:21px;">&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>深圳市人民医院</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>长沙是透析中心</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
+            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
+          <!--&lt;!&ndash;</el-dropdown-menu>&ndash;&gt;-->
+        <!--</el-dropdown>-->
       </div>
+      <div class="system-nav">
+        <div class="system-nav-menu">
+          <!--<a  href="http://jk.kuyicloud.com/">-->
+          <a href="http://test1.sgjyun.com/">
+            <span><i class="iconfont icon-pengyou"></i> SCRM</span>
+          </a>
+        </div>
+        <div class="system-nav-menu">
+          <!--<a href="http://mall.kuyicloud.com/">-->
+          <a href="http://mall.test.sgjyun.com/">
+            <span><i class="icon iconfont icon-service_fill"></i> 微商城</span>
+          </a>
+        </div>
+        <div class="system-nav-menu active">
+          <a>
+            <span><i class="icon iconfont icon-jiankangshuidi"></i> 血透管理</span>
+          </a>
+        </div>
+        <div class="system-nav-menu">
+          <!--<a href="http://cdm.kuyicloud.com/">-->
+          <a href=" http://cdm.test.sgjyun.com/">
+            <span><i class="icon iconfont icon-manbing-xuanzhong"></i> 慢病管理</span>
+          </a>
+        </div>
 
-      <div class="system-nav-menu">
-        <a href="http://sso.kuyicloud.com/org/app/create">
-        <!-- <a href="http://testsso.sgjyun.com/org/app/create"> -->
-          <span ><i class="icon iconfont icon-suoyou"></i> 应用</span>
-        </a>
+        <div class="system-nav-menu">
+          <!--<a href="http://sso.kuyicloud.com/org/app/create">-->
+          <a href="http://testsso.sgjyun.com/org/app/create">
+            <span><i class="icon iconfont icon-suoyou"></i> 应用</span>
+          </a>
+        </div>
       </div>
-    </div>
 
-    <div class="right-menu">
-      <el-dropdown class="avatar-container right-menu-item" trigger="click">
-        <div class="avatar-wrapper">
-          <img class="user-avatar" :src="avater">
-          <span class="user-title">{{ this.$store.getters.xt_user.user.user_name }}</span>
-          <i class="el-icon-caret-bottom"></i>
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item>
-            <span @click="modifyUserInfoAction">修改个人信息</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided>
-            <span @click="myServe">我的服务</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided>
-            <span @click="logout" style="display:block;">{{$t('navbar.logOut')}}</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-
-      <!-- <screenfull class="screenfull right-menu-item"></screenfull> -->
-      <modify-user-info-dialog ref="modify_user_info_dialog"></modify-user-info-dialog>
+      <div class="right-menu">
+        <el-dropdown class="avatar-container right-menu-item" trigger="click">
+          <div class="avatar-wrapper">
+            <img class="user-avatar" :src="avater">
+            <span class="user-title">{{ this.$store.getters.xt_user.user.user_name }}</span>
+            <i class="el-icon-caret-bottom"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item>
+              <span @click="modifyUserInfoAction">修改个人信息</span>
+            </el-dropdown-item>
+            <el-dropdown-item divided>
+              <span @click="myServe">我的服务</span>
+            </el-dropdown-item>
+            <el-dropdown-item divided>
+              <span @click="logout" style="display:block;">{{$t('navbar.logOut')}}</span>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
 
-    </div>
-  </el-menu>
-</div>
+        <!-- <screenfull class="screenfull right-menu-item"></screenfull> -->
+        <modify-user-info-dialog ref="modify_user_info_dialog"></modify-user-info-dialog>
+
+      </div>
+    </el-menu>
+  </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-// import Breadcrumb from "@/components/Breadcrumb";
-// import Hamburger from "@/components/Hamburger";
-import Screenfull from "@/components/Screenfull";
-import ModifyUserInfoDialog from "@/xt_pages/home/modify_user_info_dialog";
-
-export default {
-  components: {
-    // Breadcrumb,
-    // Hamburger,
-    Screenfull,
-    ModifyUserInfoDialog
-  },
-  computed: {
-    ...mapGetters(["sidebar"]),
-    avater: function() {
-      var avatar = this.$store.getters.xt_user.user.avatar;
-      return avatar.length > 0
-        ? avatar
-        : require("../../../assets/home/userData.png");
-    }
-  },
-  methods: {
-    // toggleSideBar() {
-    //   this.$store.dispatch("toggleSideBar");
-    // },
-    logout() {
-      this.$store.dispatch("FrontendLogout");
-      window.location.href = process.env.BASE_API + "/logout";
+  import { mapGetters } from 'vuex'
+  // import Breadcrumb from "@/components/Breadcrumb";
+  // import Hamburger from "@/components/Hamburger";
+  import Screenfull from '@/components/Screenfull'
+  import ModifyUserInfoDialog from '@/xt_pages/home/modify_user_info_dialog'
+
+  export default {
+    components: {
+      // Breadcrumb,
+      // Hamburger,
+      Screenfull,
+      ModifyUserInfoDialog
     },
-    modifyUserInfoAction() {
-      this.$refs.modify_user_info_dialog.show();
+    computed: {
+      ...mapGetters(['sidebar']),
+      avater: function() {
+        var avatar = this.$store.getters.xt_user.user.avatar
+        return avatar.length > 0
+          ? avatar
+          : require('../../../assets/home/userData.png')
+      }
     },
-    myServe() {
-      this.$router.push("/service");
-      return false;
+    methods: {
+      // toggleSideBar() {
+      //   this.$store.dispatch("toggleSideBar");
+      // },
+      logout() {
+        this.$store.dispatch('FrontendLogout')
+        window.location.href = process.env.BASE_API + '/logout'
+      },
+      modifyUserInfoAction() {
+        this.$refs.modify_user_info_dialog.show()
+      },
+      myServe() {
+        this.$router.push('/service')
+        return false
+      }
     }
   }
-};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -127,7 +128,7 @@ export default {
   top: 0;
   left: 0;
   right: 0;
-  // z-index: 2052;
+  z-index: 2004;
   .nav-logo {
     width: 162px;
     display: flex;
@@ -138,10 +139,12 @@ export default {
     padding: 10px 0;
     box-sizing: border-box;
     float: left;
-    img {
-      display: inline-block;
-      width: 100px;
-    }
+
+  img {
+    display: inline-block;
+    width: 100px;
+  }
+
   }
   .navbar {
     border-radius: 0px !important;
@@ -153,81 +156,102 @@ export default {
     border: none;
     background: #409eff;
     float: left;
-    .breadcrumb-container {
-      float: left;
-    }
-    .errLog-container {
-      display: inline-block;
-      vertical-align: top;
-    }
-    .right-menu {
-      float: right;
-      height: 100%;
-      &:focus {
-        outline: none;
-      }
-      .right-menu-item {
-        display: inline-block;
-        margin: 0 8px;
-        .iconfont {
-          font-size: 18px;
-        }
-      }
-      .screenfull {
-        height: 20px;
-      }
-      .international {
-        vertical-align: top;
-      }
-      .theme-switch {
-        vertical-align: 15px;
-      }
-      .avatar-container {
-        margin-right: 10px;
-        .avatar-wrapper {
-          cursor: pointer;
-          margin-top: 3px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          .user-avatar {
-            width: 40px;
-            height: 40px;
-            border-radius: 50%;
-            object-fit: cover;
-            object-position: center;
-          }
-          .user-title {
-            margin: 0 8px;
-            font-size: 14px;
-            color: #fff;
-          }
-          .el-icon-caret-bottom {
-            font-size: 12px;
-            color: #fff;
-          }
-        }
-      }
-    }
+
+  .breadcrumb-container {
+    float: left;
+  }
+
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .right-menu {
+    float: right;
+    height: 100%;
+
+  &
+  :focus {
+    outline: none;
+  }
+
+  .right-menu-item {
+    display: inline-block;
+    margin: 0 8px;
+
+  .iconfont {
+    font-size: 18px;
+  }
+
+  }
+  .screenfull {
+    height: 20px;
+  }
+
+  .international {
+    vertical-align: top;
+  }
+
+  .theme-switch {
+    vertical-align: 15px;
+  }
+
+  .avatar-container {
+    margin-right: 10px;
+
+  .avatar-wrapper {
+    cursor: pointer;
+    margin-top: 3px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+  .user-avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    object-fit: cover;
+    object-position: center;
+  }
+
+  .user-title {
+    margin: 0 8px;
+    font-size: 14px;
+    color: #fff;
+  }
+
+  .el-icon-caret-bottom {
+    font-size: 12px;
+    color: #fff;
+  }
+
+  }
+  }
+  }
   }
   .system-nav {
-    .system-nav-menu {
-      float: left;
-      height: 60px;
-      line-height: 60px;
-      padding: 0 25px;
-      a {
-        font-size: 15px;
-        .iconfont {
-          font-size: 18px;
-        }
-      }
-    }
-    .active {
-      background: #3090eb;
-      border-left: 1px #5fabf7 solid;
-      border-right: 1px #5fabf7 solid;
-    }
+
+  .system-nav-menu {
+    float: left;
+    height: 60px;
+    line-height: 60px;
+    padding: 0 25px;
+
+  a {
+    font-size: 15px;
+
+  .iconfont {
+    font-size: 18px;
+  }
+
+  }
+  }
+  .active {
+    background: #3090eb;
+    border-left: 1px #5fabf7 solid;
+    border-right: 1px #5fabf7 solid;
+  }
+
   }
   .el-menu::after,
   .el-menu::before {
@@ -237,5 +261,6 @@ export default {
     top: 0;
     left: 0;
   }
-}
+
+  }
 </style>

src/views/layout/components/Sidebar/index.vue

@@ -12,7 +12,6 @@
       background-color="#304156"
       text-color="#bfcbd9"
       active-text-color="#409EFF"
-
     >
       <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
     </el-menu>

src/views/layout/components/TagsView.vue

@@ -124,7 +124,7 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
     position: fixed;
-    // z-index: 2052;
+    z-index: 2004;
     top: 60px;
     .tags-view-item {
       display: inline-block;

src/xt_pages/data/druguse.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
   </div>
   <div class="tab-container">
     <el-tabs >
@@ -88,13 +88,15 @@
               :model="templateForm"
               label-width="90px"
             >
-              <el-form-item label="医嘱名称 :" required prop="advice_name">
-                <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
-              </el-form-item>
+              <el-row>
+               <el-col :span="12">
+                  <el-form-item label="医嘱名称 :" required prop="advice_name">
+                    <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
+                  </el-form-item>
+               </el-col> 
               <!-- <el-form-item label="医嘱内容 :" prop="advice_desc">
                 <el-input v-model="templateForm.advice_desc" style="width:50%"></el-input>
               </el-form-item> -->
-              <el-row>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
                     <el-col :span="8">
@@ -119,6 +121,8 @@
                     </el-col>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
                     <el-col :span="8">
@@ -143,8 +147,6 @@
                     </el-col>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
                 <el-col :span="12">
                   <el-form-item label="给药途径 :" prop="delivery_way">
                     <el-select
@@ -164,6 +166,8 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>  
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -427,6 +431,10 @@ export default {
   components: {BreadCrumb},
   data() {
     return {
+      crumbs: [
+        { path: false, name: '数据字典' },
+        { path: '/patients/patients', name: '字段配置' },
+      ],
       currentIndex: -1,
       isEdit: false,
       dialogTitle: "",

src/xt_pages/data/druguseTemplate.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
   </div>
   <div class="app-container">
     <el-tabs >
@@ -151,9 +151,9 @@
                     type="danger"
                     icon="el-icon-delete"
                     @click="handleDeleteAdviceTemplate(scope.row, scope.$index)"
-                  > 
+                  >
                   </el-button>
-                </el-tooltip> 
+                </el-tooltip>
               </template>
             </el-table-column>
 
@@ -234,13 +234,12 @@
 
               <el-row>
                 <el-col :span="12">
-                  <el-form-item :label="advice_content_name" required prop="advice_name">
+                  <el-form-item label="医嘱内容 :" required prop="advice_name">
                     <el-input v-model="templateForm.advice_name"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-
-                  <el-form-item label="规格" prop="advice_desc">
+                  <el-form-item label="规格 :" required prop="advice_desc">
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
 
@@ -270,10 +269,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.single_dose_unit"
@@ -294,10 +293,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.prescribing_number_unit"
@@ -324,7 +323,7 @@
                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
@@ -335,9 +334,6 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
                 <el-col :span="12" v-if="!isAddChild">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -346,7 +342,7 @@
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"
@@ -386,7 +382,7 @@
                     <el-col :span="8">
                       <el-input v-model="templateFormEdit.drug_spec"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.drug_spec_unit"
@@ -407,10 +403,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateFormEdit.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.single_dose_unit"
@@ -431,10 +427,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateFormEdit.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.prescribing_number_unit"
@@ -472,9 +468,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
+             
                 <el-col :span="12" v-if="templateFormEdit.parent_id == 0">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -569,20 +563,21 @@
               :model="templateForm"
               label-width="90px"
             >
-              <el-form-item label="医嘱内容 :" required prop="advice_name">
-                <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
-              </el-form-item>
-
               <el-row>
+                <el-col :span="12">
+                  <el-form-item label="医嘱内容 :" required prop="advice_name">
+                    <el-input v-model="templateForm.advice_name" ></el-input> 
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="规格 :" required prop="advice_desc">
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label="药品规格 :" prop="drug_spec">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.drug_spec"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.drug_spec_unit"
@@ -603,10 +598,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.single_dose_unit"
@@ -627,10 +622,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.prescribing_number_unit"
@@ -657,7 +652,7 @@
                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
@@ -668,9 +663,6 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -679,7 +671,7 @@
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"
@@ -1018,6 +1010,10 @@
     components: {BreadCrumb},
     data() {
       return {
+        crumbs: [
+          { path: false, name: '数据字典' },
+          { path: 'data/druguse', name: '医嘱模版' },
+        ],
         rowIndex: -1,
         current_template_id: 0,
         currentObject: {},

src/xt_pages/data/index.vue

@@ -1,7 +1,8 @@
 <template>
 <div class="main-contain">
   <div class="position">
-     <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
+
   </div>
   <div class="app-container">
     <el-tabs  v-model="activeName" >
@@ -28,6 +29,10 @@ export default {
   components: { tabPane,tableson,BreadCrumb},
   data() {
     return {
+      crumbs: [
+        { path: false, name: '数据字典' },
+        { path: 'data/dictionary', name: '字段配置' },
+      ],
       tabMapOptions: [
         { label: this.$t("data_config.patient"), key: 'patient' },
         { label: this.$t("data_config.hemodialysis"), key: 'hemodialysis' },

src/xt_pages/data/template.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
   </div>
   <div class="app-container">
     <el-tabs v-model="activeName" >
@@ -26,6 +26,10 @@ export default {
   components: { tabPane,BreadCrumb},
   data() {
     return {
+      crumbs: [
+        { path: false, name: '数据字典' },
+        { path: 'data/template', name: '模版配置' },
+      ],
       tabMapOptions: [
         { label: this.$t("data_config.education"), key: 'education' },
         { label: this.$t("data_config.summary"), key: 'summary' },

src/xt_pages/device/group_main.vue

@@ -1,8 +1,9 @@
 <template>
 <div class="main-contain">
     <div class="position">
-        <bread-crumb></bread-crumb>
-        <el-button size="small" icon="el-icon-circle-plus-outline" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="addGroupAction">新增</el-button>
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+
+      <el-button size="small" icon="el-icon-circle-plus-outline" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="addGroupAction">新增</el-button>
     </div>
     <div class="app-container" v-loading="loading">
         <el-row>
@@ -17,7 +18,7 @@
                            <el-tooltip class="item" effect="dark" content="删除" placement="top">
                             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="small" @click="deleteGroupAt(scope.row)"></el-button>
                            </el-tooltip>
-                        </template>  
+                        </template>
                     </el-table-column>
                 </el-table>
             </el-col>
@@ -51,6 +52,10 @@ export default {
     name: "DeviceGroupMain",
     data() {
         return {
+          crumbs: [
+            { path: false, name: '设备管理' },
+            { path: '/device/groups', name: '分组管理' },
+          ],
             loading: false,
             groups: [],
             group_form:{
@@ -62,7 +67,7 @@ export default {
         }
     },
     components:{
-      BreadCrumb 
+      BreadCrumb
     },
     created() {
         this.loading = true
@@ -106,7 +111,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyGroup(this.group_form.id, this.group_form.name).then(rs => {
                             var resp = rs.data
@@ -125,7 +130,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }
@@ -143,7 +148,7 @@ export default {
                         if (index > -1) {
                             this.groups.splice(index, 1)
                         }
-                        
+
                     } else {
                         this.$message.error(resp.msg)
                     }

src/xt_pages/device/main.vue

@@ -1,7 +1,8 @@
 <template>
 <div class="main-contain">
      <div class="position">
-         <bread-crumb></bread-crumb>
+       <bread-crumb :crumbs='crumbs'></bread-crumb>
+
      </div>
     <div class="app-container">
         <el-row :gutter="15">
@@ -32,6 +33,10 @@ export default {
     },
     data() {
         return {
+          crumbs: [
+            { path: false, name: '设备管理' },
+            { path: '/device/main', name: '透析机管理' },
+          ],
             zones: [],
             groups: [],
             device_numbers: [],
@@ -45,7 +50,7 @@ export default {
                 this.zones.push(...resp.data.zones)
                 this.groups.push(...resp.data.groups)
                 this.device_numbers.push(...resp.data.numbers)
-                
+
             } else {
                 this.$message.error(resp.msg)
             }
@@ -58,7 +63,7 @@ export default {
             } else {
                 this.$refs.device_detail.set_device(0, 1)
             }
-            
+
         },
         did_update_device: function(device) {
             this.$refs.device_list.update_device(device)

src/xt_pages/device/number_main.vue

@@ -1,7 +1,8 @@
 <template>
 <div class="main-contain">
     <div class="position">
-        <bread-crumb></bread-crumb>
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+
         <el-button size="small" icon="el-icon-circle-plus-outline" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="addDeviceNumberAction">新增</el-button>
     </div>
     <div class="app-container" v-loading="loading">
@@ -11,15 +12,15 @@
                     <el-table-column prop="number" label="床位号" align="center"> </el-table-column>
                     <el-table-column prop="zone_name" label="所属分区" align="center"></el-table-column>
                     <el-table-column prop="group_name" label="所属分组" align="center"></el-table-column>
-                    <el-table-column label="操作" align="center"> 
+                    <el-table-column label="操作" align="center">
                         <template slot-scope="scope">
                            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="small" @click="modifyDeviceNumberAt(scope.row)"></el-button>
                            </el-tooltip>
-                           <el-tooltip class="item" effect="dark" content="删除" placement="top">                           
+                           <el-tooltip class="item" effect="dark" content="删除" placement="top">
                             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="small" @click="deleteDeviceNumberAt(scope.row)"></el-button>
-                           </el-tooltip>                           
-                        </template>  
+                           </el-tooltip>
+                        </template>
                     </el-table-column>
                 </el-table>
             </el-col>
@@ -62,6 +63,10 @@ export default {
     name: "DeviceNumberMain",
     data() {
         return {
+          crumbs: [
+            { path: false, name: '设备管理' },
+            { path: '/device/numbers', name: '床位管理' },
+          ],
             loading: false,
             number_form:{
                 id: 0,
@@ -89,7 +94,7 @@ export default {
                 this.zones.push(...resp.data.zones)
                 this.groups.push(...resp.data.groups)
                 this.device_numbers.push(...resp.data.numbers)
-                
+
             } else {
                 this.$message.error(resp.msg)
             }
@@ -129,7 +134,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyDeviceNumber(this.number_form.id, this.number_form.number, this.number_form.zone, this.number_form.group).then(rs => {
                             var resp = rs.data
@@ -153,7 +158,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }
@@ -171,7 +176,7 @@ export default {
                         if (index > -1) {
                             this.device_numbers.splice(index, 1)
                         }
-                        
+
                     } else {
                         this.$message.error(resp.msg)
                     }

src/xt_pages/device/zone_main.vue

@@ -1,8 +1,9 @@
 <template>
 <div class="main-contain">
     <div class="position">
-        <bread-crumb></bread-crumb>
-        <el-button size="small" icon="el-icon-circle-plus-outline" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="addZoneAction">新增</el-button>     
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+
+        <el-button size="small" icon="el-icon-circle-plus-outline" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="addZoneAction">新增</el-button>
     </div>
     <div class="app-container" v-loading="loading">
         <el-row>
@@ -14,15 +15,15 @@
                             <span>{{ getZoneTypeLabel(scope.row.type) }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" align="center"> 
+                    <el-table-column label="操作" align="center">
                         <template slot-scope="scope">
                           <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="small" @click="modifyZoneAt(scope.row)"></el-button>
-                          </el-tooltip>  
-                          <el-tooltip class="item" effect="dark" content="删除" placement="top">                          
+                          </el-tooltip>
+                          <el-tooltip class="item" effect="dark" content="删除" placement="top">
                             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="small" @click="deleteZoneAt(scope.row)"></el-button>
-                          </el-tooltip>  
-                        </template>  
+                          </el-tooltip>
+                        </template>
                     </el-table-column>
                 </el-table>
             </el-col>
@@ -61,6 +62,10 @@ export default {
     name: "DeviceZoneMain",
     data() {
         return {
+          crumbs: [
+            { path: false, name: '设备管理' },
+            { path: '/device/zones', name: '分区管理' },
+          ],
             loading: false,
             zones: [],
             zone_form:{
@@ -137,7 +142,7 @@ export default {
                                 this.$message.error(resp.msg)
                             }
                         })
-                        
+
                     } else {
                         modifyZone(this.zone_form.id, this.zone_form.name, this.zone_form.type).then(rs => {
                             var resp = rs.data
@@ -157,7 +162,7 @@ export default {
                             }
                         })
                     }
-                    
+
                 } else {
                     return false
                 }
@@ -175,7 +180,7 @@ export default {
                         if (index > -1) {
                             this.zones.splice(index, 1)
                         }
-                        
+
                     } else {
                         this.$message.error(resp.msg)
                     }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1,10 +1,11 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
+
   </div>
   <div class="app-container">
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title"><span class="name">{{ search_mode == 1 ? "日期查询" : "病人查询" }}</span> : </label>
       <el-date-picker v-show="search_mode == 1" v-model="time" prefix-icon="el-icon-date" @change="changeTime" :editable="false"
                       style="width: 250px;" type="date" placeholder="选择日期时间" align="right"
@@ -49,7 +50,7 @@
         align="center"
        >
       </el-table-column>
-      <el-table-column 
+      <el-table-column
         label="排班日期"
         prop="sch_time"
         align="center"
@@ -139,6 +140,10 @@
     name: "Patient",
     data() {
       return {
+        crumbs: [
+          { path: false, name: '透析管理' },
+          { path: '/dialysis/watch', name: '透析监测' },
+        ],
         loading: false,
         time: '',
 
@@ -278,7 +283,7 @@
       // },
       // changeOtherSearch() {
       //   this.getList();
-      // }, 
+      // },
       getAllZone: function () {
         GetAllZone().then(response => {
           if (response.data.state == 0) {
@@ -289,7 +294,7 @@
             this.partitionArr.unshift({"id": 0, "name": '全部'})
           }
         });
-      }, 
+      },
       getSchedualPatientList: function () {
         this.loading = true
         if (this.search_mode == 1) {
@@ -352,7 +357,7 @@
         }else{
           return ''
         }
-      }, 
+      },
       handleCurrentChange(val) {
         this.listQuery.page = val;
         this.getSchedualPatientList();
@@ -373,7 +378,7 @@
         this.getSchedualPatientList()
       },
 
-     
+
     }
   }
 </script>
@@ -418,7 +423,7 @@
         cursor: pointer;
       }
     }
-    
+
     .amount {
       font-weight: normal;
       padding: 10px 0 0 0;

src/xt_pages/dialysis/bulletinBoard.vue

@@ -1,26 +1,42 @@
 <template>
-    <div class="app-container" id="dialysis-board-box" >
-        <el-row>
-            <el-button type="primary" @click="fullscreenboard"> 全屏投影</el-button>
-        </el-row>
-        <bulletinboard></bulletinboard>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
+    <div class="app-container" id="dialysis-board-box">
+      <el-row>
+        <el-button type="primary" @click="fullscreenboard"> 全屏投影</el-button>
+      </el-row>
+      <bulletinboard></bulletinboard>
+    </div>
+  </div>
+
 </template>
 
 <script>
-import { getBoards } from "@/api/board";
-import bulletinboard from "./components/bulletinboard";
-import { parseTime } from "@/utils";
+  import { getBoards } from '@/api/board'
+  import bulletinboard from './components/bulletinboard'
+  import { parseTime } from '@/utils'
+  import BreadCrumb from '../components/bread-crumb'
 
-export default {
-    components: { bulletinboard },
+  export default {
+    components: { BreadCrumb, bulletinboard },
     name: 'bulletinBoard',
-    
-    methods:{
-        fullscreenboard:function(){
-            let routeData = this.$router.resolve({ path: '/fullscreenboard'});
-            window.open(routeData.href, '_blank');
-        },
+    data(){
+      return{
+        crumbs: [
+          { path: false, name: '透析管理' },
+          { path: 'dialysis/board', name: '数据看板' },
+        ],
+
+      }
+    },
+
+    methods: {
+      fullscreenboard: function() {
+        let routeData = this.$router.resolve({ path: '/fullscreenboard' })
+        window.open(routeData.href, '_blank')
+      }
     }
-}
+  }
 </script>

src/xt_pages/dialysis/dialysisPrepare.vue

@@ -14,7 +14,7 @@
              <el-date-picker v-model="time" type="daterange"  start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
          </el-form-item>
          <el-form-item label-width="0" style="margin:0 0 10px  0;" >
-            <div class="cell">
+            <div class="cell clearfix">
                 <label class="name">排班班次 : </label>
                 <div class="type">
                   <ul>

src/xt_pages/dialysis/doctorAdvice.vue

@@ -13,7 +13,7 @@
              <el-date-picker v-model="time" type="daterange"  start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
          </el-form-item>
          <el-form-item label-width="0" style="margin:0 0 10px  0;" >
-            <div class="cell">
+            <div class="cell clearfix">
                 <label class="name">排班班次 : </label>
                 <div class="type">
                   <ul>
@@ -26,7 +26,7 @@
             </div>
          </el-form-item>
          <el-form-item label-width="0" style="margin:0 0 10px  0;" >
-            <div class="cell">
+            <div class="cell clearfix">
                 <label class="name">医嘱类型 : </label>
                 <div class="type">
                   <ul>
@@ -38,7 +38,7 @@
             </div>
          </el-form-item>
          <el-form-item label-width="0" style="margin:0 0 10px  0;" >
-            <div class="cell">
+            <div class="cell clearfix">
                 <label class="name">显示范围 : </label>
                 <div class="type">
                   <ul>
@@ -50,7 +50,7 @@
             </div>
          </el-form-item>
          <el-form-item label-width="0" style="margin:0 0 10px 0;" >
-            <div class="cell">
+            <div class="cell clearfix">
                 <label class="name">医嘱确认 : </label>
                 <div class="type">
                   <ul>
@@ -62,7 +62,7 @@
             </div>
          </el-form-item>
          <el-form-item label-width="0" style="margin:0 0 10px  0;" >
-            <div class="cell">
+            <div class="cell clearfix">
                 <label class="name">其他 : </label>
                 <div class="collate">
                   <label class="tit">医嘱核对 : </label>

src/xt_pages/dialysis/schedualPatient.vue

@@ -1,15 +1,15 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
   </div>
   <div class="app-container">
-    <div class="cell">
-      <label class="title"><span class="name">病人查询</span> : </label>      
+    <div class="cell clearfix">
+      <label class="title"><span class="name">病人查询</span> : </label>
       <el-input size="small" style="width: 280px;" v-model="search_input" class="filter-item"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
     </div>
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title"><span class="name">日期查询</span> : </label>
       <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
     </div>
@@ -60,6 +60,10 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '透析管理' },
+          { path: 'dialysis/dialysisrecord', name: '透析记录' },
+        ],
         selected_date: new Date(), // this.$store.getters.app.dialysis_area.schedule_date,
         schedule_type_selected: 0, // this.$store.getters.app.dialysis_area.schedule_type_select_index,
         schedule_type_options: [
@@ -318,7 +322,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         cursor: pointer;
       }
     }
-  
+
     .amount {
       font-weight: normal;
       padding: 10px 0 0 0;

src/xt_pages/dialysis/schedualPatient2.vue

@@ -4,7 +4,7 @@
       <el-input style="width: 400px;" v-model="searchKey" class="filter-item"/>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title"><span class="name">日期查询</span> : </label>
       <el-date-picker v-model="time" prefix-icon="el-icon-date" @change="changeTime" :editable="false"
                       style="width: 196px;" type="date" placeholder="选择日期时间" align="right"

src/xt_pages/qcd/dialysisTotal.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container">
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>
@@ -65,7 +65,7 @@
         </div>
       </div>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">透析模式</span> :
         </label>

src/xt_pages/qcd/outcomeIndicators/control.vue

@@ -9,7 +9,7 @@
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
       </el-tabs>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>
@@ -70,7 +70,7 @@
         </div>
       </div>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">检验项目</span> :
         </label>

src/xt_pages/qcd/outcomeIndicators/query.vue

@@ -9,7 +9,7 @@
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
       </el-tabs>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <el-form :inline="true" :model="listQuery" >
           <el-form-item label="">
             <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
@@ -19,7 +19,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>
@@ -50,7 +50,7 @@
         ></el-date-picker>
       </div>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">检验项目</span> :
         </label>

src/xt_pages/qcd/patientAnalysis/bloodPressure.vue

@@ -6,7 +6,7 @@
     <div class="app-container" id="outcome-indicators-query">
       <analysis-nav activeName="bloodpressure"></analysis-nav>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>

src/xt_pages/qcd/patientAnalysis/complication.vue

@@ -6,7 +6,7 @@
     <div class="app-container" id="outcome-indicators-query">
       <analysis-nav activeName="complication"></analysis-nav>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>

src/xt_pages/qcd/patientAnalysis/dialysisAge.vue

@@ -6,7 +6,7 @@
     <div class="app-container" id="outcome-indicators-query">
       <analysis-nav activeName="dialysisage"></analysis-nav>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>

src/xt_pages/qcd/patientAnalysis/lapseto.vue

@@ -6,7 +6,7 @@
     <div class="app-container" id="outcome-indicators-query">
       <analysis-nav activeName="lapseto"></analysis-nav>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>

src/xt_pages/qcd/patientAnalysis/total.vue

@@ -6,7 +6,7 @@
     <div class="app-container" id="outcome-indicators-query">
       <analysis-nav activeName="total"></analysis-nav>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <el-form :inline="true" :model="listQuery" >
           <el-form-item label="">
             <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
@@ -16,7 +16,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>

src/xt_pages/qcd/patientAnalysis/weight.vue

@@ -6,7 +6,7 @@
     <div class="app-container" id="outcome-indicators-query">
       <analysis-nav activeName="weight"></analysis-nav>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>

src/xt_pages/qcd/processIndicators.1.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title">
         <span class="name">日期查询</span> :
       </label>
@@ -63,7 +63,7 @@
       </div>
     </div>
 
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title">
         <span class="name">检验项目</span> :
       </label>

src/xt_pages/qcd/processIndicators.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container">
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
         </label>
@@ -65,7 +65,7 @@
         </div>
       </div>
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title">
           <span class="name">检验项目</span> :
         </label>

src/xt_pages/sign/index.vue

@@ -1,4 +1,9 @@
 <template>
+
+    <div class="main-contain">
+    <div class="position">
+        <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
     <div class="app-container sign-and-weigh-box">
         <el-row :gutter="20">
             <el-col :span="7">
@@ -134,15 +139,22 @@
                 </el-form>
             </el-col>
         </el-row>
-    </div>
+    </div>   
+   </div>
 </template>
 
 <script>
 import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata } from '@/api/signandweigh'
+import BreadCrumb from '../components/bread-crumb'
 export default {
   name: 'sign',
+  components: { BreadCrumb },
   data() {
     return {
+      crumbs: [
+          { path: false, name: '签到称重' },
+          { path: '/sign/index', name: '签到称重' }
+        ],
       patientlist: [],
       signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
       queryParams: {

src/xt_pages/statistics/index.vue

@@ -1,7 +1,8 @@
 <template>
 <div class="main-contain">
     <div class="position">
-        <bread-crumb></bread-crumb>
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+
     </div>
     <div class="app-container" v-loading="pageLoad">
         <el-row :gutter="40" class="panel-group">
@@ -61,7 +62,7 @@
         <line-chart :options="modelLineOpstions" title="透析模式" v-if="modeLineFlag" />
         </el-row>
 
-        
+
         <el-row >
         <el-table
             :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
@@ -112,6 +113,10 @@ export default {
   name: "Statistics",
   data() {
     return {
+      crumbs: [
+        { path: 'statistics', name: '统计分析' },
+
+      ],
         pageLoad:true,
         patientCount:0,
         todayDialysisCount:0,
@@ -236,7 +241,7 @@ export default {
                               item.name = "其他";
                               break;
                       }
-                      
+
                       this.ageOptions.legend.push(item.name);
                       this.ageOptions.series.push({
                           value:item.count,name:item.name
@@ -258,7 +263,7 @@ export default {
 
                   var thisDate = new Date()
                   var thisYear = thisDate.getFullYear()
-             
+
                   for (let index = 1; index <= 12; index++) {
                       var month = index < 10 ? ('0' + index) : ('' + index);
                       this.modelLineOpstions.xAxis.push(thisYear + '-' + month);
@@ -271,7 +276,7 @@ export default {
                       for ( var key in modeCountMap) {
 
                           if(key == this.modelLineOpstions.xAxis[index]) {
-                              
+
                               if (1 in modeCountMap[key]) {
                                 hd = modeCountMap[key][1]["count"];
                               }
@@ -295,13 +300,13 @@ export default {
                             continue;
                           }
                       }
-                      
+
                     this.modelLineOpstions.series["HD"].push(hd);
                     this.modelLineOpstions.series["HDF"].push(hdf);
                     this.modelLineOpstions.series["HD+HP"].push(hdhp);
                     this.modelLineOpstions.series["HP"].push(hp);
                   }
-                  
+
                   this.diseaseFlag = true;
                   this.genderFlag = true;
                   this.ageFlag = true;

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -111,10 +111,14 @@
         })
       },
       cancle: function(formName) {
+        this.goodInfo = []
+        this.goodInfoTableData = []
         this.$emit('dialog-cancle', this.getValue())
         this.$refs.multipleTable.clearSelection()
       },
       comfirm: function(formName) {
+        this.goodInfo = []
+        this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
       },

src/xt_pages/stock/cancelStockOrder.vue

@@ -11,12 +11,12 @@
     <div class="app-container">
 
 
-      <div class="cell" style="margin-top:20px">
+      <div class="cell clearfix" style="margin-top:20px">
         <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-      <div class="cell">
+      <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"
@@ -278,7 +278,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -18,7 +18,7 @@
     <div class="filter-container">
 
 
-        <div class="cell">
+        <div class="cell clearfix">
           <label class="title"><span class="name">退库时间</span> : </label>
 
           <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
@@ -27,7 +27,7 @@
         </div>
         <div class="cell clearfix">
           <label class="title"><span class="name">厂商</span> : </label>
-          <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+          <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
             <el-option
               v-for="(option, index) in manufacturer"
               :key="index"
@@ -344,6 +344,13 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        this.recordInfo.recordData.push(tempObj)
       }
     },
     created() {

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -14,7 +14,7 @@
 
 
 
-    <div class="cell">
+    <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>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -13,7 +13,7 @@
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
 
-      <div class="cell">
+      <div class="cell clearfix">
 
         <label class="title"><span class="name">退库时间</span> : </label>
         <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -10,12 +10,12 @@
 
     <div class="app-container">
 
-      <div class="cell" style="margin-top:20px">
+      <div class="cell clearfix" style="margin-top:20px">
         <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-      <div class="cell">
+      <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;"

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -10,12 +10,12 @@
 
     <div class="app-container">
 
-      <div class="filter-container" style="margin-top:20px">
-        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <div class="cell">
+        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-      <div class="cell">
+      <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;"

src/xt_pages/stock/otherStockInOrder.vue

@@ -9,12 +9,12 @@
 
     <div class="app-container">
 
-      <div class="cell">
+      <div class="cell clearfix">
         <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-      <div class="cell">
+      <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;"

src/xt_pages/stock/otherStockOutOrder.vue

@@ -8,13 +8,12 @@
       </el-button>
     </div>
     <div class="app-container">
-      <div class="cell">
-        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <div class="cell clearfix">
+        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-
-      <div class="cell">
+      <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;"
@@ -119,366 +118,393 @@
 </template>
 
 <script>
-  import { uParseTime } from '@/utils/tools'
-  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
-
-  import { deleteWarehouseOut, GetAllConfig, getWarehouseOutList } from '@/api/stock'
-  import BreadCrumb from '../components/bread-crumb'
-
-  export default {
-    name: 'salesReturnOrder',
-    components: { BreadCrumb },
-    created() {
-      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
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+
+import {
+  deleteWarehouseOut,
+  GetAllConfig,
+  getWarehouseOutList
+} from "@/api/stock";
+import BreadCrumb from "../components/bread-crumb";
+
+export default {
+  name: "salesReturnOrder",
+  components: { BreadCrumb },
+  created() {
+    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.GetWarehouseOut();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/out", name: "其他出库单" }
+      ],
+      page: 1,
+      limit: 7,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      warehouseOutDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: [],
+      type: 2
+    };
+  },
+  methods: {
+    AddNewOrder: function() {
+      this.$router.push({
+        name: "stockOutOrderAdd",
+        query: { type: this.type }
+      });
+    },
+    GetWarehouseOut: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.warehouseOutDate = [];
+      getWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
       }
-      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
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
       }
-      if (parseInt(day) < 10) {
-        day = '0' + day
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
       }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
-      this.GetWarehouseOut()
-      this.GetConfigInfo()
-      this.fetchAllAdminUsers()
-    },
-    data() {
-      return {
-        crumbs: [
-          { path: false, name: '库存管理' },
-          { path: '/stock/out', name: '其他出库单' }
-        ],
-        page: 1,
-        limit: 7,
-        checked: false,
-        total: 0,
-        pageTotal: 0,
-        pageSelect: 0,
-        adminUserOptions: [],
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        warehouseOutDate: [],
-        end_time: '',
-        goodType: [],
-        goodInfo: [],
-        manufacturer: [],
-        selectedTableData: [],
-        dealer: [],
-        type: 2
-
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
       }
+      return name;
     },
-    methods: {
-      AddNewOrder: function() {
-        this.$router.push({ name: 'stockOutOrderAdd', query: { type: this.type } })
-      },
-      GetWarehouseOut: function() {
-        const Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time,
-          type: this.type
-        }
-        this.warehouseOutDate = []
-        getWarehouseOutList(Params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.warehouseOutDate.push(response.data.data.list[i])
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
-        })
-      }, getXuserName(id) {
-        if (id <= 0) {
-          return ''
-        }
-        var name = ''
-        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
-          return name
-        }
-        var leng = this.adminUserOptions.length
-        if (leng == 0) {
-          return name
-        }
-        for (let index = 0; index < leng; index++) {
-          if (this.adminUserOptions[index].id == id) {
-            name = this.adminUserOptions[index].name
-            break
-          }
         }
-        return name
-      }, fetchAllAdminUsers() {
-        fetchAllAdminUsers().then(response => {
-          console.log(response)
-          if (response.data.state == 1) {
-            this.adminUserOptions = response.data.data.users
-            var alen = this.adminUserOptions.length
-            for (let index = 0; index < alen; index++) {
-              if (this.adminUserOptions[index].user_type == 2) {
-                // this.doctorOptions.push(this.adminUserOptions[index]);
-              }
-            }
-          }
-        })
-      }, handleSelectionChange: function(val) {
-        this.multipleSelection = val
-      }, handleSizeChange(val) {
-        this.limit = val
-        this.GetWarehouse()
-      }, handleCurrentChange(val) {
-        this.page = val
-        this.GetWarehouse()
-      }, startTimeChange(val) {
-        this.GetWarehouse()
-      }, endTimeChange(val) {
-        this.GetWarehouse()
-      }, calculate: function(val) {
-        return Math.round(parseFloat(val) * 100) / 100
-      }, GetConfigInfo: function() {
-        GetAllConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.manufacturer = response.data.data.manufacturer
-            this.dealer = response.data.data.dealer
-          }
-        })
-      }, getManufactuerName: function(manufacturer_id) {
-        for (let i = 0; i < this.manufacturer.length; i++) {
-          if (this.manufacturer[i].id == manufacturer_id) {
-            return this.manufacturer[i].manufacturer_name
-          }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetWarehouse();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetWarehouse();
+    },
+    startTimeChange(val) {
+      this.GetWarehouse();
+    },
+    endTimeChange(val) {
+      this.GetWarehouse();
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
         }
-      }, getDealerName: function(dealer_id) {
-        for (let i = 0; i < this.dealer.length; i++) {
-          if (this.dealer[i].id == dealer_id) {
-            return this.dealer[i].dealer_name
-          }
+      });
+    },
+    getManufactuerName: function(manufacturer_id) {
+      for (let i = 0; i < this.manufacturer.length; i++) {
+        if (this.manufacturer[i].id == manufacturer_id) {
+          return this.manufacturer[i].manufacturer_name;
         }
-      }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockOutDetail', query: { id: row.id, type: this.type } })
-      }, handleDelete: function(index, row) {
-        const ids = []
-        ids.push(row.id)
-        const idStr = ids.join(',')
-
-        const params = {
-          ids: idStr
+      }
+    },
+    getDealerName: function(dealer_id) {
+      for (let i = 0; i < this.dealer.length; i++) {
+        if (this.dealer[i].id == dealer_id) {
+          return this.dealer[i].dealer_name;
         }
-
-        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      }
+    },
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "stockOutDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1)
+                    this.warehouseOutDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
-        }).catch(() => {
+          });
         })
-      }, changeAllSelected: function(val) {
-        if (val) {
-          this.$refs.multipleTable.toggleAllSelection()
-        } else {
-          this.$refs.multipleTable.clearSelection()
-        }
-      }, select(selection) {
-        this.selectedTableData = selection
-      }, batchDelete() {
-        if (this.selectedTableData.length <= 0) {
-          this.$message.error('请选择要删除的记录')
-          return
-        }
-        const ids = []
-        for (let i = 0; i < this.selectedTableData.length; i++) {
-          ids.push(this.selectedTableData[i].id)
-        }
-        const idStr = ids.join(',')
-        const params = {
-          ids: idStr
-        }
-        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1)
+                    this.warehouseOutDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
-        }).catch(() => {
+          });
         })
-      }
+        .catch(() => {});
     }
   }
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .app-container {
-
-    font-size: 15px;
-
+.app-container {
+  font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
   }
-
   .search-component {
     width: 500px;
 
-  .searchBox {
-    width: 300px;
-    height: 36px;
-    line-height: 36px;
-    padding-left: 15px;
-    border: 1px #dcdfe6 solid;
-    border-right: none;
-    outline: none;
-    float: left;
-    border-radius: 6px 0 0 6px;
-    font-size: 14px;
-    color: #333;
-    background: #fff;
-    box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
-  }
-
-  .searchBtn {
-    background-color: #409eff;
-    color: #fff;
-    font-size: 15px;
-    text-align: center;
-    height: 36px;
-    line-height: 36px;
-    float: left;
-    outline: none;
-    width: 70px;
-    border: none;
-    border-radius: 0 6px 6px 0;
-    font-family: "Microsoft Yahei";
-    cursor: pointer;
-  }
-
-  }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-
-
-  .time {
-    -webkit-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1;
-
-  ul {
-    padding: 0;
-    margin: 0;
-
-  li {
-    float: left;
-    list-style: none;
-    cursor: pointer;
-    padding: 3px 0;
-    width: 70px;
-    color: #606266;
-    border-radius: 4px;
-    margin: 0 10px 0 0;
-    color: #409eff;
-    border: 1px #409eff solid;
-    text-align: center;
-
-  &
-  :hover {
-    background: #409eff;
-    color: #fff;
-  }
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
 
-  }
-  .active {
-    background: #409eff;
-    color: #fff;
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
   }
 
-  }
-  }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;
     color: #606266;
     font-size: 14px;
 
-  span {
-    color: #ef2525;
-    font-family: "Arial";
-    padding: 0 2px;
-  }
-
-  }
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
   }
+}
 </style>
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/xt_pages/stock/salesReturnEdit.vue

@@ -15,7 +15,7 @@
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
 
-    <div class="cell">
+    <div class="cell clearfix">
             <label class="title"><span class="name">退货时间</span> : </label>
             <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                             type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -217,6 +217,10 @@
               obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
               return cur
             }, [])
+            console.log(this.propForm.goodInfo)
+            console.log(this.propForm.goodType)
+
+
           }
         })
       }, typeName: function(good_type_id) {
@@ -228,6 +232,7 @@
         }
         return name
       }, specificationName: function(good_info_id) {
+
         let name = ''
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].id == good_info_id) {

src/xt_pages/stock/salesReturnOrder.vue

@@ -10,12 +10,12 @@
 
     <div class="app-container">
 
-      <div class="filter-container" >
+      <div class="cell" >
         <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-      <div class="cell">
+      <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"

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -13,7 +13,7 @@
                            :visibility="isVisibility"
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title"><span class="name">退货时间</span> : </label>
         <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -23,7 +23,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
-        <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商">
+        <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -354,6 +354,14 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        tempObj['price'] = ''
+        this.recordInfo.recordData.push(tempObj)
       }
     },
     created() {

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -14,7 +14,7 @@
       </div>
 
 
-      <div class="cell">
+      <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>

src/xt_pages/stock/stockInOrder.vue

@@ -8,12 +8,12 @@
     </div>
 
     <div class="app-container">
-    <div class="filter-container">
+    <div class="cell">
       <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据日期/单据编码/制单人/供应商" />
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
     </div>
 
-      <div class="cell">
+      <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"

src/xt_pages/stock/stockInOrderAdd.vue

@@ -16,14 +16,14 @@
                        v-on:dialog-cancle="cancle"></stock-in-dialog>
 
 
-      <div class="cell">
+      <div class="cell clearfix">
         <label class="title"><span class="name">入库时间</span> : </label>
         <el-date-picker v-model="warehousing_time"  prefix-icon="el-icon-date"  :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
-        <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+        <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -462,6 +462,7 @@
           const params = {
             id: this.form.manufacturer
           }
+          this.propForm.goodType = []
           GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -550,6 +551,21 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['number'] = ''
+        tempObj['product_date'] = ''
+        tempObj['expiry_date'] = ''
+        tempObj['warehousing_count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        tempObj['dealer'] = ''
+        tempObj['manufacturer'] = ''
+        this.recordInfo.recordData.push(tempObj)
+
       }
     },
     created() {

src/xt_pages/stock/stockInOrderDetail.vue

@@ -11,13 +11,13 @@
       </el-row>
     </div>
 
-    <div class="cell">
+    <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>
     </div>
 
-    <div class="cell" style="margin-top: 10px">
+    <div class="cell clearfix" style="margin-top: 10px">
       <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
       <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
     </div>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -17,7 +17,7 @@
 
 
 
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title"><span class="name">入库时间</span> : </label>
       <el-date-picker v-model="warehousing_time"  prefix-icon="el-icon-date"  :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
     </div>
@@ -377,6 +377,7 @@ export default {
           const params = {
             id: this.form.manufacturer
           }
+          this.propForm.goodType = []
           GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

src/xt_pages/stock/stockOutOrder.vue

@@ -6,13 +6,12 @@
       <el-button size="small"  @click="AddNewOrder" class="filter-item" style="float:right;" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
     </div>
     <div class="app-container">
-      <div class="cell">
+      <div class="cell clearfix">
         <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-
-      <div class="cell">
+      <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"
@@ -118,357 +117,394 @@
 </template>
 
 <script>
-  import { uParseTime } from '@/utils/tools'
-  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
-
-  import {
-    deleteWarehouseOut,
-    GetAllConfig,
-    getWarehouseOutList
-  } from '@/api/stock'
-  import BreadCrumb from '../components/bread-crumb'
-
-  export default {
-    name: 'salesReturnOrder',
-    components: { BreadCrumb },
-    created() {
-      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
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+
+import {
+  deleteWarehouseOut,
+  GetAllConfig,
+  getWarehouseOutList
+} from "@/api/stock";
+import BreadCrumb from "../components/bread-crumb";
+
+export default {
+  name: "salesReturnOrder",
+  components: { BreadCrumb },
+  created() {
+    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.GetWarehouseOut();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/out", name: "出库单" }
+      ],
+      page: 1,
+      limit: 7,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      warehouseOutDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: [],
+      type: 1
+    };
+  },
+  methods: {
+    AddNewOrder: function() {
+      this.$router.push({
+        name: "stockOutOrderAdd",
+        query: { type: this.type }
+      });
+    },
+    GetWarehouseOut: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.warehouseOutDate = [];
+      getWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
       }
-      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
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
       }
-      if (parseInt(day) < 10) {
-        day = '0' + day
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
       }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
-      this.GetWarehouseOut()
-      this.GetConfigInfo()
-      this.fetchAllAdminUsers()
-    },
-    data() {
-      return {
-        crumbs: [
-          { path: false, name: '库存管理' },
-          { path: '/stock/out', name: '出库单' }
-        ],
-        page: 1,
-        limit: 7,
-        checked: false,
-        total: 0,
-        pageTotal: 0,
-        pageSelect: 0,
-        adminUserOptions: [],
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        warehouseOutDate: [],
-        end_time: '',
-        goodType: [],
-        goodInfo: [],
-        manufacturer: [],
-        selectedTableData: [],
-        dealer: [],
-        type: 1
-
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
       }
+      return name;
     },
-    methods: {
-      AddNewOrder: function() {
-        this.$router.push({ name: 'stockOutOrderAdd', query: { type: this.type }})
-      },
-      GetWarehouseOut: function() {
-        const Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time,
-          type: this.type
-        }
-        this.warehouseOutDate = []
-        getWarehouseOutList(Params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.warehouseOutDate.push(response.data.data.list[i])
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
-        })
-      }, getXuserName(id) {
-        if (id <= 0) {
-          return ''
-        }
-        var name = ''
-        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
-          return name
-        }
-        var leng = this.adminUserOptions.length
-        if (leng == 0) {
-          return name
-        }
-        for (let index = 0; index < leng; index++) {
-          if (this.adminUserOptions[index].id == id) {
-            name = this.adminUserOptions[index].name
-            break
-          }
         }
-        return name
-      }, fetchAllAdminUsers() {
-        fetchAllAdminUsers().then(response => {
-          console.log(response)
-          if (response.data.state == 1) {
-            this.adminUserOptions = response.data.data.users
-            var alen = this.adminUserOptions.length
-            for (let index = 0; index < alen; index++) {
-              if (this.adminUserOptions[index].user_type == 2) {
-                // this.doctorOptions.push(this.adminUserOptions[index]);
-              }
-            }
-          }
-        })
-      }, handleSelectionChange: function(val) {
-        this.multipleSelection = val
-      }, handleSizeChange(val) {
-        this.limit = val
-        this.GetWarehouse()
-      }, handleCurrentChange(val) {
-        this.page = val
-        this.GetWarehouse()
-      }, startTimeChange(val) {
-        this.GetWarehouse()
-      }, endTimeChange(val) {
-        this.GetWarehouse()
-      }, calculate: function(val) {
-        return Math.round(parseFloat(val) * 100) / 100
-      }, GetConfigInfo: function() {
-        GetAllConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.manufacturer = response.data.data.manufacturer
-            this.dealer = response.data.data.dealer
-          }
-        })
-      }, getManufactuerName: function(manufacturer_id) {
-        for (let i = 0; i < this.manufacturer.length; i++) {
-          if (this.manufacturer[i].id == manufacturer_id) {
-            return this.manufacturer[i].manufacturer_name
-          }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetWarehouse();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetWarehouse();
+    },
+    startTimeChange(val) {
+      this.GetWarehouse();
+    },
+    endTimeChange(val) {
+      this.GetWarehouse();
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
         }
-      }, getDealerName: function(dealer_id) {
-        for (let i = 0; i < this.dealer.length; i++) {
-          if (this.dealer[i].id == dealer_id) {
-            return this.dealer[i].dealer_name
-          }
+      });
+    },
+    getManufactuerName: function(manufacturer_id) {
+      for (let i = 0; i < this.manufacturer.length; i++) {
+        if (this.manufacturer[i].id == manufacturer_id) {
+          return this.manufacturer[i].manufacturer_name;
         }
-      }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockOutDetail', query: { id: row.id, type: this.type }})
-      }, handleDelete: function(index, row) {
-        const ids = []
-        ids.push(row.id)
-        const idStr = ids.join(',')
-
-        const params = {
-          ids: idStr
+      }
+    },
+    getDealerName: function(dealer_id) {
+      for (let i = 0; i < this.dealer.length; i++) {
+        if (this.dealer[i].id == dealer_id) {
+          return this.dealer[i].dealer_name;
         }
-
-        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      }
+    },
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "stockOutDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1)
+                    this.warehouseOutDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
-        }).catch(() => {
+          });
         })
-      }, changeAllSelected: function(val) {
-        if (val) {
-          this.$refs.multipleTable.toggleAllSelection()
-        } else {
-          this.$refs.multipleTable.clearSelection()
-        }
-      }, select(selection) {
-        this.selectedTableData = selection
-      }, batchDelete() {
-        if (this.selectedTableData.length <= 0) {
-          this.$message.error('请选择要删除的记录')
-          return
-        }
-        const ids = []
-        for (let i = 0; i < this.selectedTableData.length; i++) {
-          ids.push(this.selectedTableData[i].id)
-        }
-        const idStr = ids.join(',')
-        const params = {
-          ids: idStr
-        }
-        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1)
+                    this.warehouseOutDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
-        }).catch(() => {
+          });
         })
-      }
+        .catch(() => {});
     }
   }
+};
 </script>
 
+<<<<<<< .mine
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .app-container {
+.app-container {
   // margin: 20px;
-    font-size: 15px;
+  font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
   }
   .search-component {
     width: 500px;
-  .searchBox {
-    width: 300px;
-    height: 36px;
-    line-height: 36px;
-    padding-left: 15px;
-    border: 1px #dcdfe6 solid;
-    border-right: none;
-    outline: none;
-    float: left;
-    border-radius: 6px 0 0 6px;
-    font-size: 14px;
-    color: #333;
-    background: #fff;
-    box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
-  }
-  .searchBtn {
-    background-color: #409eff;
-    color: #fff;
-    font-size: 15px;
-    text-align: center;
-    height: 36px;
-    line-height: 36px;
-    float: left;
-    outline: none;
-    width: 70px;
-    border: none;
-    border-radius: 0 6px 6px 0;
-    font-family: "Microsoft Yahei";
-    cursor: pointer;
-  }
-  }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-  // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-
-  .time {
-    -webkit-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1;
-  ul {
-    padding: 0;
-    margin: 0;
-  li {
-    float: left;
-    list-style: none;
-    cursor: pointer;
-    padding: 3px 0;
-    width: 70px;
-    color: #606266;
-    border-radius: 4px;
-    margin: 0 10px 0 0;
-    color: #409eff;
-    border: 1px #409eff solid;
-    text-align:center;
-  &:hover {
-     background: #409eff;
-     color: #fff;
-   }
-  }
-  .active {
-    background: #409eff;
-    color: #fff;
-  }
-  }
-  }
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
   }
+
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;
     color: #606266;
     font-size: 14px;
-  span {
-    color: #ef2525;
-    font-family: "Arial";
-    padding: 0 2px;
-  }
-  }
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
   }
+}
 </style>
 
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -16,7 +16,7 @@
                          v-on:dialog-comfirm="comfirm"
                          v-on:dialog-cancle="cancle"></sales-return-dialog>
 
-    <div class="cell">
+    <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
           <el-date-picker v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                           type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -26,7 +26,7 @@
 
     <div class="cell clearfix">
       <label class="title"><span class="name">厂商</span> : </label>
-      <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+      <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
         <el-option
           v-for="(option, index) in manufacturer"
           :key="index"
@@ -380,6 +380,15 @@
             return false
           }
         })
+      },changeManufacturer(){
+        this.recordInfo.recordData = []
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = 0
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        this.recordInfo.recordData.push(tempObj)
       }
     },
     created() {

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -14,7 +14,7 @@
       </div>
 
 
-      <div class="cell">
+      <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>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -15,7 +15,7 @@
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
 
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title"><span class="name">出库时间</span> : </label>
       <el-date-picker v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                             type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"

src/xt_pages/user/components/PatientDetail.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container ">
     <el-form ref="form" :rules="rules" :model="form" label-width="134px" class="clearfix" id="patient-info" >
-    <div style="float:right;z-index:999;position: absolute;right: 0;">
-      <el-button type="primary" @click="printCard()" style="margin:0 6px 6px 0;z-index:1;">打印签到卡</el-button>
-      <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="margin:0 0 6px 0;z-index:1;">修改</el-button>
-      <el-button type="primary" @click="printThisInfo()" style="margin:0 6px 6px 0;z-index:1;">打印</el-button>
+    <div style="float:right;z-index:8;position: absolute;right: 30px;">
+      <el-button size="small" type="primary" @click="printCard()" style="margin:0 6px 6px 0;z-index:1;">打印签到卡</el-button>
+      <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="margin:0 0 6px 0;z-index:1;">修改</el-button>
+      <el-button size="small" type="primary" @click="printThisInfo()" style="margin:0 6px 6px 0;z-index:1;">打印</el-button>
     </div>
       <div class="dataTitle">一般资料</div>
       <el-row >
@@ -21,7 +21,7 @@
                   <el-input v-model="form.name" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" style="height:59px;">
                 <el-form-item label="性别 : " class="is-required" prop="gender" >
                   <el-radio-group v-model="form.gender">
                     <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value" :value="item.value" disabled>{{item.label}}</el-radio>
@@ -54,13 +54,20 @@
                 <el-input v-model="form.homeTelephone" maxlength="20" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" style="height:59px;">
               <el-form-item label="患者来源 : " class="is-required" prop="source" >
                 <el-radio-group v-model="form.source">
                   <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" disabled>{{item.label}}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="8" style="height:59px;"> 
+              <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto"  >
+                <el-radio-group v-model="form.lapseto">
+                  <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" disabled>{{item.label}}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="民族 : " prop="nation">
                 <el-input v-model="form.nation" maxlength="30" disabled></el-input>
@@ -71,7 +78,7 @@
                 <el-input v-model="form.native_place" maxlength="30" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="8">
               <el-form-item label="家庭住址 : " prop="homeAddress">
                 <el-input v-model="form.homeAddress" disabled></el-input>
               </el-form-item>
@@ -96,10 +103,10 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="子女情况 : " style="width:80%;float:left;"  prop="children">
+                <el-form-item label="子女情况 : " style="width:90%;float:left;"  prop="children">
                   <el-input maxlength="5" v-model="form.children" disabled></el-input>
                 </el-form-item>
-                <el-form-item label="孩 " style="width:20%;float:left;" label-width="50px">
+                <el-form-item label="孩 " style="float:left;" label-width="30px" >
                 </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -143,18 +150,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="8">
               <el-form-item label="工作单位 : " prop="work">
                 <el-input v-model="form.work" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="20" >
+            <el-col :span="8" >
               <el-form-item label="单位地址 : " prop="unit_address">
                 <el-input v-model="form.unit_address" disabled></el-input>
               </el-form-item>
             </el-col>
             </div>
-            <el-col :span="24">
+            <el-col :span="8">
               <el-form-item>
                 <el-button type="text" @click="generic_info_fold = !generic_info_fold">{{ generic_info_fold ? "更多资料" : "收起" }}<i class="el-icon--right" :class="generic_fold_icon"></i></el-button>
               </el-form-item>
@@ -228,13 +235,7 @@
             </el-checkbox-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
-            <el-radio-group v-model="form.lapseto">
-              <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" disabled>{{item.label}}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
+       
         <el-col :span="24">
           <el-form-item label="诊断 : " prop="diagnose">
             <!-- <textarea v-model="form.diagnose" class="textarea" disabled></textarea> -->
@@ -1061,6 +1062,7 @@ export default {
     },
 
     qrcode(patientID, name, gender, idCardNo, dialysisNo, phone, healthCareNo) {
+      document.getElementById("qrcode").innerHTML = "";
       new QRCode('qrcode', {
         width: 200,
         height: 200,
@@ -1079,25 +1081,25 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.dataTitle {
-  color: #409eff;
-  font-size: 16px;
-  border-bottom: 1px #409eff solid;
-  height: 36px;
-  line-height: 30px;
-  margin: 0 0 15px 0;
-  // position: relative;
-  padding: 0 0 6px 15px;
-  &::before {
-    position: absolute;
-    left: 0;
-    bottom: 10px;
-    content: "";
-    width: 2px;
-    height: 20px;
-    background: #409eff;
-  }
-}
+// .dataTitle {
+//   color: #409eff;
+//   font-size: 16px;
+//   border-bottom: 1px #409eff solid;
+//   height: 36px;
+//   line-height: 30px;
+//   margin: 0 0 15px 0;
+//   // position: relative;
+//   padding: 0 0 6px 15px;
+//   &::before {
+//     position: absolute;
+//     left: 0;
+//     bottom: 10px;
+//     content: "";
+//     width: 2px;
+//     height: 20px;
+//     background: #409eff;
+//   }
+// }
 .uploadHead {
   margin-top: 25%;
 }
@@ -1111,7 +1113,7 @@ export default {
     width: 360px;
   }
   .el-form-item {
-    margin-bottom: 17px !important;
+    // margin-bottom: 17px !important;
     .el-select {
       width: 100%;
     }

src/xt_pages/user/components/PatientForm.vue

@@ -1,9 +1,10 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs="crumbs"></bread-crumb>
+
     <div class="" style="float:right;">
-       <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>       
+       <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
        <el-button v-if="this.isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
@@ -25,7 +26,7 @@
                   <el-input v-model="form.idCardNo" @blur="checkIdCardNo" ></el-input>
               </el-form-item>
             </el-col>
-            
+
             <template v-if="this.isEdit">
               <!-- <el-col  :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="患者类型 : " class="is-required" >
@@ -36,8 +37,8 @@
               </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: 1%;" ></el-input> 
-                    <el-button style="width:70px;padding:10px 0;" disabled type="primary">自动生成</el-button>
+                    <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>
             </template>
@@ -49,25 +50,31 @@
                   </el-select>
                 </el-form-item>
               </el-col> -->
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
+                <el-form-item label="性别 : " class="is-required" prop="gender" >
+                  <el-radio-group v-model="form.gender" @change="changeGender">
+                    <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </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: 1%;" ></el-input> 
+<<<<<<< .mine
+                    <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-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 1%;" ></el-input>
                     <el-button style="width:70px;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
+>>>>>>> .theirs
                 </el-form-item>
               </el-col>
             </template>
-            <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="性别 : " class="is-required" prop="gender" >
-                  <el-radio-group v-model="form.gender" @change="changeGender">
-                    <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-            </el-col>
+            
             <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>
               </el-form-item>
-            </el-col> 
+            </el-col>
             <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="本人电话 : " class="is-required" prop="phone">
                 <el-input v-model="form.phone" maxlength="20"></el-input>
@@ -78,19 +85,27 @@
                 <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" :style="isEdit?'width:360px':''">
+            <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
               <el-form-item label="患者来源 : " class="is-required" prop="source" >
                 <el-radio-group v-model="form.source">
                   <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+              <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
+                <el-radio-group v-model="form.lapseto">
+                  <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
+                  <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-col>
             <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="民族 : " prop="nation">
                 <el-input v-model="form.nation" maxlength="30"></el-input>
               </el-form-item>
             </el-col>
-            
+
             <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="籍贯 : " prop="native_place">
                 <el-input v-model="form.native_place" maxlength="30"></el-input>
@@ -111,7 +126,7 @@
             </el-col>
             <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="身高(cm) : "  prop="height">
-                  <el-input maxlength="5" v-model="form.height" @change="checkHeight"></el-input>              
+                  <el-input maxlength="5" v-model="form.height" @change="checkHeight"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8" :style="isEdit?'width:360px':''">
@@ -123,7 +138,7 @@
             </el-col>
             <el-col :span="8" style="clearfix" :style="isEdit?'width:360px':''">
                 <el-form-item label="子女情况 : " style="width:90%;float:left;"  prop="children">
-                  <el-input maxlength="5" v-model="form.children" ></el-input>              
+                  <el-input maxlength="5" v-model="form.children" ></el-input>
                 </el-form-item>
                 <el-form-item label="孩 " style="float:left;" label-width="30px">
                 </el-form-item>
@@ -142,7 +157,7 @@
             </el-col>
             <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="医保号 : " prop="healthCareNo">
-                  <el-input v-model="form.healthCareNo" ></el-input>              
+                  <el-input v-model="form.healthCareNo" ></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8" :style="isEdit?'width:360px':''">
@@ -205,7 +220,7 @@
           <el-dialog :visible.sync="dialogVisible">
             <img width="100%" :src="dialogImageUrl" alt="">
           </el-dialog>
-          <el-upload 
+          <el-upload
           :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
             :data="uploadData"
             :multiple="false"
@@ -221,7 +236,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
 
       <div class="dataTitle">治疗信息</div>
       <el-row :span="24">
@@ -269,7 +284,7 @@
           </el-form-item>
         </el-col>
         <el-col>
-          
+
         </el-col>
         <el-col :span="24">
           <el-form-item label="" prop="remark">
@@ -282,7 +297,7 @@
               <el-checkbox v-for="item in contagionList" v-if="item.type==2" :label="item.id" :key="item.id" :value="item.id">{{item.name}}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-        </el-col> 
+        </el-col>
         <el-col :span="24" >
           <el-form-item label="慢性病 : " prop="diseases">
             <el-checkbox-group  v-model="form.diseases" >
@@ -290,14 +305,7 @@
             </el-checkbox-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24" :style="isEdit?'width:360px':''">
-          <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
-            <el-radio-group v-model="form.lapseto">
-              <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
-              <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-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>
@@ -328,7 +336,7 @@
               <el-checkbox v-for="item in predialysisConditionOptions"  :label="item.label" :key="item.value" :value="item.label">{{item.label}}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-        </el-col> 
+        </el-col>
         <el-col :span="6" :style="isEdit?'width:360px':''">
           <el-form-item label="本院前透析频率 : " prop="pre_hospital_dialysis_frequency">
             <el-input v-model="form.pre_hospital_dialysis_frequency"></el-input>
@@ -359,14 +367,14 @@
 
         <el-col :span="24" align="center">
           <el-form-item>
-            
+
           </el-form-item>
         </el-col>
       </el-row>
-      
+
     </el-form>
-  </div>  
-  </div>  
+  </div>
+  </div>
 
 </template>
 
@@ -459,6 +467,7 @@ const defaultForm = {
 export default {
   name: 'patientForm',
   props: {
+
     isEdit: {
       type: Boolean,
       default: false
@@ -485,6 +494,10 @@ export default {
     }
 
     return {
+      crumbs: [
+        { path: false, name: '病人管理' },
+        { path: '/patients/create', name: '新增病人' },
+      ],
       generic_info_fold: true,
       treat_info_fold: true,
 
@@ -987,7 +1000,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 
 .uploadHead {
-  margin-top: 25%;
+  // margin-top: 25%;
 }
 .uploadHeadBtn {
   width: 148px;
@@ -995,7 +1008,7 @@ export default {
 }
 .el-form{
     .el-col-6,.el-col-8{
-    // width: 430px;
+    width: 430px;
     }
   .el-form-item {
     // margin-bottom: 17px !important;

src/xt_pages/user/components/PatientSidebar.vue

@@ -202,7 +202,7 @@
     float: left;
     bottom: 0;
     left: 0;
-    z-index: 1001;
+    /* z-index: 99; */
     overflow: hidden;
   }
 

src/xt_pages/user/patient.vue

@@ -11,7 +11,7 @@
       <input type="text" class="searchBox" placeholder="姓名/首拼/透析号" v-model="searchVal">
       <button class="searchBtn">搜 索</button>
     </div> -->
-    <div class="cell">
+    <div class="cell clearfix">
 	    <label class="title"><span class="name">日期查询</span> : </label>
        <el-date-picker v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions1"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
        <span class="">-</span>

src/xt_pages/user/patients.vue

@@ -1,21 +1,21 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs="crumbs"></bread-crumb>
     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="$router.push({path:'/patients/create'})" class="filter-item" style="float:right;" type="primary" icon="el-icon-circle-plus-outline" size="small">新增</el-button>
   </div>
   <div class="app-container">
-    <div class="cell">
+    <div class="cell clearfix">
       <label class="title"><span class="name">病人搜索</span> : </label>
       <el-input   style="width: 400px;" v-model="searchKey" class="filter-item" placeholder="病人姓名/透析号" size="small"/>
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" size="small" >搜索</el-button>
     </div>
-   
-    <div class="cell">
+
+    <div class="cell clearfix">
       <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker v-model="listQuery.start_time" size="small"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions1"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
+      <el-date-picker clearable v-model="listQuery.start_time" size="small"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
       <span class="">-</span>
-      <el-date-picker v-model="listQuery.end_time" size="small"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions1"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
+      <el-date-picker clearable v-model="listQuery.end_time" size="small"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
     </div>
     <div class="cell clearfix">
       <label class="title"><span class="name">排班班次</span> : </label>
@@ -142,10 +142,10 @@
           <el-tooltip class="item" effect="dark" content="转归" placement="top">
             <el-button type="primary" icon="el-icon-edit" size="small" @click="OpenSetLapseto(scope.row, scope.$index)"></el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="预览" placement="top">          
+          <el-tooltip class="item" effect="dark" content="预览" placement="top">
             <el-button type="danger" icon="el-icon-tickets" size="small" @click="OpenView(scope.row.name,scope.row.dialysis_no,scope.row.id)"></el-button>
           </el-tooltip>
-          
+
         </template>
       </el-table-column>
     </el-table>
@@ -259,6 +259,10 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '病人管理' },
+          { path: '/patients/patients', name: '病人管理' },
+        ],
         lapsetoRules: {
           lapseto_type: [
             { required: true, message: '请选择治疗状态' }
@@ -331,38 +335,6 @@
           }
         ],
         tableData: null,
-        pickerOptions1: {
-          shortcuts: [
-            {
-              text: '今天',
-              onClick(picker) {
-                picker.$emit('pick', new Date())
-              }
-            },
-            {
-              text: '昨天',
-              onClick(picker) {
-                const date = new Date()
-                date.setTime(date.getTime() - 3600 * 1000 * 24)
-                picker.$emit('pick', date)
-              }
-            },
-            {
-              text: '一周前',
-              onClick(picker) {
-                const date = new Date()
-                date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
-                picker.$emit('pick', date)
-              }
-            },
-            {
-              text: '清空',
-              onClick(picker) {
-                picker.$emit('pick')
-              }
-            }
-          ]
-        },
         searchKey: '',
         // value2: '',
         total: 0,

src/xt_pages/user/proeducation.vue

@@ -2,7 +2,7 @@
     <div class="patient-container">
         <patient-sidebar :id="patientID" defaultActive="2-5" v-on:tran-patient="onTranPatient"></patient-sidebar>
         <div class="patient-app-container advice-container app-container">
-            <div class="cell">
+            <div class="cell clearfix">
                 <label class="title"><span class="name">日期查询</span> : </label>
                 <el-date-picker v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
                 <span class="">-</span>

src/xt_pages/workforce/appointment.vue

@@ -1,7 +1,7 @@
 <template>
  <div class="main-contain">
   <div class="position">
-      <bread-crumb></bread-crumb>
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
       <el-col :span="5" style="text-align: right;">
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>
         <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板</el-button>
@@ -26,10 +26,10 @@
         </el-tabs>
       <!-- </el-col>
     </el-row> -->
-    
+
     <table-data :week-time="activeName" :partitions-prop="partitions" :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone" title=""></table-data>
-  </div>   
- </div>   
+  </div>
+ </div>
 </template>
 
 <script>
@@ -41,6 +41,10 @@ export default {
   name: "appointment",
   data() {
     return {
+      crumbs: [
+        { path: false, name: '排班管理' },
+        { path: '/workforce/appointment', name: '排班管理' },
+      ],
       activeName: "thisWeek",
       tabPosition: "top",
       partitions: {},

src/xt_pages/workforce/remind.vue

@@ -1,12 +1,7 @@
 <template>
 <div class="main-contain">
   <div class="position">
-      <el-breadcrumb separator="/" style="float:left;">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item><a href="/">活动管理</a></el-breadcrumb-item>
-        <el-breadcrumb-item>活动列表</el-breadcrumb-item>
-        <el-breadcrumb-item>活动详情</el-breadcrumb-item>
-      </el-breadcrumb>
+     <bread-crumb :crumbs="crumbs"></bread-crumb>
   </div>
   <div class="app-container">
     <el-tabs v-model="activeName">
@@ -14,11 +9,11 @@
             <span slot="label"><i class="el-icon-date"></i> 本周（{{theWeek.thisWeek}}）</span>
         </el-tab-pane>
         <el-tab-pane name="nextWeek">
-            <span slot="label"><i class="el-icon-date"></i> 下周（{{theWeek.nextWeek}}）</span>            
+            <span slot="label"><i class="el-icon-date"></i> 下周（{{theWeek.nextWeek}}）</span>
         </el-tab-pane>
     </el-tabs>
     <table-push v-if="activeName=='pushTime'"></table-push>
-    <table-weeks v-else :week-time="activeName"> </table-weeks>    
+    <table-weeks v-else :week-time="activeName"> </table-weeks>
   </div>
 </div>
 </template>
@@ -27,20 +22,26 @@
 import {getWeekPanels} from '@/api/schedule';
 import tableWeeks from './components/tableWeeks'
 import tablePush from './components/tablePush'
+import BreadCrumb from '../components/bread-crumb'
 export default {
     name:'remind',
      data() {
-      return {   
+      return {
+        crumbs: [
+          { path: false, name: '排班管理' },
+          { path: '/workforce/remind', name: '排班提醒' },
+        ],
         activeName: 'thisWeek',
         theWeek:{thisWeek:0,nextWeek:0,}
       };
     },
     components:{
+      BreadCrumb,
         tableWeeks,
         tablePush
     },
     methods: {
-        
+
       getWeekPanels(){
         getWeekPanels(0).then(response=>{
           if (response.data.state==0) {