Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/router/modules/dialysis.js

@@ -350,6 +350,7 @@ export default {
       is_menu: false,
       noCache: true
     },
+
     {
       path: '/dialysis/print/batch',
       component: () =>

src/router/modules/patient.js

@@ -326,259 +326,259 @@ export default {
     }
   },
 
-  {//评估工具/跌倒评估
-    path: '/patients/patient/:id/Fallassessment',
-    component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'Fallassessment',
-    meta: {
-      title: 'firstDiseasePrint',
-      noCache: true
-    }
-  },
-  {//小儿跌倒风险评估
-    path: '/patients/patient/:id/pediatricFallAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'pediatricFallAssessment',
-    meta: {
-      title: 'pediatricFallAssessment',
-      noCache: true
-    }
-  },
-  {//压疮风险评估
-    path: '/patients/patient/:id/pressuresore',
-    component: () => import('@/xt_pages/user/evaluationtool/pressuresore'),
-    hidden: true,
-    is_menu: false,
-    name: 'pressuresore',
-    meta: {
-      title: 'pressuresore',
-      noCache: true
-    }
-  },
-  {//oh压疮评估
-    path: '/patients/patient/:id/OHpressuresore',
-    component: () => import('@/xt_pages/user/evaluationtool/OHpressuresore'),
-    hidden: true,
-    is_menu: false,
-    name: 'OHpressuresore',
-    meta: {
-      title: 'OHpressuresore',
-      noCache: true
-    }
-  },
-  {//日常生活能力评估
-    path: '/patients/patient/:id/dailyLife',
-    component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),
-    hidden: true,
-    is_menu: false,
-    name: 'dailyLife',
-    meta: {
-      title: 'dailyLife',
-      noCache: true
-    }
-  },
-  {//导管脱落风险评估
-    path: '/patients/patient/:id/Cathetershedding',
-    component: () => import('@/xt_pages/user/evaluationtool/Cathetershedding'),
-    hidden: true,
-    is_menu: false,
-    name: 'Cathetershedding',
-    meta: {
-      title: 'Cathetershedding',
-      noCache: true
-    }
-  },
-  {//RASS及疼痛评估
-    path: '/patients/patient/:id/RassAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/RassAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'RassAssessment',
-    meta: {
-      title: 'RassAssessment',
-      noCache: true
-    }
-  },
-  {//营养状况评估
-    path: '/patients/patient/:id/nourishmentAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/nourishmentAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'nourishmentAssessment',
-    meta: {
-      title: 'nourishmentAssessment',
-      noCache: true
-    }
-  },
-  {//约束告知单
-    path: '/patients/patient/:id/Constraintnotification',
-    component: () => import('@/xt_pages/user/evaluationtool/Constraintnotification'),
-    hidden: true,
-    is_menu: false,
-    name: 'Constraintnotification',
-    meta: {
-      title: 'Constraintnotification',
-      noCache: true
-    }
-  },
-  {//心理评估
-    path: '/patients/patient/:id/mindAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/mindAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'mindAssessment',
-    meta: {
-      title: 'mindAssessment',
-      noCache: true
-    }
-  },
-  {//瘙痒评估
-    path: '/patients/patient/:id/pruritusAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/pruritusAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'pruritusAssessment',
-    meta: {
-      title: 'pruritusAssessment',
-      noCache: true
-    }
-  },
-  {//血液透析患者评估
-    path: '/patients/patient/:id/hemodialysis',
-    component: () => import('@/xt_pages/user/evaluationtool/hemodialysis'),
-    hidden: true,
-    is_menu: false,
-    name: 'hemodialysis',
-    meta: {
-      title: 'hemodialysis',
-      noCache: true
-    }
-  },
-  {//Glasgow昏迷评分量表
-    path: '/patients/patient/:id/Glasgow',
-    component: () => import('@/xt_pages/user/evaluationtool/Glasgow'),
-    hidden: true,
-    is_menu: false,
-    name: 'Glasgow',
-    meta: {
-      title: 'Glasgow',
-      noCache: true
-    }
-  },
-  {//肌力评估表
-    path: '/patients/patient/:id/Muscleforce',
-    component: () => import('@/xt_pages/user/evaluationtool/Muscleforce'),
-    hidden: true,
-    is_menu: false,
-    name: 'Muscleforce',
-    meta: {
-      title: 'Muscleforce',
-      noCache: true
-    }
-  },
-  {//跌倒评估历史评估
-    path: '/patients/tumble_history',
-    component: () => import('@/xt_pages/user/history/tumble_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'tunele_history',
-    meta: {
-      title: 'tunele_history',
-      noCache: true
-    }
-  },
-  {//小儿跌倒评估历史评估
-    path: '/patients/Children_history',
-    component: () => import('@/xt_pages/user/history/Children_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'Children_history',
-    meta: {
-      title: 'Children_history',
-      noCache: true
-    }
-  },
-  {//压疮历史评估
-    path: '/patients/Pressure_history',
-    component: () => import('@/xt_pages/user/history/Pressure_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'Pressure_history',
-    meta: {
-      title: 'Pressure_history',
-      noCache: true
-    }
-  },
-  {//日常历史评估
-    path: '/patients/date_history',
-    component: () => import('@/xt_pages/user/history/date_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'date_history',
-    meta: {
-      title: 'date_history',
-      noCache: true
-    }
-  },
-  {//导管脱落历史评估
-    path: '/patients/daoguan_history',
-    component: () => import('@/xt_pages/user/history/daoguan_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'daoguan_history',
-    meta: {
-      title: 'daoguan_history',
-      noCache: true
-    }
-  },
-  {//RASS历史评估
-    path: '/patients/RASS_history',
-    component: () => import('@/xt_pages/user/history/RASS_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'RASS_history',
-    meta: {
-      title: 'RASS_history',
-      noCache: true
-    }
-  },
-  {//营养历史评估
-    path: '/patients/nourishment_history',
-    component: () => import('@/xt_pages/user/history/nourishment_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'nourishment_history',
-    meta: {
-      title: 'nourishment_history',
-      noCache: true
-    }
-  },
-  {//心理历史评估
-    path: '/patients/mind_history',
-    component: () => import('@/xt_pages/user/history/mind_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'mind_history',
-    meta: {
-      title: 'mind_history',
-      noCache: true
-    }
-  },
-  {//瘙痒历史评估
-    path: '/patients/pruritus_history',
-    component: () => import('@/xt_pages/user/history/pruritus_history'),
-    hidden: true,
-    is_menu: false,
-    name: 'pruritus_history',
-    meta: {
-      title: 'pruritus_history',
-      noCache: true
-    }
-  },
+  // {//评估工具/跌倒评估
+  //   path: '/patients/patient/:id/Fallassessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Fallassessment',
+  //   meta: {
+  //     title: 'firstDiseasePrint',
+  //     noCache: true
+  //   }
+  // },
+  // {//小儿跌倒风险评估
+  //   path: '/patients/patient/:id/pediatricFallAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'pediatricFallAssessment',
+  //   meta: {
+  //     title: 'pediatricFallAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//压疮风险评估
+  //   path: '/patients/patient/:id/pressuresore',
+  //   component: () => import('@/xt_pages/user/evaluationtool/pressuresore'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'pressuresore',
+  //   meta: {
+  //     title: 'pressuresore',
+  //     noCache: true
+  //   }
+  // },
+  // {//oh压疮评估
+  //   path: '/patients/patient/:id/OHpressuresore',
+  //   component: () => import('@/xt_pages/user/evaluationtool/OHpressuresore'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'OHpressuresore',
+  //   meta: {
+  //     title: 'OHpressuresore',
+  //     noCache: true
+  //   }
+  // },
+  // {//日常生活能力评估
+  //   path: '/patients/patient/:id/dailyLife',
+  //   component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'dailyLife',
+  //   meta: {
+  //     title: 'dailyLife',
+  //     noCache: true
+  //   }
+  // },
+  // {//导管脱落风险评估
+  //   path: '/patients/patient/:id/Cathetershedding',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Cathetershedding'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Cathetershedding',
+  //   meta: {
+  //     title: 'Cathetershedding',
+  //     noCache: true
+  //   }
+  // },
+  // {//RASS及疼痛评估
+  //   path: '/patients/patient/:id/RassAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/RassAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'RassAssessment',
+  //   meta: {
+  //     title: 'RassAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//营养状况评估
+  //   path: '/patients/patient/:id/nourishmentAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/nourishmentAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'nourishmentAssessment',
+  //   meta: {
+  //     title: 'nourishmentAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//约束告知单
+  //   path: '/patients/patient/:id/Constraintnotification',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Constraintnotification'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Constraintnotification',
+  //   meta: {
+  //     title: 'Constraintnotification',
+  //     noCache: true
+  //   }
+  // },
+  // {//心理评估
+  //   path: '/patients/patient/:id/mindAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/mindAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'mindAssessment',
+  //   meta: {
+  //     title: 'mindAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//瘙痒评估
+  //   path: '/patients/patient/:id/pruritusAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/pruritusAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'pruritusAssessment',
+  //   meta: {
+  //     title: 'pruritusAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//血液透析患者评估
+  //   path: '/patients/patient/:id/hemodialysis',
+  //   component: () => import('@/xt_pages/user/evaluationtool/hemodialysis'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'hemodialysis',
+  //   meta: {
+  //     title: 'hemodialysis',
+  //     noCache: true
+  //   }
+  // },
+  // {//Glasgow昏迷评分量表
+  //   path: '/patients/patient/:id/Glasgow',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Glasgow'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Glasgow',
+  //   meta: {
+  //     title: 'Glasgow',
+  //     noCache: true
+  //   }
+  // },
+  // {//肌力评估表
+  //   path: '/patients/patient/:id/Muscleforce',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Muscleforce'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Muscleforce',
+  //   meta: {
+  //     title: 'Muscleforce',
+  //     noCache: true
+  //   }
+  // },
+  // {//跌倒评估历史评估
+  //   path: '/patients/tumble_history',
+  //   component: () => import('@/xt_pages/user/history/tumble_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'tunele_history',
+  //   meta: {
+  //     title: 'tunele_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//小儿跌倒评估历史评估
+  //   path: '/patients/Children_history',
+  //   component: () => import('@/xt_pages/user/history/Children_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Children_history',
+  //   meta: {
+  //     title: 'Children_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//压疮历史评估
+  //   path: '/patients/Pressure_history',
+  //   component: () => import('@/xt_pages/user/history/Pressure_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Pressure_history',
+  //   meta: {
+  //     title: 'Pressure_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//日常历史评估
+  //   path: '/patients/date_history',
+  //   component: () => import('@/xt_pages/user/history/date_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'date_history',
+  //   meta: {
+  //     title: 'date_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//导管脱落历史评估
+  //   path: '/patients/daoguan_history',
+  //   component: () => import('@/xt_pages/user/history/daoguan_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'daoguan_history',
+  //   meta: {
+  //     title: 'daoguan_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//RASS历史评估
+  //   path: '/patients/RASS_history',
+  //   component: () => import('@/xt_pages/user/history/RASS_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'RASS_history',
+  //   meta: {
+  //     title: 'RASS_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//营养历史评估
+  //   path: '/patients/nourishment_history',
+  //   component: () => import('@/xt_pages/user/history/nourishment_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'nourishment_history',
+  //   meta: {
+  //     title: 'nourishment_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//心理历史评估
+  //   path: '/patients/mind_history',
+  //   component: () => import('@/xt_pages/user/history/mind_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'mind_history',
+  //   meta: {
+  //     title: 'mind_history',
+  //     noCache: true
+  //   }
+  // },
+  // {//瘙痒历史评估
+  //   path: '/patients/pruritus_history',
+  //   component: () => import('@/xt_pages/user/history/pruritus_history'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'pruritus_history',
+  //   meta: {
+  //     title: 'pruritus_history',
+  //     noCache: true
+  //   }
+  // },
   {//知情同意书
     path: '/patients/patient/:id/Informedconsent',
     component: () => import('@/xt_pages/user/Informed/Informedconsent'),

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -50,7 +50,9 @@
       </li>
       <li>
         <label>透析日期:</label>
+
         <span>{{ dialysis_time }}</span>
+        <!-- <span>{{ dialysis_date }}</span> -->
       </li>
     </ul>
     <div class="middleLine"></div>
@@ -97,7 +99,10 @@ export default {
       default: function() {
         return []
       }
-    }
+    },
+    // dialysis_date:{
+    //   type:String
+    // }
   },
   computed: {
     created_time: function() {
@@ -155,15 +160,15 @@ export default {
       }
     },
 
-
     stepState: function() {
       return parseInt(Math.random() * 1000 + '') % 2 == 1
     }
   },
   created() {
-    // console.log("hh23323233232332233223",this.$store.getters.xt_user.org.id)
+    // this.dialysis_time = parseTime(this.dialysis_date, '{y}-{m}-{d}')
+    // this.dialysis_time = this.dialysis_date ? parseTime(this.dialysis_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
     this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
-  }
+  },
 }
 </script>
 

src/xt_pages/dialysis/details/BasicInforTwo.vue

@@ -0,0 +1,283 @@
+<template>
+  <div>
+    <h2 class="DetailsTit">
+      <span>{{ title }}</span>
+    </h2>
+    <div class="ui-step clearfix">
+      <ul class="ui-step-ul">
+        <li
+          v-for="(step, index) in steps"
+          :key="index"
+          class="ui-step-done"
+          :class="step.finish ? 'ui-step-done' : 'unfinished'"
+        >
+          <div class="ui-step-number"><i /></div>
+          <div class="ui-step-title">{{ step.title }}</div>
+        </li>
+      </ul>
+    </div>
+    <ul class="info clearfix">
+      <li>
+        <label>姓名 : </label>
+        <span>{{ patient.id == 0 ? "" : patient.name }}</span>
+      </li>
+      <li>
+        <label>性别 : </label>
+        <span>{{
+          patient.id == 0 ? "" : patient.gender == 1 ? "男" : "女"
+        }}</span>
+      </li>
+      <li>
+        <label>年龄:</label>
+        <span v-if="getNewAge(patient)>150">{{patient.age}}</span>
+        <span v-if="getNewAge(patient)<150">{{ getNewAge(patient)}}</span>
+      </li>
+      <li>
+        <label>透析号 : </label>
+        <span>{{ patient.dialysis_no }}</span>
+      </li>
+      <li>
+        <label>床位号 : </label>
+        <span>{{ device_number }}</span>
+      </li>
+      <li>
+        <label>来源 : </label>
+        <span>{{ source }}</span>
+      </li>
+      <li>
+        <label>住院号 : </label>
+        <span>{{ patient.admission_number }}</span>
+      </li>
+      <li>
+        <label>透析日期:</label>
+
+        <!-- <span>{{ dialysis_time }}</span> -->
+        <span>{{ dialysis_date }}</span>
+      </li>
+    </ul>
+    <div class="middleLine"></div>
+  </div>
+</template>
+
+<script>
+const moment = require('moment')
+import { parseTime } from '@/utils'
+import { jsGetAge, uParseTime } from '@/utils/tools'
+
+export default {
+  name: 'BasicInfor',
+  data() {
+    return {
+      title: '基本信息',
+      dialysis_time: 0
+      // steps: [
+      //   { title: "透析处方" },
+      //   { title: "接诊评估" },
+      //   { title: "透前评估" },
+      //   { title: "临时医嘱" },
+      //   { title: "透析上机" },
+      //   { title: "双人查对" },
+      //   { title: "透析监测" },
+      //   { title: "透析下机" },
+      //   { title: "透后评估" },
+      //   { title: "治疗小结" }
+      // ]
+    }
+  },
+  props: {
+    patient: {
+      type: Object,
+      default: function() {
+        return { id: 0 }
+      }
+    },
+    device_number: {
+      type: String
+    },
+    steps: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    },
+    dialysis_date:{
+      type:String
+    }
+  },
+  computed: {
+    created_time: function() {
+      if (this.patient.id == 0) {
+        return ''
+      } else {
+        return parseTime(this.patient.created_time, '{y}-{m}-{d}')
+      }
+    },
+    source: function() {
+      return this.patient.source == 1 ? '门诊' : '住院'
+    }
+  },
+  methods: {
+    getAge: function(val) {
+      console.log("val323232323223322332323",val)
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
+        }
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
+      }
+    },
+   tranAge(val) {
+    console.log("val2323233223",val)
+        if(val.birthday){
+          var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
+          return jsGetAge(birth, '-');
+        }
+    },
+    getNewAge(val) {
+      if (val.id_card_no != null && val.id_card_no != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - val.id_card_no.substring(6, 10) - 1
+        if (val.id_card_no.substring(10, 12) < month || val.id_card_no.substring(10, 12) == month && val.id_card_no.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
+
+    stepState: function() {
+      return parseInt(Math.random() * 1000 + '') % 2 == 1
+    }
+  },
+  created() {
+    // this.dialysis_time = parseTime(this.dialysis_date, '{y}-{m}-{d}')
+    // this.dialysis_time = this.dialysis_date ? parseTime(this.dialysis_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+    this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+  },
+}
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+.ui-step {
+  margin: 20px 30px 0 30px;
+  padding: 5px 0 10px 0;
+  zoom: 1;
+  background: #fff;
+  .ui-step-tit {
+    font-size: 18px;
+    text-align: center;
+    color: #34495e;
+    font-weight: 700;
+    height: 50px;
+    line-height: 50px;
+  }
+  .ui-step-ul {
+    list-style: none;
+    .ui-step-done {
+      float: left;
+      position: relative;
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      box-sizing: border-box;
+      text-align: center;
+      width: 10%;
+      &:before,
+      &:after {
+        position: absolute;
+        left: 0;
+        top: 21px;
+        display: block;
+        content: " ";
+        content: " ";
+        width: 50%;
+        height: 1px;
+        background: #409eff;
+        z-index: 1;
+      }
+      &:after {
+        left: 50%;
+      }
+      &:first-child:before,
+      &:last-child::after {
+        width: 0;
+      }
+      .ui-step-title {
+        color: #34495e;
+        font-size: 15px;
+        font-weight: normal;
+        line-height: 18px;
+      }
+      .ui-step-number {
+        position: relative;
+        display: inline-block;
+        width: 22px;
+        height: 22px;
+        margin: 10px 0;
+        line-height: 22px;
+        background: #409eff;
+        color: #fff;
+        border-radius: 100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+        z-index: 2;
+        border: 1px #409eff solid;
+        i {
+          position: absolute;
+          left: 4px;
+          top: 6px;
+          width: 12px;
+          height: 6px;
+          border: 2px #fff solid;
+          color: #fff;
+          z-index: 9;
+          border-top: none;
+          border-right: none;
+          transform: rotate(-45deg);
+          -webkit-transform: rotate(-45deg);
+          -moz-transform: rotate(-45deg);
+          -ms-transform: rotate(-45deg);
+          -o-transform: rotate(-45deg);
+        }
+      }
+    }
+    .unfinished {
+      .ui-step-number {
+        background: #fff;
+        color: #fff;
+        border: 1px $main-color solid;
+        border-radius: 50%;
+      }
+    }
+  }
+}
+.info {
+  padding: 20px 40px;
+  li {
+    float: left;
+    width: 28%;
+    // margin: 0 1rem 0 0;
+    font-size: 15px;
+    height: 35px;
+    line-height: 35px;
+    color: #34495e;
+    margin-left: 60px;
+  }
+  // border: solid red 1px;
+}
+</style>

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

@@ -5,7 +5,8 @@
       title="透后评估"
       :visible.sync="isVisibility"
       width="1010px"
-      :modal-append-to-body="false"
+      :modal = 'false'
+      :close-on-click-modal="false"
     >
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
       <el-form ref="form" :model="form" label-width="160px">
@@ -1196,7 +1197,7 @@ export default {
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
-        
+
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)
@@ -1512,7 +1513,7 @@ export default {
   },
   created() {
     // console.log("this.form", this.form.consciousness);
-    
+
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')

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

@@ -5,7 +5,8 @@
       :visible.sync="isLastOrNextVisible"
       width="1010px"
       @close="resetDialog"
-      :modal-append-to-body="false"
+      :modal = 'false'
+      :close-on-click-modal="false"
     >
 
       <div class="txsj">
@@ -131,7 +132,8 @@
       :visible.sync="isVisibility"
       width="1010px"
       @close="resetDialog"
-      :modal-append-to-body="false"
+      :modal = 'false'
+      :close-on-click-modal="false"
     >
       <div class="txsj">
         <el-button
@@ -565,7 +567,7 @@
       :show-close="isClose"
       :close-on-click-modal="isClose"
       :close-on-press-escape="isClose"
-      :modal-append-to-body="false"
+      ::modal = 'false'
     >
       <el-date-picker
         v-model="execTime"

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

@@ -4,7 +4,9 @@
   <el-dialog
     title="接诊评估"
     class="newDialog"
+    :modal = 'false'
     :modal-append-to-body="false"
+    :close-on-click-modal="false"
     :visible.sync="isVisibility"
     width="854px"
   >
@@ -458,9 +460,9 @@ export default {
     },
     show(accepts) {
       console.log("accepts333333", accepts);
-    
+
       console.log("入库时方式",this.way_arr)
-     
+
       console.log("体委",this.posture_arr)
       if (accepts.id > 0) {
         accepts.tumble = accepts.tumble.toString();

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

@@ -5,7 +5,9 @@
       title="透前评估"
       :visible.sync="isVisibility"
       width="1010px"
+      :modal = 'false'
       :modal-append-to-body="false"
+      :close-on-click-modal="false"
     >
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
       <!--<check-box-dialog-->
@@ -133,7 +135,7 @@
               <el-input type="number" v-model="assessmentBeforeDislysis.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
-<!-- 
+<!--
           <el-col :span="8">
             <el-form-item label="体液过多症状： " v-if="isShow('体液过多症状')">
               <el-select v-model="assessmentBeforeDislysis.humor_excessive_symptom">
@@ -250,7 +252,7 @@
               <el-input v-model="assessmentBeforeDislysis.catheter" @focus="showInnerDialog('4')"></el-input>
             </el-form-item>
           </el-col>
-           
+
 
           <el-col :span="8">
             <el-form-item label="导管维护： " :prop="isName('导管维护')"
@@ -362,7 +364,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="8">
             <el-form-item label="导管AV端约为(cm):" :prop="isName('导管AV端各约')"
               :rules="isCheckmust('导管AV端各约')" v-show="thrombuShow" label-width="150px">
@@ -416,7 +418,7 @@
             </el-form-item>
           </el-col>
 
-        
+
 
           <el-col :span="8">
             <el-form-item label="前次透析后症状：" :prop="isName('前次透析后症状')"
@@ -443,14 +445,14 @@
               <el-input v-model="assessmentBeforeDislysis.emergency_treatment_other"></el-input>
             </el-form-item>
           </el-col>
-            
+
           <el-col :span="8" v-if="isShow('特殊处理情况')">
             <el-form-item label="特殊处理情况:" :prop="isName('特殊处理情况')"
               :rules="isCheckmust('特殊处理情况')">
               <el-input v-model="assessmentBeforeDislysis.special_treatment"></el-input>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="8">
             <el-form-item label="透析期间： " :prop="isName('透析期间')"
               :rules="isCheckmust('透析期间')" v-if="isShow('透析期间')">
@@ -481,7 +483,7 @@
               </div>
             </el-form-item>
           </el-col>
-         
+
           <el-col :span="8">
             <el-form-item label="感染： " :prop="isName('感染')"
               :rules="isCheckmust('感染')" v-if="isShow('感染')">
@@ -573,7 +575,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="8">
             <el-form-item label="预计进食量(g):" :prop="isName('预计进食量')"
               :rules="isCheckmust('预计进食量')" v-if="isShow('预计进食量')">
@@ -588,7 +590,7 @@
             </el-form-item>
           </el-col>
 
-     
+
 
            <el-col :span="8" v-if="isShow('透前尿素')">
             <el-form-item label="透前尿素(mmol/L):" :prop="isName('透前尿素')"
@@ -610,8 +612,8 @@
               <el-input v-model="assessmentBeforeDislysis.his_bed"></el-input>
             </el-form-item>
           </el-col>
-          
-        
+
+
           <el-col :span="8">
             <el-form-item label="抽吸:" :prop="isName('抽吸')"
               :rules="isCheckmust('抽吸')" v-if="isShow('抽吸')">
@@ -621,31 +623,31 @@
 
 
            <el-col :span="8">
-            <el-form-item label="透前净体重:" 
+            <el-form-item label="透前净体重:"
               v-if="this.$store.getters.xt_user.template_info.template_id == 6">
               <el-input v-model="body_weight_before" readonly></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-          
+
             <el-form-item label="导管评估项目: " :prop="isName('导管评估项目')"
               :rules="isCheckmust('导管评估项目')" v-if="isShow('导管评估项目')">
               <el-input v-model="assessmentBeforeDislysis.catheter_evaluation_program" readonly
                         @focus="showInnerDialog('22')"></el-input>
             </el-form-item>
-          
+
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="置管部位皮肤:" :prop="isName('置管部位皮肤')"
               :rules="isCheckmust('置管部位皮肤')" v-if="isShow('置管部位皮肤')">
-           
+
               <el-input v-model="assessmentBeforeDislysis.skin_site_catheterization" readonly
                         @focus="showInnerDialog('23')"></el-input>
             </el-form-item>
           </el-col>
-         
+
           <el-col :span="8">
             <el-form-item label="是否通畅:" :prop="isName('是否通畅')"
               :rules="isCheckmust('是否通畅')" v-if="isShow('是否通畅')">
@@ -656,7 +658,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        
+
           <el-col :span="8">
             <el-form-item label="留置必要:" :prop="isName('留置必要')"
               :rules="isCheckmust('留置必要')" v-if="isShow('留置必要')">
@@ -681,8 +683,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-         
-        
+
+
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24" v-if="isShow('透前症状')">
@@ -713,7 +715,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          
+
            <el-col :span="8">
             <el-form-item label="Ns冲洗量(ml):" :prop="isName('冲洗量')" v-if="isShow('冲洗量')">
               <el-input v-model="assessmentBeforeDislysis.warsh_count"></el-input>
@@ -726,16 +728,16 @@
             </el-form-item>
           </el-col>
 
-              
-            
+
+
               <el-col :span="24">
                 <el-form-item label="备注： " :prop="isName('备注')"
                   :rules="isCheckmust('备注')">
                   <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
                 </el-form-item>
               </el-col>
-            
-          
+
+
             </el-row>
 
 
@@ -826,7 +828,7 @@
                 </span>
              </el-row>
            </el-form>
-         
+
           </span>
           <span slot="footer" class="dialog-footer">
             <el-button @click="infoDialogVisible = false">取 消</el-button>
@@ -1039,13 +1041,13 @@
         type:Array,
         default:()=>{
           return [];
-        } 
+        }
        },
       docList:{
         type:Array,
         default:()=>{
           return [];
-        } 
+        }
        }
 
     },
@@ -1071,7 +1073,7 @@
           ) {
             // console.log(filedList[i],'false')
             if (name == "血管通路"||name == "导管打折"||name == '出血'||name == '血栓'||
-            name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管' 
+            name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管'
             ) {
             return [
               { required: true, message: `请输入${name}` },
@@ -1083,17 +1085,17 @@
             ];
           }
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
-            
+
           }
         }
       },
-      
+
       setLastRecord(lastPredialysisEvaluation, lastDryWeightDislysis) {
         this.lastPredialysisEvaluation = lastPredialysisEvaluation
         this.lastDryWeightDislysis = lastDryWeightDislysis
       },
       isShow(name) {
-        
+
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
@@ -1105,21 +1107,21 @@
       },
 
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation,lastAssessment,record_date) {
-      
+
         let filedList = store.getters.xt_user.fileds;
-       
+
         this.lastPredialysisEvaluation = last_predialysis_evaluation
         console.log("获取上次数据",this.lastPredialysisEvaluation, this.$store.getters.xt_user.org.id )
 
         if(record_date!=null && record_date!=undefined){
            this.record_date = record_date
         }
-       
+
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
         //     console.log("2o2o3232o23o2o3o23")
         //     this.assessmentBeforeDislysis.remark = "患者已确认无发热,无流行病学接触史"
-        // } 
+        // }
          if(this.lastPredialysisEvaluation.thromubus_type == 1){
           this.assessmentBeforeDislysis.thromubus_type = this.lastPredialysisEvaluation.thromubus_type.toString()
            this.thrombuShow = true
@@ -1153,7 +1155,7 @@
           if(this.lastPredialysisEvaluation.period == 2){
              this.lastPredialysisEvaluation.period = "2"
           }
-         
+
         }
 
         this.assessmentBeforeDislysis.pathway_formation_time = moment(new Date()).format('YYYY-MM-DD')
@@ -1165,19 +1167,19 @@
           }else{
             this.assessmentBeforeDislysis.pathway_formation_time = ""
           }
-         
+
           if(assessment.whether_unobstructed >0){
             this.assessmentBeforeDislysis.whether_unobstructed = assessment.whether_unobstructed.toString()
-          } 
+          }
           if(assessment.lien_necessary>0){
             this.assessmentBeforeDislysis.lien_necessary = assessment.lien_necessary.toString()
           }
         }
