添加透析耗材

src/api/stock.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function getWarehouseGoodInfo(type_id){
+  return request({
+    url:'/m/api/warehouse/query?type_id='+type_id,
+    method:'get',
+  })
+}

src/pages/main/dialog/AcceptsDialog.vue

@@ -48,6 +48,10 @@
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="2">严重</el-radio>
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>
           </el-form-item>
+          <el-form-item label-width="100dp" label="其他病情 : "
+                        v-if="isShow('其他病情')">
+            <el-input v-model="receiveTreatmentAsses.sick_condition_other" style="width: 400px"></el-input>
+          </el-form-item>
           <el-form-item label-width="100dp" label="跌倒风险评估评分 : "
                         v-if="isShow('跌倒风险评估评分')">
             <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
@@ -110,6 +114,7 @@
           nutrition: '1',
           psychological_assessment: '1',
           psychological_assessment_other: '',
+          sick_condition_other:'',
           score:'',
         },
         patient: {
@@ -149,6 +154,8 @@
               this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
               this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other
               this.receiveTreatmentAsses.score = this.accepts.score
+              this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
+
             }
           }
         })
@@ -164,7 +171,7 @@
           this.accepts.intake == 0 &&
           this.accepts.nutrition == 0 &&
           this.accepts.psychological_assessment == 0 &&
-          this.accepts.psychological_assessment_other == ''&&
+          this.accepts.psychological_assessment_other == ''&&this.accepts.sick_condition_other == ''&&
           this.accepts.score == ''
 
       ) {
@@ -190,6 +197,8 @@
                 this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
                 this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
                 this.receiveTreatmentAsses.score = this.accepts.score
+                this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
+
 
               }
             }
@@ -208,6 +217,8 @@
           this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
           this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
           this.receiveTreatmentAsses.score = this.accepts.score
+          this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
+
 
 
         }

src/pages/main/dialog/PrescriptionDialog.vue

@@ -158,8 +158,8 @@
 
           </div>
         </div>
-        <div class="item" v-if="isShow('电导率')">
-          <label class="name" for="dtl">电导率(mS/cm)</label>
+        <div class="item" v-if="isShow('电导度')">
+          <label class="name" for="dtl">电导度(mS/m)</label>
           <div class="content">
 
             <input type="tel" @focus="inputFocus" id="dtl" v-model="dialysisPrescription.conductivity"/>
@@ -220,7 +220,12 @@
           </div>
         </div>
 
-
+        <div  class="item"  v-if="isShow('目标KT/V')">
+          <label class="name" for="knj">目标KT/V</label>
+          <div class="content">
+            <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.target_ktv"/>
+          </div>
+        </div>
 
 
         <div @click="showSubMenu('blood_access')" class="item" ref="blood_access" v-if="isShow('血管通路')">
@@ -240,15 +245,14 @@
 
 
 
-        <!--<div @click="showSubMenu('consumable_material')" class="item" ref="consumable_material" v-if="config.is_open == 1">-->
-          <!--<label class="name" for="knj">透析耗材</label>-->
-          <!--<div class="content">-->
-            <!--<span class="text" id="knjaa">去配置</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
-          <!--</div>-->
-        <!--</div>-->
-
-
+        <div @click="dialysisGoodsClick()" class="item" ref="consumable_material" v-if="config.is_open == 1">
+          <label class="name" for="knj">透析耗材</label>
+          <div class="content">
+            <span class="text" id="knjaa" v-if="this.prescription_prop.id > 0">去修改</span>
+            <!--<span class="text" id="knjaa" v-else-if="this.prescription_prop.id.length == 0">去配置</span>-->
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
 
 
         <div class="item" style="display: none">
@@ -285,8 +289,9 @@
     </div>
     <!--<two-menu title="二级菜单" v-show="isShowModeSubMenu"></two-menu>-->
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"  v-on:menu-empty="menuEmpty"
-                        :propsForm="propForm"></check-box-sub-menu>
+                        :propsForm="propForm" ></check-box-sub-menu>
     <!--<multiple-sub-menu :goodTypes="types" :visibility="is_show" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></multiple-sub-menu>-->