-      
 
-        
-         
-        
+
+
+
+
 
 
         this.assessment = assessment
@@ -1200,7 +1202,7 @@
 
           if (lastDryWeightDislysis != null) {
             this.weight_adjust.weight = lastDryWeightDislysis.dry_weight
-           
+
             this.$set(
               this.assessmentBeforeDislysis,
               'dry_weight',
@@ -1229,7 +1231,7 @@
               }
             }
           }
-          
+
          //最后一次血管通路
 
          if(this.lastAssessment!=null){
@@ -1257,7 +1259,7 @@
         } else {
           console.log("为首务2322323",this.assessmentBeforeDislysis.period)
           this.assessmentBeforeDislysis.period = this.assessmentBeforeDislysis.period.toString()
-     
+
           // this.assessmentBeforeDislysis.dry_weight = this.predialysis_evaluation['dry_weight']
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']
         }
@@ -1470,7 +1472,7 @@
               this.InnerDialogProps.isShowTextArea = false
 
             break
-         
+
         }
       },
       innerDialogComfirm: function(val) {
@@ -1536,7 +1538,7 @@
            break
           case 'humor_excessive_symptom':
            this.assessmentBeforeDislysis.humor_excessive_symptom = val.value.join(',')
-           break  
+           break
           case 'suction':
            this.assessmentBeforeDislysis.suction = val.value.join(',')
            break
@@ -1549,12 +1551,12 @@
           case 'skin_site_catheterization':
             this.assessmentBeforeDislysis.skin_site_catheterization = val.value.join(',')
             break
-            
+
         }
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
-      }, 
+      },
       handleComfirm(formName) {
         console.log("提交日期",this.record_date)
         var arr = this.assessmentBeforeDislysis
@@ -1590,9 +1592,9 @@
 
          ParamsQuery.whether_unobstructed = parseInt(ParamsQuery.whether_unobstructed)
          ParamsQuery.lien_necessary =  parseInt(ParamsQuery.lien_necessary)
-         
+
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {
-          
+
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             if(response.data.code == 600000008){
@@ -1606,25 +1608,25 @@
               type: 'success',
               duration: 2000
             })
-            
+
             if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id==3877 || this.$store.getters.xt_user.template_info.org_id ==10469){
               this.$parent.getParentMethods()
             }
-            
+
             const assessment_before_dislysis_resp = response.data.data.assessmentBeforeDislysis
-           
+
             var predialysis_evaluation = this.predialysis_evaluation
             for (var index in assessment_before_dislysis_resp) {
               // predialysis_evaluation[index] = assessment_before_dislysis_resp[index];
               this.$set(predialysis_evaluation, index, assessment_before_dislysis_resp[index])
             }
-             
-           
+
+
             let orgId = parseInt(sessionStorage.getItem("org_id"));
             axios.get('/api/index/patientsign/'+ orgId + '/'+ this.patient.id).then((res) => {
               console.log('res',res.data)
 
-            }) 
+            })
             this.hide()
             console.log("hhh23h3h223h23h23h23h2h3")
           }
@@ -1633,13 +1635,13 @@
             return false;
           }
         });
-        
-        
-        
+
+
+
       },
        handleCancle: function() {
         this.isVisibility = false
-      }, 
+      },
       showDryWeightDialog: function() {
         if (this.$store.getters.xt_user.user.user_type == 3) {
           this.$message.error('您没有权限调整干体重')
@@ -1683,7 +1685,7 @@
         }).then(res => {
           // console.log(res)
           // console.log('透前', this.patient_prop)
-          
+
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {
@@ -1733,7 +1735,7 @@
         }
         return user_name
       },
-    
+
       saveInformation(){
         var params = {
           selected_date:this.selected_date,
@@ -1758,11 +1760,11 @@
         }
      },
      dialysisSummarySelectChange: function (values) {
-   
+
       if (this.assessmentBeforeDislysis.befor_symptoms == "") {
         this.assessmentBeforeDislysis.befor_symptoms = values;
       } else {
-       
+
         if (this.assessmentBeforeDislysis.befor_symptoms.indexOf(values) == -1) {
           if (
             this.assessmentBeforeDislysis.befor_symptoms
@@ -1780,10 +1782,10 @@
         }
       }
     },
-      
+
     },
     created() {
-      
+
       this.last_dialysis_after = getDataConfig('hemodialysis', 'last_dialysis_after')
       this.dialysis_interphase = getDataConfig('hemodialysis', 'dialysis_duration')
       this.symptom_before_dialysis = getDataConfig('hemodialysis', 'dialysis_before')
@@ -1804,13 +1806,13 @@
       this.catheter_suture = getDataConfig('hemodialysis', 'catheter_suture')
       this.edema = getDataConfig('hemodialysis', 'edema')
       this.suctionList = getDataConfig('hemodialysis', 'suction')
-      
+
       this.blood_access_noise = this.$store.getters.blood_access_noise
       var date = this.$route.query && this.$route.query.date
       this.record_date = date ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}')
       //获取皮肤
       this.skins = getDataConfig('hemodialysis','skin')
-      
+
       this.pinholings = getDataConfig('hemodialysis','pinholing')
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
@@ -1819,15 +1821,15 @@
       this.catheter_evaluation_program_list = getDataConfig('hemodialysis','catheter_evaluation_program')
 
       this.skin_site_catheterization_list = getDataConfig('hemodialysis','skin_site_catheterization')
-       
+
       console.log("predialysis_evaluation2332323323222323",this.predialysis_evaluation)
 
       this.point_punctures = getDataConfig('hemodialysis','point_puncture')
 
       this.summary = getDataConfig("befor_symptoms", "befor_symptoms");
-      
+
       console.log("hhh32h323h23h23h23h23h23h",getDataConfig("befor_symptoms", "befor_symptoms"))
-      
+
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){
@@ -1842,7 +1844,7 @@
       //   }
       //
       // }
-    }, 
+    },
     watch: {
       isVisibility(val) {
 
@@ -1853,7 +1855,7 @@
              this.predialysis_evaluation.thromubus_type = this.predialysis_evaluation.thromubus_type.toString()
              this.thrombuShow = true
         }
-       
+
         if (this.predialysis_evaluation.id > 0) {
           for (var index in this.assessmentBeforeDislysis) {
             this.assessmentBeforeDislysis[index] = this.predialysis_evaluation[index]
@@ -1902,7 +1904,7 @@
           if (this.predialysis_evaluation['pulse_frequency'] == 0) {
             this.assessmentBeforeDislysis['pulse_frequency'] = ''
           }
-          
+
         }
       },
       'assessmentBeforeDislysis.weight_before': {

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

@@ -5,7 +5,8 @@
       class="newDialog"
       :visible.sync="visible"
       width="854px"
-      :modal-append-to-body="false"
+      :modal = 'false'
+      :close-on-click-modal="false"
     >
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
 
@@ -260,7 +261,7 @@
           </el-select>
         </el-form-item>
 
-       
+
           <el-form-item
             label="导管备注："
             :prop="isName('导管备注')"
@@ -276,8 +277,8 @@
               ></el-option>
             </el-select>
           </el-form-item>
-       
-    
+
+
           <el-form-item
             :prop="isName('导管备注')"
             :rules="isCheckmust('导管备注')"
@@ -289,7 +290,7 @@
               :rows="4"
             ></el-input>
           </el-form-item>
-    
+
 
         <el-form-item
           label="核酸检测日期:"
@@ -343,7 +344,7 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-  
+
 
      <el-dialog
           title="提示"
@@ -370,7 +371,7 @@
                 </span>
              </el-row>
            </el-form>
-         
+
           </span>
           <span slot="footer" class="dialog-footer">
             <el-button @click="infoDialogVisible = false">取 消</el-button>
@@ -590,7 +591,7 @@ export default {
       this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
       this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
       this.form.blood_access_id = this.dialysis_order.blood_access_id;
-     
+
       var blood_access_option_name = this.changeBloodAccessOpionOne(this.dialysis_order.blood_access_id)
       // this.form.schedual_type = this.dialysis_order.schedule_type
       // console.log("8823832323223",this.form.schedual_type)
@@ -686,17 +687,17 @@ export default {
           name == "穿刺者" ||
           name == "质控护士" ||
           name == "换药护士" ||
-          name == "血管通路" 
+          name == "血管通路"
         ) {
-          
+
           return [
             { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
             // { required: true, pattern: /^[1-9]\d*$/, message: `请输入${name}`,trigger: ['blur','change'] },
           ];
         }
           return [{ required: true, message: `请输入${name}` }];
-        } 
-                
+        }
+
 
       }
     },