+    <multiple-sub-menu :goodTypes="types" :info="info" :visibility="is_show"  v-on:menu-cancel-two="menuCancleTwo" v-on:menu-comfirm-two="menuComfirmTwo" :propsForm="propForm" :dialysisPrescription="dialysisPrescription"></multiple-sub-menu>
 
     <mt-datetime-picker
       ref="picker"
@@ -300,15 +305,12 @@
 
 
 
-
-
-
   </div>
 </template>
 
 <script>
   import CheckBoxSubMenu from "./subMenu/checkBoxSubMenu";
-  // import MultipleSubMenu from "./subMenu/multipleSubMenu"
+  import MultipleSubMenu from "./subMenu/multipleSubMenu"
   import {commitDialysisPrescription, postSign, postSolution} from "@/api/dialysis";
   import {Toast} from 'vant';
   import {getDataConfig} from '@/utils/data';
@@ -338,6 +340,12 @@
           return new Array();
         }
       },
+      info:{
+        type:Array,
+        default: function () {
+          return new Array();
+        }
+      },
       prescription_prop: {
         type: Object,
       },
@@ -363,7 +371,7 @@
         displaceLiquiPartOptions:[],
         bloodAccessOptions:[],
 
-
+        is_show:false,
 
         perfusion_apparatus: {},
         replacementWays: [],
@@ -416,6 +424,14 @@
           blood_access:"",
           ultrafiltration:"",
           body_fluid_other:"",
+          niprocart:'',
+          jms:'',
+          fistula_needle_set:'',
+          fistula_needle_set_16:'',
+          hemoperfusion:'',
+          dialyser_sterilised:'',
+          filtryzer:'',
+          target_ktv:'',
         },
         anticoagulant: {
           id: 0,
@@ -928,10 +944,28 @@
         } else {
           return '0.0';
         }