@@ -1095,12 +1096,12 @@ export default {
     innerDialogCancle: function () {
       this.InnerDialogProps.visibility = false;
     },
-   
+
     dialysisSummarySelectChange: function (values) {
       if (this.form.catheter_operation == "") {
         this.form.catheter_operation = values;
       } else {
-       
+
         if (this.form.catheter_operation.indexOf(values) == -1) {
           if (
             this.form.catheter_operation

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

@@ -4,8 +4,9 @@
                 title="透析处方"
                 :visible.sync="isVisibility"
                 width="1010px"
+                :modal = 'false'
                 :modal-append-to-body="false"
-                :append-to-body="true"
+                :close-on-click-modal="false"
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
@@ -15,7 +16,7 @@
             <span style="position: absolute;left: 35%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
             </span>
-            <!-- <span style="position: absolute;left: 48%;top: 3%">
+            <!-- <span style="position: absolute;left: 48%;top: 3%"  :modal = 'false'>
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
             </span> -->
             <span style="position: absolute;left: 48%;top: 3%">
@@ -5081,7 +5082,7 @@ mu
       }
     },
     created() {
-      
+
       this.illnessList = getDataConfig('hemodialysis', 'illness')
 
       this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
@@ -5092,8 +5093,8 @@ mu
 
       this.educationList = getDataConfig('dialysis_remark', 'dialysis_remark')
 
-     
-      
+
+
     }
   }
 </script>

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

@@ -3,11 +3,13 @@
   <el-dialog
     title="双人核对"
     :visible.sync="isVisibility"
+    :modal = 'false'
     :modal-append-to-body="false"
+    :close-on-click-modal="false"
     width="854px"
   >
     <!-- <el-form :inline="true" class="demo-form-inline newInline" ref="doubleReview" :model="doubleReview" label-width="105px">
-      
+
       <el-form-item label="透析物品核查 : " :prop="isName('透析物品核查')"
               :rules="isCheckmust('透析物品核查')">
         <el-radio v-model="doubleReview.dialysis_item_check" label="1" @change="changeRadio">正确</el-radio>
@@ -91,7 +93,7 @@
       <el-form-item style="padding-left: 17px;">
         <el-checkbox-group v-model="checkList" @change="changeBox">
           <el-checkbox :label="diazes"></el-checkbox>&nbsp;&nbsp;
-          <span v-if="org_id == 0 || org_id == 9671 || org_id == 10440 || org_id == 9675"><el-input style="width:200px" v-model="doubleReview.dialyzer_batch_number"></el-input></span> 
+          <span v-if="org_id == 0 || org_id == 9671 || org_id == 10440 || org_id == 9675"><el-input style="width:200px" v-model="doubleReview.dialyzer_batch_number"></el-input></span>
         </el-checkbox-group>
         <el-checkbox-group v-model="checkList" @change="changeBox">
           <el-checkbox :label="puncture_needle"></el-checkbox>
@@ -189,7 +191,7 @@
       </el-form-item>
       <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.pipeline_connection_desc"></el-input>
-      </el-form-item>        
+      </el-form-item>
       </div>
 
       <el-form-item style="padding-left: 17px;">
@@ -320,7 +322,7 @@
                 </span>
              </el-row>
            </el-form>
-         
+
           </span>
           <span slot="footer" class="dialog-footer">
             <el-button @click="infoDialogVisible = false">取 消</el-button>
@@ -329,9 +331,9 @@
         </el-dialog>
  </div>
 
- 
 
-  
+
+
 </template>
 
 <script>
@@ -434,7 +436,7 @@ export default {
     },
     isShowFiled(name) {
       var filedList = this.$store.getters.xt_user.fileds;
-      
+
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 8 &&
@@ -447,7 +449,7 @@ export default {
       return false;
     },
     show() {
-    
+
       if(this.admin_users!=null && this.admin_users.length >0){
         var arr = []
         for(let i=0;i<this.admin_users.length;i++){
@@ -458,7 +460,7 @@ export default {
 
         this.admin_users = []
         this.admin_users.push(...arr)
-       
+
       }
 
       this.isVisibility = true;
@@ -899,7 +901,7 @@ export default {
       if (str.indexOf("处方脱水量") != -1 && this.prescription == null) {
         arr.push("处方脱水量:");
       }
-      
+
       if (str.indexOf("处方脱水量") != -1 && this.prescription != null) {
         arr.push(
           "处方脱水量:" +
@@ -912,7 +914,7 @@ export default {
         if (str.indexOf("处方脱水量") != -1 && this.prescription == null) {
         arr.push("处方脱水量:");
       }
-     
+
 
       if (str.indexOf("抗凝剂") != -1 && this.prescription != null) {
         arr.push(
@@ -1375,13 +1377,13 @@ export default {
           }
 
           if(this.org_id!=10440){
-           
+
             this.diazes = "透析器/灌流器/滤过器:";
             this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus;
             this.diazes = this.diazes + this.prescription.dialysis_dialyszers + this.prescription.dialysis_irrigation + this.prescription.dialysis_strainer
 
           }
-        
+
         } else {
 
           if(this.org_id == 10440 || this.org_id == 0){
@@ -1393,7 +1395,7 @@ export default {
             this.diazes = "";
             this.diazes = this.diazes;
           }
-         
+
         }
 
         if (this.prescription.dialysate_formulation != "") {
@@ -1569,17 +1571,17 @@ export default {
         }
 
         if(this.org_id !=0 && this.org_id!=10440){
-         
+
           this.puncture_needle = "穿刺针:";
         this.puncture_needle =
-          this.puncture_needle + this.predialysis_evaluation.puncture_needle 
+          this.puncture_needle + this.predialysis_evaluation.puncture_needle
         this.blood_access_part_opera_id =
           this.blood_access_part_opera_id +
           this.getBloodAccess(
             this.predialysis_evaluation.blood_access_part_opera_id
           );
         }
-       
+
       }
       if(this.predialysis_evaluation != null &&this.predialysis_evaluation.id == 0){
         this.puncture_needle = "穿刺针:" + "   "+ "批号:"
@@ -1902,11 +1904,11 @@ export default {
       }
     },
 
-  
+
   },
   created() {
     var date = this.$route.query && this.$route.query.date;
- 
+
     this.record_date = date
       ? uParseTime(date, "{y}-{m}-{d}")
       : parseTime(new Date(), "{y}-{m}-{d}");

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

@@ -1,6 +1,8 @@
 <template>
   <div>
-    <el-dialog title="透析下机" class="newDialog" :visible.sync="visible" width="854px" :modal-append-to-body="false">
+    <el-dialog title="透析下机" class="newDialog" :visible.sync="visible" width="854px"
+      :modal = 'false' :close-on-click-modal="false"
+    >
       <!-- <div class="txsj">
       </div> -->
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
@@ -62,7 +64,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-     
+
       <el-row :gutter="20">
         <el-col v-if="isShowFiled('宣教知识')">
           <el-form-item :prop="isName('宣教知识')"
@@ -76,7 +78,7 @@
         </el-col>
       </el-row>
 
-      
+
 
         <el-form-item>
           <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit('form')" :loading="loading"
@@ -98,7 +100,7 @@
       v-on:dialog-comfirm="innerDialogComfirm"
       v-on:dialog-cancle="innerDialogCancle"
     ></multi-select-box>
-    
+
 
        <el-dialog
           title="提示"
@@ -125,14 +127,14 @@
                 </span>
              </el-row>
            </el-form>
-         
+
           </span>
           <span slot="footer" class="dialog-footer">
             <el-button @click="infoDialogVisible = false">取 消</el-button>
             <el-button type="primary" @click="saveInformation">确 定</el-button>
           </span>
         </el-dialog>
-  
+
   </div>
 </template>
 
@@ -262,7 +264,7 @@
           filedList[i].filed_name_cn == name &&
           filedList[i].is_write == 1
             ) {
-              
+
               return [{ required: true ,message:`请输入${name}` }];
             }
           }
@@ -306,7 +308,7 @@
             return true
           }
         }
-        
+
         return false
       },
       show: function(record) {
@@ -440,7 +442,7 @@
         })
       },
       submit: function(formName) {
-        
+
         this.$refs[formName].validate(valid=>{
           if(valid){
              if(this.isWrite("穿刺处血肿") == true && this.form.puncture_point_haematoma == ""){
@@ -462,7 +464,7 @@
              this.loading = true
              let mode = "1"
              console.log("fomr",this.form.mission_id)
-            
+
             finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor,this.form.mission,this.form.mission_id).then(rs => {
               this.loading = false
               var resp = rs.data
@@ -487,7 +489,7 @@
             return false
           }
         })
-    
+
       }, getTime(value, temp) {
         if (value != undefined) {
           return parseTime(value, temp)
@@ -580,7 +582,7 @@
           module:8,
           remark:this.remark,
         }
-      
+
         saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information

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

@@ -5,7 +5,8 @@
       :visible.sync="visible"
       width="1100px"
       @close="reset"
-      :modal-append-to-body="false"
+      :modal = 'false'
+      :close-on-click-modal="false"
     >
       <div v-show="edit == false">
         <div class="txsj">
@@ -389,7 +390,7 @@
                 org_id == 10495  ||
                 org_id == 10395
                 || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551)
-                && org_id!=10387 
+                && org_id!=10387
             "
           >
             <template slot-scope="scope">
@@ -532,7 +533,7 @@
               template_id != 56 &&
               org_id !=10432 &&
               org_id !=10445 &&
-              org_id!=10395 && 
+              org_id!=10395 &&
               org_id !=10410
             "
           >
@@ -926,7 +927,7 @@
           </el-table-column>
 
 
-         
+
 
           <el-table-column
             prop="heparin"
@@ -1386,7 +1387,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10395)
-              || org_id ==10558 
+              || org_id ==10558
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
@@ -1856,7 +1857,7 @@
             </span>
           </el-row>
         </el-form>
-      
+
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="infoDialogVisible = false">取 消</el-button>

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

@@ -5,7 +5,9 @@
     title="治疗小结"
     width="854px"
     :visible.sync="isVisibility"
+    :modal = 'false'
     :modal-append-to-body="false"
+    :close-on-click-modal="false"
   >
     <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
     <el-form :model="treatmentSummary" ref="treatmentSummary">
@@ -181,7 +183,7 @@
                 </span>
              </el-row>
            </el-form>
-         
+
           </span>
           <span slot="footer" class="dialog-footer">
             <el-button @click="infoDialogVisible = false">取 消</el-button>
@@ -326,7 +328,7 @@ export default {
         this.date = date;
         this.record_date = uParseTime(this.date, "{y}-{m}-{d}");
       }
-     
+
       console.log("治疗小结", record);
       this.getPermission();
     },
@@ -356,7 +358,7 @@ export default {
       if (this.treatmentSummary.dialysis_summary == "") {
         this.treatmentSummary.dialysis_summary = values;
       } else {
-       
+
         if (this.treatmentSummary.dialysis_summary.indexOf(values) == -1) {
           if (
             this.treatmentSummary.dialysis_summary
@@ -503,7 +505,7 @@ export default {
                 }
               }
             }
-           
+
           }
         });
     },
@@ -530,7 +532,7 @@ export default {
           module:10,
           remark:this.remark,
         }
-       
+
       saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information
@@ -546,12 +548,12 @@ export default {
           str_one = "护士穿刺成功!"
         }
       }
-    
-      var total =0 
+
+      var total =0
       if(this.predialysis_evaluation!=null){
         total = (this.predialysis_evaluation.weight_before - this.predialysis_evaluation.dry_weight).toFixed(1)
       }
-  
+
 
       var monitor_one =[]
       var monitor_two = []
@@ -570,13 +572,13 @@ export default {
         })
 
       }
-  
-     
+
+
      var doc_str = ""
       console.log("医嘱2333333333333",this.predialysis_evaluation)
       if(this.doctor_advices!=null && this.doctor_advices.length > 0){
-       
-        
+
+
         for(let i=0;i<this.doctor_advices.length;i++){
           doc_str +=this.doctor_advices[i].advice_name +" "+this.doctor_advices[i].prescribing_number+this.doctor_advices[i].prescribing_number_unit+" "+this.doctor_advices[i].delivery_way
         }
@@ -585,7 +587,7 @@ export default {
       if(this.predialysis_evaluation.blood_access_part_id == -2){
         this.predialysis_evaluation.blood_access_part_id = ""
       }
-     
+
 
        if(this.org_id ==10090){
           var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
@@ -609,7 +611,7 @@ export default {
        this.treatmentSummary.dialysis_summary = ""
        this.treatmentSummary.dialysis_summary = str
        }
-      
+
     },
     QueryOperaById(val){
        var blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
@@ -719,10 +721,10 @@ export default {
       }
       if(id == 3){
         anticoagulant_name = "低分子肝素"
-      } 
+      }
       if(id == 4){
         anticoagulant_name = "阿加曲班"
-      } 
+      }
 
       if(id == 5){
        anticoagulant_name = "枸橼酸钠"
@@ -732,34 +734,34 @@ export default {
       }
       if(id == 7){
         anticoagulant_name = "低分子肝素钠"
-      } 
+      }
       if(id == 8){
         anticoagulant_name = "依诺肝素"
-      } 
+      }
 
       if(id == 9){
         anticoagulant_name = "达肝素"
-      } 
+      }
       if(id == 10){
         anticoagulant_name = "体外抗凝"
-      } 
+      }
 
       if(id == 11){
         anticoagulant_name = "那屈肝素"
-      } 
+      }
       if(id == 12){
         anticoagulant_name = "无抗凝剂"
-      } 
+      }
 
       if(id == 13){
         anticoagulant_name = "那屈肝素钙"
-      } 
+      }
       if(id == 14){
         anticoagulant_name = "肝素钙注射液"
-      } 
+      }
       if(id == 15){
         anticoagulant_name = "甲磺酸萘莫司他"
-      } 
+      }
 
       return anticoagulant_name
     },
@@ -805,15 +807,15 @@ export default {
               special_record: "",
             };
           }
-         
+
           if(this.$store.getters.xt_user.org.id == 0 || this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 10340){
              this.treatmentSummary.dialysis_summary = "安全下机"
           }
-          
+
         }
       },
     },
-  
+
   },
   created() {
     this.education = getDataConfig("education", "education");
@@ -830,7 +832,7 @@ export default {
       var date = this.$route.query && this.$route.query.date;
       this.record_date = uParseTime(date, "{y}-{m}-{d}");
     }
-    
+
     this.org_id = this.$store.getters.xt_user.template_info.org_id
   },
 };

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -985,12 +985,16 @@ export default {
               obj['statistical_classification'] = ''
               obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+              obj['project'] = project_month_prescriptions.project[a].project
+
               obj['type'] = 2
 
             } else if (project_month_prescriptions.project[a].type == 3) {
               obj['statistical_classification'] = ''
               obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
               obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
+              obj['good_info'] = project_month_prescriptions.project[a].good_info
+
               obj['type'] = 3
 
             }
@@ -1308,6 +1312,8 @@ export default {
                 obj['statistical_classification'] = prescription.project[b].team.project_team
                 obj['medical_code'] = prescription.project[b].project.medical_code
                 obj['project_name'] = prescription.project[b].project.project_name
+                obj['project'] = prescription.project[b].project
+
                 obj['spec'] = ''
                 obj['name_id'] = 0
 
@@ -1317,6 +1323,7 @@ export default {
                 obj['project_name'] = prescription.project[b].good_info.good_name
                 obj['spec'] = prescription.project[b].good_info.specification_name
                 obj['name_id'] = prescription.project[b].good_info.manufacturer
+                obj['good_info'] = prescription.project[b].good_info
 
               }
 

src/xt_pages/outpatientCharges/componenttwo/chargeMonthPrescriptionTable.vue

@@ -58,7 +58,12 @@
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
-        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+<!--        <template slot-scope="scope">{{ scope.row.project_name }}</template>-->
+        <template slot-scope="scope">
+          <span :title="scope.row.project_name" v-if="org_id != 10206">{{ scope.row.project_name }}</span>
+          <span  v-if="org_id == 10206&&scope.row.type==3">{{ scope.row.project_name }}{{scope.row.good_info.specification_name}}{{scope.row.good_info.good_number}}</span>
+          <span v-if="org_id == 10206&&scope.row.type==2">{{ scope.row.project_name }}</span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
@@ -127,6 +132,7 @@
     },
     data() {
       return {
+        org_id:this.$store.getters.xt_user.org_id,
         drugways: [],
         efs: []
       }

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -15,11 +15,11 @@
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
-            <printfifteen v-if="org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printfifteen>
+            <printfifteen v-if="org_id == 10510 " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
-          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
+          <printFive v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printFive>
           <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>

src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id='invoice-print'>
+    <div id='invoice-print' style="position: relative;">
         <div v-for='(i,index) in pageArr.length' :key="index">
             <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:70+ 'px',}">{{ list.order_number }}</div>
             <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:400+ 'px',}">{{list.order.fa_piao_number}}</div>
@@ -18,7 +18,7 @@
             </div>
             <div :style="{position: 'absolute',top:(100 + (index * 400))  + 'px',left:260+ 'px'}">
                 <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
-                    <span style="display:inline-block;width:200px;">
+                    <span style="display:inline-block;width:250px;">
                         <span v-if="item.advice.id == 0">
                             <span v-if="item.project.type == 2">{{ item.project.project.project_name }}</span>
                             <span v-if="item.project.type == 3">{{ item.project.good_info.good_name }}</span>

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -9,6 +9,7 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
       v-if="dialysisShow"
     >
+    <!--  -->
       <div style="padding-top: 56px;width:100%;" >
 
         <nav-igation
@@ -67,8 +68,6 @@
         >
         </nav-igation>
 
-
-
         <basic-infor
           :patient="patient"
           :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
@@ -76,6 +75,15 @@
           title="基本信息"
         ></basic-infor>
 
+        <!-- <BasicInforTwo
+          :patient="patient"
+          :dialysis_date="dialysis_date"
+          :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
+          :steps="steps"
+          title="基本信息"
+        >
+        </BasicInforTwo> -->
+
         <dialysis-prescription
           :prescription="prescription"
           :solution="solution"
@@ -85,7 +93,6 @@
         ></dialysis-prescription>
 
 
-
       <!-- <past-data class="往期数据"></past-data> -->
         <div style="height: 20px;background-color: #f6f8f9"></div>
         <accepts-assessment