+      },dialysisGoodsClick:function () {
+        this.isShowDialog = false
+        this.is_show = true
+      },menuCancleTwo:function () {
+        this.isShowDialog = true
+        this.is_show = false
+
+      },menuComfirmTwo:function (dialysisPrescription) {
+        this.isShowDialog = true
+        this.is_show = false
+        this.dialysisPrescription.niprocart = dialysisPrescription.niprocart
+        this.dialysisPrescription.jms = dialysisPrescription.jms
+        this.dialysisPrescription.fistula_needle_set = dialysisPrescription.fistula_needle_set
+        this.dialysisPrescription.fistula_needle_set_16 = dialysisPrescription.fistula_needle_set_16
+        this.dialysisPrescription.hemoperfusion = dialysisPrescription.hemoperfusion
+        this.dialysisPrescription.dialyser_sterilised = dialysisPrescription.dialyser_sterilised
+        this.dialysisPrescription.filtryzer = dialysisPrescription.filtryzer
 
       }
     },
     created() {
+
       if (this.$store.getters.user.user.user_type == 2) {
         this.isShowSign = true;
 
@@ -1020,6 +1054,7 @@
     },
 
     components: {
+      MultipleSubMenu,
       // MultipleSubMenu,
       CheckBoxSubMenu
     }

src/pages/main/dialog/new_order/single_option_dialog.vue

@@ -73,9 +73,10 @@ export default {
   background: #fff;
   max-height: 10.6rem;
   min-height: 5rem;
-  overflow-y: scroll;
   ul {
-    li {
+  overflow-y: scroll;
+  max-height: 9.0rem;
+  li {
       height: 1rem;
       line-height: 1rem;
       border-bottom: 1px #e5e5e5 solid;

src/pages/main/dialog/subMenu/checkBoxSubMenu.vue

@@ -101,6 +101,8 @@ export default {
   min-height: 5rem;
   overflow-y: scroll;
   ul {
+  overflow-y: scroll;
+  max-height: 9.0rem;
     li {
       height: 1.1rem;
       line-height: 1.1rem;

src/pages/main/dialog/subMenu/multipleSubMenu.vue

@@ -1,44 +1,295 @@
-<!--<template>-->
-  <!--<div class="Dialog">-->
-    <!--<div class="DialogTit">-->
-      <!--<span class="iconfont" @click="closeDialog()">&#xe720; 返回</span>-->
-      <!--<h1 class="name">透析耗材</h1>-->
-      <!--<span class="success">完成</span>-->
-    <!--</div>-->
-
-    <!--<div class="item"  v-for="item in goodTypes" :key="item.id" value="item" @click="itemClick(item.id)">-->
-      <!--<label class="name" for="knj">{{item.type_name}}</label>-->
-      <!--<div class="content">-->
-        <!--<span class="text" id="knjaa"></span>-->
-        <!--<span class="iconfont">&#xe6f9;</span>-->
-      <!--</div>-->
-    <!--</div>-->
-  <!--</div>-->
-
-  <!--<check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"  v-on:menu-empty="menuEmpty"-->
-                      <!--:propsForm="propForm"></check-box-sub-menu>-->
-
-<!--</template>-->
-
-<!--<script>-->
-  <!--export default {-->
-    <!--name: 'multipleSubMenu',-->
-    <!--props: {-->
-      <!--goodTypes: {-->
-        <!--type: Array,-->
-        <!--default: function () {-->
-          <!--return new Array();-->
-        <!--}-->
-      <!--}-->
-    <!--},methods:{-->
-      <!--itemClick(type_id){-->
-
-      <!--}-->
-
-    <!--}-->
-  <!--}-->
-<!--</script>-->
-
-<!--<style scoped>-->
-
-<!--</style>-->
+<template>
+  <div>
+    <div v-if="visibility" class="Dialog">
+      <div class="DialogTit">
+        <span class="iconfont" @click="closeDialog()">&#xe720; 返回</span>
+        <h1 class="name">透析耗材</h1>
+        <span class="success">完成</span>
+      </div>
+      <div class="DialogContent" id="dialogTop">
+        <div class="item" value="item" @click="itemClick(83,'niprocart')" ref="niprocart">
+          <label class="name">血液透析干粉</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.niprocart)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(80,'jms')" ref="jms">
+          <label class="name">一次性使用动静脉穿刺针</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.jms)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(81,'fistula_needle_set')" ref="fistula_needle_set">
+          <label class="name">内瘘管翼状针</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.fistula_needle_set)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(82,'fistula_needle_set_16')" ref="fistula_needle_set_16">
+          <label class="name">内瘘管翼状针16G</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.fistula_needle_set_16)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(85,'hemoperfusion')" ref="hemoperfusion">
+          <label class="name">一次性使用血液灌流器</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.hemoperfusion)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(84,'dialyser_sterilised')" ref="dialyser_sterilised">
+          <label class="name">空心纤维血液透析器</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.dialyser_sterilised)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(79,'filtryzer')" ref="filtryzer">
+          <label class="name">中空纤维透析器</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.filtryzer)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <new-check-box-sub-menu :show="is_show" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"
+                            v-on:menu-empty="menuEmpty"
+                            :propsForm="propForm"></new-check-box-sub-menu>
+  </div>
+</template>
+
+<script>
+  import {getWarehouseGoodInfo} from '@/api/stock'
+
+  import NewCheckBoxSubMenu from './newCheckBoxSubMenu'
+
+  export default {
+    name: 'multipleSubMenu',
+    components: {NewCheckBoxSubMenu},
+    data () {
+      return {
+        is_show: false,
+        propForm: {
+          title: '',
+          list: [],
+          optionList: [],
+          isMultiple: 2,
+          result: [], //选中的值
+          type: 1, //用来区分不同子菜单，方便对返回值进行赋值
+          selectId: 0
+        }
+      }
+    },
+
+    props: {
+      dialysisPrescription: {
+        type: Object,
+      },
+      info: {
+        type: Array,
+        default: function () {
+          return new Array()
+        }
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      }
+    }, methods: {
+      success: function () {
+        this.$emit('menu-comfirm-two', this.dialysisPrescription)
+      }, closeDialog () {
+        this.$emit('menu-cancel-two')
+      },
+      itemClick (type_id, name) {
+        getWarehouseGoodInfo(type_id).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            switch (name) {
+              case 'niprocart':
+                this.propForm.type = 1
+                this.propForm.title = '血液透析干粉'
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.niprocart
+                this.propForm.click_ref = 'niprocart'
+                this.is_show = true
+                this.visibility = false
+
+                break
+              case 'jms':
+                this.propForm.type = 2
+                this.propForm.title = '一次性使用动静脉穿刺针'
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.jms
+                this.propForm.click_ref = 'jms'
+                this.is_show = true
+                this.visibility = false
+
+                break
+
+              case 'fistula_needle_set':
+                this.propForm.type = 3
+                this.is_show = true
+                this.visibility = false
+                this.propForm.title = '内瘘管翼状针'
+
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.fistula_needle_set
+                this.propForm.click_ref = 'perfusion_apparatus'
+
+                break
+              case 'fistula_needle_set_16':
+                this.propForm.type = 4
+                this.is_show = true
+                this.visibility = false
+                this.propForm.title = '内瘘管翼状针16G'
+
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.fistula_needle_set_16
+                this.propForm.click_ref = 'fistula_needle_set_16'
+
+                break
+
+              case 'hemoperfusion':
+                this.propForm.type = 5
+
+                this.propForm.title = '一次性使用血液灌流器'
+                this.is_show = true
+                this.visibility = false
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.hemoperfusion
+                this.propForm.click_ref = 'hemoperfusion'
+                break
+              case 'dialyser_sterilised':
+                this.propForm.type = 6
+
+                this.propForm.title = '空心纤维血液透析器'
+                this.is_show = true
+                this.visibility = false
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.dialyser_sterilised
+                this.propForm.click_ref = 'dialyser_sterilised'
+                break
+              case 'filtryzer':
+                this.propForm.type = 7
+                this.is_show = true
+                this.visibility = false
+                this.propForm.title = '中空纤维透析器'
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.filtryzer
+                this.propForm.click_ref = 'filtryzer'
+                break
+
+            }
+          }
+        })
+      }, getValue (id) {
+        if (id == 0 || id == '') {
+          return ''
+        }
+        for (let i = 0; i < this.info.length; i++) {
+          if (this.info[i].id == id) {
+            return this.info[i].specification_name
+          }
+        }
+      }, menuCancle: function () {
+        this.is_show = false
+        this.visibility = true
+      }, menuComfirm: function (val) {
+        this.is_show = false
+        this.visibility = true
+        this.$nextTick(() => {
+          if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
+            this.$refs[this.propForm.click_ref].scrollIntoView()
+          }
+        })
+        switch (val.type) {
+          case 1:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.niprocart = val.selectId
+            }
+            break
+          case 2:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.jms = val.selectId
+            }
+            break
+          case 3:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.fistula_needle_set = val.selectId
+            }
+            break
+          case 4:
+            if (val.selectId != -2) {
+
+              this.dialysisPrescription.fistula_needle_set_16 = val.selectId
+            }
+            break
+          case 5:
+            if (val.selectId != -2) {
+
+              this.dialysisPrescription.hemoperfusion = val.selectId
+            }
+            break
+          case 6:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.dialyser_sterilised = val.selectId
+            }
+            break
+          case 7:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.filtryzer = val.selectId
+            }
+            break
+        }
+      },
+
+    }
+  }
+</script>
+
+<style style="stylesheet/scss" scoped>
+  .DialogContent {
+  // padding-bottom:2rem !important;
+
+  .textarea {
+  width: 100%;
+  height: 2.4rem;
+  line-height: 0.6rem;
+  color: $pgh-color;
+  font-size: 0.28rem;
+  padding-left: 0.36rem;
+  border: none;
+  border-bottom: 1px #e5e5e5 solid;
+  }
+  }
+</style>