@@ -201,7 +208,8 @@ export default {
   props:{
     record_date:String,
     patientid:Number,
-    dialysisShow:Boolean
+    dialysisShow:Boolean,
+    dialysis_date:String
   },
   data() {
     return {
@@ -215,6 +223,7 @@ export default {
       loading: false,
       patient_id: 0,
       date: 0,
+      dialysis_date:0,
 
       longAdvices: [],
       waitUploadAdvices: [],
@@ -345,8 +354,6 @@ export default {
       }
     })
 
-
-
   },
   mounted() {
     if(this.dialysisShow == true){
@@ -745,7 +752,7 @@ export default {
 
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-           
+
           this.is_advice_open = resp.data.is_advice_open.is_advice_open
 
 
@@ -812,6 +819,7 @@ export default {
         }
         if(this.predialysis_evaluation.id > 0){
           this.newTime = parseTime(this.predialysis_evaluation.created_time, '{h}:{i}')
+          // this.dialysis_date = parseTime(this.predialysis_evaluation.created_time, '{y}-{m}-{d}')
         }
 
         this.loading = false

src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue

@@ -0,0 +1,392 @@
+<template>
+  <div>
+    <div style="margin-top:90px ;">
+
+      <el-table
+        id="oictable"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :row-style="{ color: '#303133' }"
+        :data="recordData"
+        border
+        style="width: 100%"
+        @row-click="rowclick"
+        @current-change="clickCurrent"
+      >
+        <el-table-column
+          prop="dialysis_date"
+          label="透析日期"
+          align="center"
+          width="110"
+          fixed
+        >
+          <template slot-scope="scope"
+            ><span style="color: #579ef8">{{
+              scope.row.dialysis_date | parseTime("{y}-{m}-{d}")
+            }}</span></template
+          >
+        </el-table-column>
+        <el-table-column
+          prop="schedule_type"
+          label="班次"
+          align="center"
+          width="80"
+        >
+          <template slot-scope="scope"
+            ><span>{{
+              scheduleType(scope.row.schedule_type)
+            }}</span></template
+          >
+        </el-table-column>
+        <el-table-column
+          prop="partition"
+          width="100"
+          align="center"
+          label="分区 - 机号"
+        >
+          <template slot-scope="scope"
+            ><span
+              >{{ scope.row.partition_name }}-{{
+                scope.row.device.number
+              }}</span
+            ></template
+          >
+        </el-table-column>
+        <el-table-column
+          prop="mode"
+          width="90"
+          align="center"
+          label="透析模式"
+        >
+          <template slot-scope="scope">{{
+            modeName(scope.row.prescription.mode_id)
+          }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="prescription.dialysis_duration"
+          width="100"
+          align="center"
+          label="透析时长(h)"
+        >
+          <template slot-scope="scope">
+            <span>{{getTime(scope.row.assessment_after_dislysis)}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column  width="96" align="center" label="透析器/灌流器">
+            <template slot-scope="scope">
+                {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+                {{ scope.row.prescription.dialysis_dialyszers }}
+            <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{ scope.row.prescription.dialysis_irrigation }}</span>
+            </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="predialysis_evaluation.dry_weight"
+          width="96"
+          align="center"
+          label="干体重(kg)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="predialysis_evaluation.weight_before"
+          width="110"
+          align="center"
+          label="透前称重(kg)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="assessment_after_dislysis.weight_after"
+          width="110"
+          align="center"
+          label="透后称重(kg)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="predialysis_evaluation"
+          width="140"
+          align="center"
+          label="透前血压(mmHg)"
+        >
+          <template slot-scope="scope"
+            ><span
+              >{{
+                scope.row.predialysis_evaluation.systolic_blood_pressure
+              }}/{{
+                scope.row.predialysis_evaluation.diastolic_blood_pressure
+              }}</span
+            ></template
+          >
+        </el-table-column>
+        <el-table-column
+          prop="assessment_after_dislysis"
+          width="140"
+          align="center"
+          label="透后血压(mmHg)"
+        >
+          <template slot-scope="scope"
+            ><span
+              >{{
+                scope.row.assessment_after_dislysis.systolic_blood_pressure
+              }}/{{
+                scope.row.assessment_after_dislysis.diastolic_blood_pressure
+              }}</span
+            ></template
+          >
+        </el-table-column>
+        <el-table-column
+          prop="assessment_after_dislysis"
+          width="140"
+          align="center"
+          label="目标超滤量"
+        >
+          <template slot-scope="scope"
+            ><span
+              >{{
+                scope.row.prescription.target_ultrafiltration
+              }}</span
+            ></template
+          >
+        </el-table-column>
+        <el-table-column
+          prop="assessment_after_dislysis"
+          width="140"
+          align="center"
+          label="实际超滤量"
+        >
+          <template slot-scope="scope"
+            ><span
+              >{{
+                scope.row.assessment_after_dislysis.actual_ultrafiltration
+              }}</span
+            ></template
+          >
+        </el-table-column>
+
+        <el-table-column
+          prop="type"
+          width="200"
+          align="center"
+          label="抗凝剂种类 首剂/维持/总量"
+        >
+          <template slot-scope="scope">
+            <span>{{ setAnticoagulantsConfit(scope.row.prescription) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="nurse"
+          width="90"
+          align="center"
+          label="治疗护士"
+        >
+          <template slot-scope="scope"
+            ><span>{{
+            scope.row.role.user_name
+            }}</span></template
+          >
+        </el-table-column>
+        <el-table-column
+          prop="doctor"
+          width="90"
+          align="center"
+          label="治疗医生"
+        >
+          <template slot-scope="scope"
+            ><span>{{
+              scope.row.prescription.role.user_name
+            }}</span></template
+          >
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="queryParams.page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+     <!-- 透析记录弹窗 -->
+     <div>
+      <el-drawer
+        title="我是标题"
+        :visible.sync="drawer"
+        :with-header="false"
+        :modal-append-to-body="false"
+        size="70%"
+        >
+        <div>
+          <!-- <div style="margin-left:60px;color:#34495e">
+            <span>{{ patient.name }}({{ patient.dialysis_no }})</span>
+            <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
+            <span v-if="newTime != ''">签到时间：{{ newTime }}</span>
+          </div> -->
+
+
+          <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo>
+        </div>
+
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getPatientDialysisRecords } from "@/api/patient";
+import dialysisIndextwo from './dialysisIndextwo'
+import { parseTime } from '@/utils'
+export default{
+  props:{
+    // history_id:Number
+    patientid:Number
+  },
+  components:{
+    dialysisIndextwo
+  },
+  data(){
+    return{
+      orgname: "",
+      currentPatient: {},
+      patientID: 0,
+      total: 0,
+      queryParams: {
+        // date: "",
+        mode_id: "",
+        start_time: "",
+        end_time: "",
+        page: 1,
+        patient_id: 0,
+        limit: 10
+      },
+      recordData: [],
+      dateOptions: [
+        { value: "0", label: "本月" },
+        { value: "1", label: "本年" }
+      ],
+      modeOptions: [],
+      anticoagulantsConfit: [],
+      blood_filters: [],
+      perfusion_apparatus: [],
+      hemodialysis_machines: [],
+      doctorOptions: [],
+      nurseOptions: [],
+      vascularAccess: [],
+      vascularAccessDesc: [],
+      drawer:false,
+
+      patient_id:'',
+      dialysis_date:0,
+      dialysisShow:false,
+
+      newTime:'',
+    }
+  },
+  methods:{
+    changeSearch(){
+
+    },
+    exportList(){
+
+    },
+    printThisInfo(){
+
+    },
+    rowclick(event){
+      this.patient_id = event.patient_id
+      this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      this.drawer =true
+      this.dialysisShow =true
+    },
+    clickCurrent(){
+
+    },
+    getPatientDialysisRecords() {
+      console.log("prams",this.queryParams)
+      getPatientDialysisRecords(this.queryParams).then(response => {
+        if (response.data.state == 1) {
+          this.total = response.data.data.total;
+          this.recordData = response.data.data.records;
+          console.log("郭23232323232232323",this.recordData)
+        }
+      });
+    },
+    handleSizeChange(val) {
+      this.queryParams.limit = val;
+      this.getPatientDialysisRecords();
+    },
+    handleCurrentChange(val) {
+      this.queryParams.page = val;
+      this.getPatientDialysisRecords();
+    },
+    scheduleType(schedule_type) {
+      var typeName = "未知";
+      switch (schedule_type) {
+        case 1:
+          typeName = "上午";
+          break;
+        case 2:
+          typeName = "下午";
+          break;
+        case 3:
+          typeName = "晚上";
+          break;
+        default:
+          break;
+      }
+      return typeName;
+    },
+    modeName(mode_id) {
+      return typeof this.modeOptions[mode_id] !== "undefined" &&
+        typeof this.modeOptions[mode_id].name !== "undefined"
+        ? this.modeOptions[mode_id].name
+        : "";
+    },
+    getTime(record){
+      if(record != null&&record.id > 0) {
+        let actual_treatment_hour = 0
+        let actual_treatment_minute = 0
+        actual_treatment_hour = parseFloat(record.actual_treatment_hour)
+        actual_treatment_minute = parseFloat(record.actual_treatment_minute) / 60
+        return (actual_treatment_hour + actual_treatment_minute).toFixed(2)
+      }
+    },
+    setAnticoagulantsConfit(prescription) {
+      if (
+        typeof this.anticoagulantsConfit[prescription.anticoagulant] ===
+        "undefined"
+      ) {
+        return "";
+      } else {
+        if (this.anticoagulantsConfit[prescription.anticoagulant].shouji != 1) {
+          return this.anticoagulantsConfit[prescription.anticoagulant].name;
+        } else {
+          return (
+            this.anticoagulantsConfit[prescription.anticoagulant].name +
+            "/" +
+            prescription.anticoagulant_shouji +
+            "/" +
+            prescription.anticoagulant_weichi +
+            "/" +
+            prescription.anticoagulant_zongliang
+          );
+        }
+      }
+    },
+  },
+  created(){
+    this.modeOptions = this.$store.getters.treatment_mode;
+    this.queryParams.patient_id = this.patientid
+    this.getPatientDialysisRecords()
+
+  },
+
+}
+</script>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -143,7 +143,11 @@
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" type="index" width="40" label="序号" fixed></el-table-column>
             <el-table-column align="center" prop="project_name" label="名称" fixed>
-                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
+                <template slot-scope="scope">
+                  <span :title="scope.row.project_name" v-if="org_id != 10206">{{ scope.row.project_name }}</span>
+                  <span  v-if="org_id == 10206&&scope.row.type==3">{{ scope.row.project_name }}{{scope.row.good_info.specification_name}}{{scope.row.good_info.good_number}}</span>
+                  <span v-if="org_id == 1026&&scope.row.type==2">{{ scope.row.project_name }}</span>
+
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
@@ -266,6 +270,7 @@
 
     data() {
       return {
+        org_id:this.$store.getters.xt_user.org_id,
         advices: [],
         tableData: [],
         newoptions: [{

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -109,12 +109,13 @@
                    style="position: fixed;width: calc(100% - 490px);background:#fff;">
             <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
             <el-tab-pane label="透析记录" name="透析记录">
-
             </el-tab-pane>
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
+            <el-tab-pane label="透析历史" name="透析历史"></el-tab-pane>
 
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
+            <el-button v-if="org_id == 10206" size="small" ref="button_three" @click="open_four()" type="primary">刷新库存</el-button>
             <el-button size="small" ref="button_one" @click="open(1)" type="primary"
                        v-loading="saveLoading">保存
             </el-button>
@@ -190,6 +191,7 @@
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
                         :dialysisShow="dialysisShow"></dialysis-index>
 
+        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>  
       </div>
 
     </div>
@@ -531,6 +533,7 @@ import treatPrint from './treatPrint'
 import recordPrint from './recordPrint'
 import checkPrint from './checkPrint'
 import dialysisIndex from './components/dialysisIndex'
+import dialysishistory from './components/dialysishistory'
 import { getInitPrintDataOne } from '@/api/dialysis_record'
 import axios from 'axios'
 
@@ -547,7 +550,8 @@ export default {
     treatPrint,
     recordPrint,
     checkPrint,
-    dialysisIndex
+    dialysisIndex,
+    dialysishistory
   },
   data() {
     return {
@@ -641,6 +645,10 @@ export default {
   },
 
   methods: {
+    open_four(){
+      this.$refs.prescriptions.getZuobiaoGoodStock()
+      this.$refs.prescriptions.getZuobiaoDrugStock()
+    },
     getSunziValue(val) {
       //  this.drugs=[]
       this.getInitData()
@@ -2086,7 +2094,7 @@ export default {
             }
           }
           console.log('~~~~~00000222222', this.prescriptions)
-          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+          // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
         }
       })
 
@@ -2706,7 +2714,7 @@ export default {
                     //   }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
@@ -3241,7 +3249,7 @@ export default {
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
@@ -3764,14 +3772,14 @@ export default {
                   // }
                 }
               }
-              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+              // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               this.$refs.child.watchSign = 0
             }
           })
           this.$refs.child.watchSign = 0
         }
       } else {
-
+        this.patientid = val.id
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -4429,7 +4437,7 @@ export default {
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               }
             })
 
@@ -5000,7 +5008,7 @@ export default {
 
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
+                // this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               }
             })
           } else {

src/xt_pages/user/components/PatientSidebar.vue

@@ -203,68 +203,68 @@ export default {
             },
           ]
         },
-        // {
-        //   name: '5',
-        //   label: '评估工具',
-        //   children: [
-        //     {
-        //       name: '5-1',
-        //       label: '跌倒评估'
-        //     },
-        //     {
-        //       name: '5-2',
-        //       label: '小儿跌倒风险评估'
-        //     },
-        //     {
-        //       name: '5-3',
-        //       label: '压疮风险评估'
-        //     },
-        //     {
-        //       name: '5-4',
-        //       label: 'OH压疮评估'
-        //     },
-        //     {
-        //       name: '5-5',
-        //       label: '日常生活能力评估'
-        //     },
-        //     {
-        //       name: '5-6',
-        //       label: '导管脱落风险评估'
-        //     },
-        //     {
-        //       name: '5-7',
-        //       label: 'RASS及疼痛评估'
-        //     },
-        //     {
-        //       name: '5-8',
-        //       label: '营养状况评估'
-        //     },
-        //     {
-        //       name: '5-9',
-        //       label: '约束告知单'
-        //     },
-        //     {
-        //       name: '5-10',
-        //       label: '心理评估'
-        //     },
-        //     {
-        //       name: '5-11',
-        //       label: '瘙痒评估'
-        //     },
-        //     {
-        //       name: '5-12',
-        //       label: '血液透析患者评估'
-        //     },
-        //     {
-        //       name: '5-13',
-        //       label: 'Glasgow昏迷评分量表'
-        //     },
-        //     {
-        //       name: '5-14',
-        //       label: '肌力评估表'
-        //     },
-        //   ]
-        // },
+        {
+          name: '5',
+          label: '评估工具',
+          children: [
+            {
+              name: '5-1',
+              label: '跌倒评估'
+            },
+            {
+              name: '5-2',
+              label: '小儿跌倒风险评估'
+            },
+            {
+              name: '5-3',
+              label: '压疮风险评估'
+            },
+            {
+              name: '5-4',
+              label: 'OH压疮评估'
+            },
+            {
+              name: '5-5',
+              label: '日常生活能力评估'
+            },
+            {
+              name: '5-6',
+              label: '导管脱落风险评估'
+            },
+            {
+              name: '5-7',
+              label: 'RASS及疼痛评估'
+            },
+            {
+              name: '5-8',
+              label: '营养状况评估'
+            },
+            {
+              name: '5-9',
+              label: '约束告知单'
+            },
+            {
+              name: '5-10',
+              label: '心理评估'
+            },
+            {
+              name: '5-11',
+              label: '瘙痒评估'
+            },
+            {
+              name: '5-12',
+              label: '血液透析患者评估'
+            },
+            {
+              name: '5-13',
+              label: 'Glasgow昏迷评分量表'
+            },
+            {
+              name: '5-14',
+              label: '肌力评估表'
+            },
+          ]
+        },
         {
           name: '6',
           label: '文书管理',

src/xt_pages/user/dialysisRecord.vue

@@ -7,8 +7,7 @@
     ></patient-sidebar>
     <div class="patient-app-container app-container">
       <div style="clearfix">
-      
-      
+
         <el-button
           style="float:right;"
           size="small"
@@ -25,7 +24,7 @@
           type="primary"
           >导出</el-button
         >
-        
+
         <el-form ref="form" :model="queryParams" label-width="80px">
           <!-- <el-form-item label="患者时间 : " >
               <el-select v-model="form.date"   >
@@ -92,6 +91,7 @@
           :data="recordData"
           border
           style="width: 100%"
+          @row-click="rowclick"
           @current-change="clickCurrent"
         >
           <el-table-column
@@ -158,7 +158,7 @@
              <template slot-scope="scope">
                  {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
                  {{ scope.row.prescription.dialysis_dialyszers }}
-              <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{ scope.row.prescription.dialysis_irrigation }}</span>    
+              <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{ scope.row.prescription.dialysis_irrigation }}</span>
              </template>
           </el-table-column>
 
@@ -369,7 +369,7 @@
                 <td>
                    <span v-if="item.prescription.dialyzer_perfusion_apparatus"></span>
                    <span v-if="item.prescription.dialysis_dialyszers!=''">{{ item.prescription.dialysis_dialyszers }} </span>
-                   <span v-if="item.prescription.dialysis_irrigation!=''">/{{ item.prescription.dialysis_irrigation }} </span> 
+                   <span v-if="item.prescription.dialysis_irrigation!=''">/{{ item.prescription.dialysis_irrigation }} </span>
                 </td>
                 <td>{{ item.predialysis_evaluation.dry_weight }}</td>
                 <td>{{ item.predialysis_evaluation.weight_before }}</td>
@@ -401,13 +401,38 @@
 
       </div>
     </div>
+    <!-- 透析记录弹窗 -->
+    <div>
+      <el-drawer
+        title="我是标题"
+        :visible.sync="drawer"
+        :with-header="false"
+        :modal-append-to-body="false"
+        size="70%"
+        >
+        <div>
+          <!-- <div style="margin-left:60px;color:#34495e">
+            <span>{{ patient.name }}({{ patient.dialysis_no }})</span>
+            <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
+            <span v-if="newTime != ''">签到时间：{{ newTime }}</span>
+          </div> -->
+
+
+          <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo>
+        </div>
+
+      </el-drawer>
+    </div>
   </div>
 </template>
 <script>
 import PatientSidebar from "./components/PatientSidebar";
 import { getPatientDialysisRecords } from "@/api/patient";
+import {getDialysisScheduleDetail,getLongAdviceTwo} from '@/api/dialysis_record'
 import { uParseTime } from "@/utils/tools";
+import { parseTime } from '@/utils'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
+import dialysisIndextwo from '../outpatientDoctorStation/components/dialysisIndextwo'
 import print from "print-js";
 
 export default {
@@ -440,15 +465,24 @@ export default {
       doctorOptions: [],
       nurseOptions: [],
       vascularAccess: [],
-      vascularAccessDesc: []
+      vascularAccessDesc: [],
+      drawer:false,
+
+      patient_id:'',
+      dialysis_date:0,
+      dialysisShow:false,
+
+      newTime:'',
+
     };
   },
   components: {
-    PatientSidebar
+    PatientSidebar,
+    dialysisIndextwo
   },
   methods: {
     getTime(record){
-     
+
       if(record != null&&record.id > 0) {
         let actual_treatment_hour = 0
         let actual_treatment_minute = 0
@@ -648,10 +682,16 @@ export default {
       }, 1);
     },
     clickCurrent(val) {
-      this.$router.push({
-        path: "/dialysis/details",
-        query: { patient_id: val.patient_id, date: val.dialysis_date }
-      });
+      this.patient_id = val.patient_id
+      this.dialysis_date = val.dialysis_date
+    },
+    rowclick(event){
+
+      console.log('kkkkkkk',event);
+      this.patient_id = event.patient_id
+      this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      this.drawer =true
+      this.dialysisShow =true
     },
     exportList(){
       import('@/vendor/Export2Excel').then(excel => {
@@ -665,7 +705,7 @@ export default {
             this.recordData[i].AnticoagulantsConfit = this.setAnticoagulantsConfit(this.recordData[i].prescription)
             this.recordData[i].nurse_name = this.recordData[i].role.user_name
             this.recordData[i].doc_name = this.recordData[i].prescription.role.user_name
-       
+
             this.recordData[i].bed_number = this.recordData[i].partition_name + "-" + this.recordData[i].device.number
             this.recordData[i].dialysis_duration_hour = this.getTime(this.recordData[i].assessment_after_dislysis)
             this.recordData[i].dry_weight = this.recordData[i].predialysis_evaluation.dry_weight
@@ -682,10 +722,10 @@ export default {
             this.recordData[i].patient_name = this.currentPatient.name
           }
          }
-         
+
          const tHeader = ['姓名','透析日期','班次', '分区机号', '透析模式','透析时长','干体重(kg)','透前体重(kg)','透后体重(kg)','透前血压(mmHg)','透后血压(mmHg)','目标超滤量','抗凝剂 首剂/维持/总量','透析器型号','治疗护士','治疗医生']
          const filterVal = ['patient_name','dialysis_date_one','bed_class', 'bed_number', 'mode_name','dialysis_duration_hour','dry_weight','weight_before','weight_after','befor_pressure','after_pressure','target_ultrafiltration','AnticoagulantsConfit','dialyzer_perfusion_apparatus','nurse_name','doc_name']
-        
+
          const data = this.formatJson(filterVal, this.recordData)
          excel.export_json_to_excel({
            header: tHeader,
@@ -693,10 +733,11 @@ export default {
            filename: '透析记录'
          })
         })
-      },
-      formatJson(filterVal, jsonData) {
-        return jsonData.map(v => filterVal.map(j => v[j]));
-      },
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]));
+    },
+
   },
   created() {
     const id = this.$route.params && this.$route.params.id;
@@ -720,11 +761,47 @@ export default {
 
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+
   },mounted(){
 
     this.fetchAllDoctorAndNurse();
     this.getPatientDialysisRecords();
 
+  },
+  computed:{
+    steps: function() {
+      var steps = [
+        { title: '透析处方', finish: false },
+        { title: '接诊评估', finish: false },
+        { title: '透前评估', finish: false },
+        { title: '临时医嘱', finish: false },
+        { title: '双人核对', finish: false },
+        { title: '透析上机', finish: false },
+        { title: '透析监测', finish: false },
+        { title: '透析下机', finish: false },
+        { title: '透后评估', finish: false },
+        { title: '治疗小结', finish: false }
+      ]
+      steps[0].finish = this.prescription.id && this.prescription.creater > 0
+      steps[1].finish = this.receiver_treatment_access.id > 0
+      // steps[2].finish =this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.creater > 0
+      steps[2].finish =this.predialysis_evaluation.id > 0
+      steps[3].finish = this.doctor_advices.length > 0
+      steps[5].finish = this.dialysis_order.id > 0
+      steps[7].finish =
+        this.dialysis_order.id > 0 && this.dialysis_order.stage == 2
+
+      steps[4].finish =
+        this.double_check.id > 0 &&
+        this.double_check.creater > 0 &&
+        this.double_check.modifier > 0
+      steps[6].finish = this.monitor_records.length > 0
+      // steps[8].finish = this.assessment_after_dislysis.id > 0 && this.assessment_after_dislysis.creater > 0
+      steps[8].finish = this.assessment_after_dislysis.id > 0
+      steps[9].finish = this.treatment_summary.id > 0
+
+      return steps
+    },
   }
 };
 </script>

src/xt_pages/workforce/appointment.vue

@@ -69,20 +69,19 @@
       <div style="display:flex;align-items:center">
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction" v-if="activeName !='historyWeek'">打印排班</el-button>
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionOne" v-if="activeName == 'historyWeek'">打印排班</el-button>
-        <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess'></schedule-upload-excel>
+        <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
           导出排班
         </el-button>
-      
-        <el-button
+        <!-- <el-button
             @click="generateLog()"
             class="filter-item"
             type="primary"
-           
+            v-if="is_edit"
             size="small"
         >下载日志
-        </el-button>
+        </el-button> -->
         <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
         </el-button>
         <!-- <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
@@ -839,9 +838,6 @@ export default {
 
           })
 
-          console.log("tablelist020200220",this.tableList)
-          
-          
           const filename = '排班模版'
 
 

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -2,10 +2,9 @@
   <!-- 排班表填充内容 -->
     <div >
 
-      <div>
-          <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span>
+      <div >
+          <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>         
           <template v-if="schedulMode">
-            <br/>
             <span v-if="scheduleDetail.mode_name.length>0"  :class='modeColor(scheduleDetail.mode_name)' >{{'('+scheduleDetail.mode_name+')'}}</span>
           </template>
           <template v-if="schedulFlag">

src/xt_pages/workforce/components/editTableData.vue

@@ -54,11 +54,11 @@
           <el-table
               :row-style="{ color: '#303133' }"
               :header-cell-style="{
-            backgroundColor: 'rgb(245, 247, 250)',
-            color: '#606266',
-          }"
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266',
+              }"
               :data="patientList"
-              height="550"
+              height='600'
               border
               @row-click="patientClick"
               :cell-class-name="patientClass"
@@ -84,11 +84,11 @@
           <el-table
               :row-style="{ color: '#303133' }"
               :header-cell-style="{
-            backgroundColor: 'rgb(245, 247, 250)',
-            color: '#606266',
-          }"
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266',
+              }"
               :data="modes"
-              height="550"
+              height="600"
               :cell-class-name="dialysis_patient"
               ref="mode_table"
               @row-click="modeClick"
@@ -133,6 +133,13 @@
           >
           </el-option>
         </el-select>
+        <!-- 显示透析模式开关 -->
+        <el-switch
+          v-model="modename_value"
+          :active-value=true
+          active-text="显示透析模式"
+          @change="switchMode(modename_value)">
+        </el-switch>
         <!-- 编辑排班表格 -->
         <el-table
             :row-style="{ color: '#303133' }"
@@ -152,11 +159,11 @@
             :row-class-name="tableRowClassName"
             show-summary
             sum-text="总数"
-            :height="tableContainHeight"
+            height="calc(100% - 50px)"
             ref="table"
             style="table-layout: fixed;"
         >
-        <!-- :cell-style ='cellstyle' -->
+        <!-- :cell-style ='cellstyle' :height="tableContainHeight" calc(100% - 50px) 600-->
           <el-table-column
               prop="area"
               label="分区"
@@ -217,7 +224,8 @@
                         scope.row.index,
                         scope.row.Mon_M,
                         scope.row
-                      )" >
+                      )"
+                      :schedulMode="modename_value">
                   </schedule-item>
                 </div>
               </template>
@@ -247,24 +255,25 @@
                     @dragover="allowDrop"
                     @dragover.prevent
                 >