src/pages/main/dialog/subMenu/newCheckBoxSubMenu.vue

@@ -0,0 +1,123 @@
+<template>
+  <div v-if="show" class="Dialog">
+    <div class="DialogTit">
+      <div class="back" @click="cancle()"><span class="iconfont" >&#xe720; </span>返回</div>
+      <h1 class="name">{{propsForm.title}}</h1>
+      <span  @click="comfirm" class="success">  </span>
+    </div>
+    <div  class="optionsBox">
+      <div class="list">
+        <ul>
+          <li  @click="itemClick(-2)"  :key="-2" value="-2" >请选择</li>
+          <li  @click="itemClick(item.id)"  v-for="item in propsForm.optionList" :key="item.id" value="item" :class="propsForm.selectId == item.id? 'tick':'' ">{{item.name}}</li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
+
+
+<script>
+
+  export default {
+    name: "newCheckBoxSubMenu",
+    created() {},
+    data() {
+      return {
+        result: [],
+        id: 0,
+        selectName: ""
+      };
+    },
+    props: {
+      propsForm: {
+        type: Object
+      },
+      show: {
+        type: Boolean,
+        default: false
+      }
+    },
+    methods: {
+      cancle: function() {
+        this.$emit("menu-cancle");
+      },
+      comfirm: function() {
+        this.$emit("menu-comfirm", this.getValue());
+      },
+      getValue: function() {
+        let form = {};
+        if (this.propsForm.isMultiple == 2) {
+          form["type"] = this.propsForm.type;
+          form["result"] = this.propsForm.result;
+          // form["click_ref"] = this.propsForm.click_ref
+        } else {
+          form["type"] = this.propsForm.type;
+          form["selectId"] = this.propsForm.selectId;
+          // form["click_ref"] = this.propsForm.click_ref
+        }
+        return form;
+      },
+      itemClick: function(id) {
+        if(id == -2){
+          this.$emit("menu-empty", this.getValue());
+        }
+        this.propsForm.selectId = id;
+        this.$emit("menu-comfirm", this.getValue());
+      }
+    },
+    watch: {
+      visibility(val) {
+        //初始化数据操作
+      }
+    }
+  };
+
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10.6rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  ul {
+  li {
+  height: 1.1rem;
+  line-height: 1.1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  font-size: 0.36rem;
+  color:$title-color;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 6.8rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -77,7 +77,7 @@
                   <check-box text="昏迷" :checked="receiverTreatmentAccess.consciousness==3?true:false"></check-box>
                 </div>
                 <div class="inline_block"  style="margin-left: 20px;">
-                  出血：
+                  活动性出血：
                   <check-box text="无" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
                   <check-box text="异常" :checked="predialysis.is_hemorrhage==1?true:false"></check-box>
                   （&nbsp;

src/pages/main/today/TodayTab.vue

@@ -107,7 +107,7 @@
 
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
       <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
-                           :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators" :types="goodTypes"
+                           :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators" :types="goodTypes" :info="goodInfos"
                            @close="closePrescriptionDialog" @prescription="prescriptionFunc" @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
@@ -289,6 +289,7 @@ export default {
       scrollTop: "",
       goTopShow: false,
       goodTypes:[],
+      goodInfos:[],
     };
   },
   computed: {
@@ -454,7 +455,8 @@ export default {
         monitor.diastolic_blood_pressure;
       this.monitor_records[monitor_index].systolic_blood_pressure =
         monitor.systolic_blood_pressure;
-
+      this.monitor_records[monitor_index].conductivity =
+        monitor.conductivity;
       this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
 
       // if (monitor_index >= 0) {

src/pages/main/today/acceptsAssessment.vue

@@ -30,6 +30,7 @@
           <label>病情 </label>
           <span class="content">{{sickCondition}} </span>
         </li>
+
         <li style="height: 0.6rem;" v-if="isShow('跌倒风险评估评分')">
           <label>跌倒风险评估评分:</label>
           <span class="content">{{this.record.score}}分</span>
@@ -46,7 +47,6 @@
       <!-- </ul>
 
 
-
       <ul > -->
         <li style="height: 0.6rem;" v-if="isShow('营养状况')">
           <label>营养状况:</label>
@@ -60,6 +60,10 @@
           <label>心理评估异常原因:</label>
           <span class="content">{{this.record.psychological_assessment_other}}</span>
         </li>
+        <li style="height: 0.6rem;" v-if="isShow('其他病情')">
+          <label>其他病情 </label>
+          <span class="content">{{this.record.sick_condition_other}} </span>
+        </li>
       </ul>
 
 

src/pages/main/today/dialysisMonitoring.vue

@@ -4,12 +4,12 @@
     <div class="dm" style="width:100%;overflow:hildden;overflow-x:auto;">
       <table  class="table" style="">
         <tr>
-          <th  v-if="isShow('监测时间')" width="124px">时间</th>
+          <th v-if="isShow('监测时间')" width="124px">时间</th>
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
           <th v-if="isShow('脉搏')" width="80px">脉率(次/分)</th>
           <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
-          <th  width="76px">静脉压/动脉压(mmHg)</th>
+          <th width="76px">静脉压/动脉压(mmHg)</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
           <th v-if="isShow('超滤量')" width="76px">超滤量(L)</th>
@@ -17,6 +17,7 @@
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
           <th v-if="isShow('置换量')"  width="92px">置换量(L)</th>
+          <th v-if="isShow('电导度')"  width="92px">电导度(mS/m)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
           <th v-if="isShow('结果')" width="92px">结果</th>
@@ -35,6 +36,7 @@
           <td v-if="isShow('透析液温度')">{{item.dialysate_temperature?item.dialysate_temperature:''}}</td>
           <td v-if="isShow('置换率')">{{item.replacement_rate?item.replacement_rate:''}}</td>
           <td v-if="isShow('置换量')">{{item.displacement_quantity?item.displacement_quantity:''}}</td>
+          <th v-if="isShow('电导度')" >{{item.conductivity?item.conductivity:''}}</th>
           <td v-if="isShow('病情变化')">{{item.symptom}}</td>
           <td v-if="isShow('处理')">{{item.dispose}}</td>
           <td v-if="isShow('结果')">{{item.result}}</td>

src/pages/main/today/dialysisPrescription.vue

@@ -94,11 +94,7 @@
           <span class="content">{{dialysate_flow != '0'?dialysate_flow:""}}</span>
           <span class="unit">{{dialysate_flow != '0'?"ml/min":""}}</span>
         </li>
-        <li v-if="isShow('电导率')">
-          <label>电导率 : </label>
-          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
-          <span class="unit">{{conductivity != '0'?"mS/cm":""}}</span>
-        </li>
+
       <!-- </ul>
       <ul> -->
         <li v-if="isShow('透析器/灌流器')">
@@ -137,6 +133,17 @@
           <span class="unit">{{ultrafiltration != '0'?"L":""}}</span>
 
         </li>
+        <li v-if="isShow('目标KT/V')">
+          <label>目标KT/V: </label>
+          <span class="content">{{target_ktv != '0'? target_ktv:''}}</span>
+        </li>
+
+        <li v-if="isShow('电导度')">
+          <label>电导度 : </label>
+          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
+          <span class="unit">{{conductivity != '0'?"mS/m":""}}</span>
+        </li>
+
       </ul>
     </div>
     <div class="note">备注 : <span>{{note}}</span></div>
@@ -299,10 +306,7 @@ export default {
 
 
     },
-    // dry_weight: function() {
-    //   var v = this.getValueStr("dry_weight", "dry_weight")
-    //   return v.length == 0 ? "0" : v
-    // },
+
     conductivity: function() {
       var v = this.getValueStr("conductivity", "conductivity")
       return v.length == 0 ? "0" : v
@@ -358,14 +362,13 @@ export default {
         }
       }
       return displace_liqui_part + displace_liqui_value+"L"
-
     },ultrafiltration:function () {
       var v = this.getValueStr("ultrafiltration", "ultrafiltration")
       v = this.getFloat(v)
       return v.length == 0 ? "0" : v
-
-
-
+    },target_ktv:function () {
+      var v = this.getValueStr("target_ktv", "target_ktv")
+      return v.length == 0 ? "0" : v
     }
   },
   created() {

src/pages/waitingRoom/components/dialysisContent.vue

@@ -68,7 +68,7 @@ export default {
           { value: 0, text: "全部分区" }
         ]
       },
-      
+
       selected_date: new Date(),
 
       dialysis_scheduals: [],
@@ -81,7 +81,7 @@ export default {
     filtedScheduals: function() {
       if (this.selected_zone[0].value == 0) {
         return this.dialysis_scheduals
-        
+
       } else {
         var zone_name = this.selected_zone[0].text
         for (let index = 0; index < this.dialysis_scheduals.length; index++) {
@@ -193,6 +193,7 @@ export default {
     @include display-flex;
     @include justify-content-center;
     @include text-align;
+    /*overflow-y:scroll;*/
     width: 60%;
     margin: 0 auto;
     .list {