-                  <schedule-item
-                      :schedule-detail="scope.row.Mon_A"
-                      :draggable="isEditForDate('Mon_A')&&scope.row.Mon_A ? 'true' : 'false'"
-                      class="contitem"
-                      :style="{
-                      cursor: scope.row.Mon_A ? 'move' : 'default',
-                    }"
-                      @mouseover.native="
-                      drag(
-                        $event,
-                        'Mon_A',
-                        scope.row.index,
-                        scope.row.Mon_A,
-                        scope.row
-                      )"
-                  >
+                    <schedule-item
+                        :schedule-detail="scope.row.Mon_A"
+                        :draggable="isEditForDate('Mon_A')&&scope.row.Mon_A ? 'true' : 'false'"
+                        class="contitem"
+                        :style="{
+                        cursor: scope.row.Mon_A ? 'move' : 'default',
+                      }"
+                        @mouseover.native="
+                        drag(
+                          $event,
+                          'Mon_A',
+                          scope.row.index,
+                          scope.row.Mon_A,
+                          scope.row
+                        )"
+                        :schedulMode="modename_value"
+                    >
                   <!--   -->
-                </schedule-item>
+                    </schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -307,6 +316,7 @@
                         scope.row.Mon_N,
                         scope.row
                       )"
+                      :schedulMode="modename_value"
                   >
                   <!--  -->
                 </schedule-item>
@@ -316,7 +326,6 @@
           </el-table-column>
           <el-table-column
               :label="'周二 (' + weekTitle[1] + ')'"
-
               v-if="isShowTwo"
               align="center"
           >
@@ -358,8 +367,8 @@
                         scope.row.index,
                         scope.row.Tue_M,
                         scope.row
-                      )
-                    "
+                      )"
+                      :schedulMode="modename_value"
                   >
                   </schedule-item>
                 </div>
@@ -405,6 +414,7 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   ></schedule-item>
                 </div>
               </template>
@@ -449,6 +459,7 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   ></schedule-item>
                 </div>
               </template>
@@ -456,7 +467,6 @@
           </el-table-column>
           <el-table-column
               :label="'周三 (' + weekTitle[2] + ')'"
-
               v-if="isShowThree"
               align="center"
           >
@@ -485,6 +495,7 @@
                     @dragover="allowDrop"
                 >
                   <schedule-item
+                      :schedulMode="modename_value"
                       :schedule-detail="scope.row.Wed_M"
                       :draggable="isEditForDate('Wed_M')&&scope.row.Wed_M ? 'true' : 'false'"
                       class="contitem"
@@ -500,6 +511,7 @@
                         scope.row
                       )
                     "
+                    
                   ></schedule-item>
                 </div>
               </template>
@@ -544,6 +556,7 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   ></schedule-item>
                 </div>
               </template>
@@ -588,6 +601,7 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   ></schedule-item>
                 </div>
               </template>
@@ -639,6 +653,7 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   ></schedule-item>
                 </div>
               </template>
@@ -689,6 +704,7 @@
 
                       )
                     "
+                    :schedulMode="modename_value"
                   ></schedule-item>
                 </div>
               </template>
@@ -738,6 +754,7 @@
                            scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   ></schedule-item>
                 </div>
               </template>
@@ -785,9 +802,8 @@
                         scope.row
                       )
                     "
-                  >
-                   <!-- -->
-                  </schedule-item>
+                    :schedulMode="modename_value"
+                  ></schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -825,9 +841,8 @@
                         scope.row
                       )
                     "
-                  >
-                  <!--  -->
-                  </schedule-item>
+                    :schedulMode="modename_value"
+                  ></schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -869,6 +884,7 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   >
                   </schedule-item
                   >
@@ -920,9 +936,9 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   >
-                    </schedule-item
-                  >
+                  </schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -964,9 +980,9 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   >
-                    </schedule-item
-                  >
+                    </schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -1008,9 +1024,8 @@
                         scope.row
                       )
                     "
-                  >
-                  <!--  -->
-                    </schedule-item>
+                    :schedulMode="modename_value"
+                  ></schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -1062,9 +1077,10 @@
                         scope.row.index,
                         scope.row.Sun_M,
                         scope.row
-                      )">
-                    </schedule-item
+                      )"
+                      :schedulMode="modename_value"
                   >
+                  </schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -1111,6 +1127,7 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   >
                   </schedule-item>
                 </div>
@@ -1159,9 +1176,9 @@
                         scope.row
                       )
                     "
+                    :schedulMode="modename_value"
                   >
-                  </schedule-item
-                  >
+                  </schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -1791,7 +1808,7 @@
                 {{ data.day.split('-').slice(2).join('-') }} {{ data.isSelected ? '✔️' : ''}}<br/>
                 <span v-if="data.day.split('-').slice(1).join('-')=='11-27'">上午 门诊</span>
               </p>
-              
+
             </template>
           </el-calendar>
         </div>
@@ -1896,6 +1913,7 @@ export default {
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
       cishu_dialogVisible:false,//透析次数
+      modename_value:true,//关闭透析模式开关
       Dialysis_patient:'',
       cur_date:"",
       dataloading:false,
@@ -1998,7 +2016,7 @@ export default {
       ],
       value: "",
       patient_pre: [],
-      tableContainHeight:800,
+      // tableContainHeight:600,
       // tableHeight:'window.innerHeight - 0',
       // rowClass: "table-row-new-class schedule-table-row",
       searchKey: "",
@@ -2220,6 +2238,10 @@ export default {
     },
   },
   methods: {
+    // 关闭透析模式
+    switchMode(flag){
+      console.log(flag);
+    },
     // 透析次数
     chishuclick(row){
       this.cishu_dialogVisible=true
@@ -4637,7 +4659,7 @@ export default {
       getSchedulesOne(params).then((response) => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
-        
+
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
@@ -5566,7 +5588,7 @@ export default {
         }
       }
     },
- 
+
     getDialysisDate: function (row) {
       let week = "";
       switch (row.schedule_week) {
@@ -5760,6 +5782,7 @@ textarea{
 }
 .table_contain {
   display: flex;
+  height: 90vh;
 // justify-content: space-between;
 .left_contain {
   width: 14%;
@@ -5790,6 +5813,7 @@ textarea{
 }
 .right_contain {
   width: 86%;
+
   .el-table .cell{
   white-space: pre-wrap;
   padding: 0px 0px !important;

src/xt_pages/workforce/components/tableData.vue

@@ -10,6 +10,7 @@
             placeholder="请选择"
             multiple
            @change="changeWeekDay"
+           style="width: 120px;"
         >
           <el-option
               v-for="(item,index) in weeks"
@@ -26,6 +27,7 @@
             multiple
             placeholder="请选择"
             @change="changePartiton"
+            style="width: 120px;"
         >
           <el-option
               v-for="item in this.zones"
@@ -36,11 +38,28 @@
           </el-option>
         </el-select>
 
+        <span>班次：</span>
+        <el-select
+            v-model="scheduleType_val"
+            clearable
+            placeholder="请选择"
+            @change="scheduleType_change"
+            style="width: 120px;"
+        >
+          <!-- <el-option value=0 label="请选择"></el-option>   multiple-->
+          <el-option
+              v-for="item in this.scheduleType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+          >
+          </el-option>
+        </el-select>
 
       </div>
       <el-input
           size="small"
-          style="width: 200px;margin-left: 20px"
+          style="width: 120px;margin-left: 20px"
           class="filter-item"
           v-model.trim="keywords"
           placeholder="病人名称/透析号"
@@ -69,7 +88,6 @@
           :active-value=true
           active-text="显示透析模式"
           @change="switchMode(modename_value)">
-
         </el-switch>
       </div>
     </div>
@@ -151,7 +169,7 @@
       title="提示"
       :visible.sync="searchTableVisible"
       width="80%"
-      
+
       class="eldialog">
       <div style="position: relative;">
         <el-table
@@ -241,7 +259,7 @@
         :summary-method="getSummaries"
         show-summary
         :cell-class-name="cellClass"
-        
+
         sum-text="总数"
         :height="tableContainHeight"
         ref="table"
@@ -262,13 +280,13 @@
           align="center"
           min-width="40"
           fixed
-          
+
         ></el-table-column>
         <el-table-column
           :label="' 周一(' + weekTitle[0] + ')'"
           v-if="isShowOne"
           align="center"
-          
+
         >
         <!-- :width="flexColumnWidth('Mon_M',scheduleZone)" -->
           <el-table-column  prop="Mon_M" label="上" min-width="40" align="center"  v-if="isShowShangWu" >
@@ -549,7 +567,7 @@
             </el-select>
 
 
-           
+
 
 
           </el-form-item>
@@ -890,6 +908,7 @@ export default {
       strArr:"",
       patient_id_hover:0,
       now_time:"",
+      scheduleType_val:'',
       isShowOne:true,
       isShowTwo:true,
       isShowThree:true,
@@ -997,7 +1016,7 @@ export default {
     }
   },
   created() {
-    
+
     // sessionStorage.setItem('value1',!this.value1);
     sessionStorage.removeItem('value1')
     var date = new Date()
@@ -1045,9 +1064,27 @@ export default {
     // console.log('22222');
   },
   methods: {
-    // getnum(row,column, rowIndex, columnIndex){
-    //   console.log(row);
-    // },
+    // 班次选择
+    scheduleType_change(val){
+      console.log('vvvvvv',val);
+      if(val==1){
+        this.isShowShangWu = true
+        this.isShowXiaWu = false
+        this.isShowWanShang = false
+      }else if (val ==2){
+        this.isShowShangWu = false
+        this.isShowXiaWu = true
+        this.isShowWanShang = false
+      }else if (val == 3){
+        this.isShowShangWu = false
+        this.isShowXiaWu = false
+        this.isShowWanShang = true
+      }else {
+        this.isShowShangWu = true
+        this.isShowXiaWu = true
+        this.isShowWanShang = true
+      }
+    },
     switchThis(flag){
       if(this.value1==false){
          sessionStorage.removeItem('value1')
@@ -1350,7 +1387,7 @@ export default {
       // if(row[column.property].patient_id>0){
       //   console.log('qqqqq',row[column.property])
       // }
-     
+
       // console.log('wwwww',column)
       // console.log('eeeee',rowIndex)
       // console.log('rrrrr',columnIndex)
@@ -1358,8 +1395,8 @@ export default {
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
       // 机号蓝线
-      // if(columnIndex==1 ){  
-      //   return 'border_bott ' 
+      // if(columnIndex==1 ){
+      //   return 'border_bott '
       // }
       // if(columnIndex==0){
       //   return 'border_left'
@@ -1417,14 +1454,14 @@ export default {
     //       // console.log('33333333333');
     //       return 'border-top: 1px solid aqua;'
     //     }
-    //   } 
+    //   }
     // },
-   
+
     changeSearchContagion(id) {
       this.patientQuery.contagion = id;
       this.getSchedulePatients();
     },
-   
+
     // 合计
     getSummaries(param) {
       const { columns, data } = param;
@@ -1521,7 +1558,7 @@ export default {
         var Sun_M_One = []
         var Sun_A_One = []
         var Sun_N_One= []
-    
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Mon_A') == true){
           Mon_A.push(data[j].Mon_A.mode_name)
@@ -3295,7 +3332,7 @@ export default {
       this.searchTableVisible = false;
       this.msDialogVisible = true;
     },
-   
+
     // 分区
     getAllZones() {
       getAllZones().then(response => {
@@ -3474,7 +3511,7 @@ textarea{
   .evening_border{
     border-right: 1px solid aqua;
   }
-  
+
 }
 .backPurple{
   color: #f32424 !important;

src/xt_pages/workforce/components/template_table.vue

@@ -41,7 +41,7 @@
               <div
                 draggable="true"
                 @dragstart="curInfoDragStart"
-                class="item"
+                class="item_touz"
                 style="font-weight: bolder"
               >
                 <span>{{ cur_info.patient_name }}</span>
@@ -71,7 +71,6 @@
                     <el-table-column
                       prop="name"
                       label="患者名称"
-                      align="center"
                     >
                     </el-table-column>
                   </el-table>
@@ -4561,7 +4560,7 @@ export default {
     background-color: #ecf5ff !important;
     color: #3a8ee6 !important;
   }
-  .item{
+  .item_touz{
     width: 115px;
     padding: 6px 5px;
     margin: 0px 5px ;