修改华侨医院bug

src/pages/main/PrintIndex.vue

@@ -6,9 +6,9 @@
         <div class="goBack">
           <span class="back" @click="backAction()"><span class="iconfont">&#xe720;</span>返回</span>
         </div>
-        <div class="print" style="float: right">
-          <el-button size="mini" type="primary" icon="el-icon-printer" @click="printThisPage">打印</el-button>
-        </div>
+        <!--<div class="print" style="float: right">-->
+          <!--&lt;!&ndash;<el-button size="mini" type="primary" icon="el-icon-printer" @click="printThisPage">打印</el-button>&ndash;&gt;-->
+        <!--</div>-->
       </div>
       <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id != 2"> </DialysisPrintOrderOne>
       <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 2"></DialysisPrintOrderTwo>
@@ -145,12 +145,12 @@ export default {
       }
       return "";
     },
-    printThisPage() {
-      var xtdate = this.$route.query.xtdate;
-      this.$router.push(
-        "/Prints?xtdate=" + xtdate + "&xtno=" + this.$route.query.xtno
-      );
-    },
+    // printThisPage() {
+    //   var xtdate = this.$route.query.xtdate;
+    //   this.$router.push(
+    //     "/Prints?xtdate=" + xtdate + "&xtno=" + this.$route.query.xtno
+    //   );
+    // },
     backAction() {
       this.$router.back(-1);
     },

src/pages/main/WaitingArea.vue

@@ -64,7 +64,9 @@
     getSelectedAreaDataConfigList,
     getSelectedTimesDataConfigList,
     setSelectedAreaDataConfigList,
-    setSelectedTimesDataConfigList
+    setSelectedTimesDataConfigList,
+    setWaitTypeSelectedConfig,
+    getWaitTypeSelectedConfig,
   } from '@/utils/data_config'
 
   export default {
@@ -233,7 +235,7 @@
     created () {
       var area = getSelectedAreaDataConfigList()
       var time = getSelectedTimesDataConfigList()
-
+      var type = getWaitTypeSelectedConfig()
 
 
       if (area != null){
@@ -247,7 +249,10 @@
         this.select_index = -1
         this.time_options_visible = false
       }
+      if(type != null){
+        this.select_index = parseInt(type)
 
+      }
 
       this.requestScheduals()
     },
@@ -275,6 +280,10 @@
         this.select_index = tabIndex
         this.zone_selected = 0
         this.time_selected = 0
+        setSelectedAreaDataConfigList(this.zone_selected)
+        setSelectedTimesDataConfigList(this.time_selected)
+        setWaitTypeSelectedConfig(tabIndex)
+
 
       },
       handleZoneChange: function (index) {

src/pages/main/dialog/MonitDialog.vue

@@ -294,7 +294,6 @@ export default {
     // );
     // this.form.monitor_date = parseInt((new Date(date.getFullYear, date.getMonth, date.getDate, 0, 0, 0, 0)).getTime()) //parseTime(date, "{y}-{m}-{d}") + " 00:00:00"
     this.form.monitor_date = date;
-
     this.form.operate_time = this.pickertime.getTime();
   },
   methods: {
@@ -663,18 +662,14 @@ export default {
       var y = newDate.getFullYear();
       var m = newDate.getMonth() + 1;
       var d = newDate.getDate();
-      if (isNaN(y) || isNaN(m) || isNaN(d)) {
-        newDate = new Date();
-        y = newDate.getFullYear();
-        m = newDate.getMonth() + 1;
-        d = newDate.getDate();
-      }
       var record_date =
         y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
-
       this.form.monitor_date = Math.round(
         new Date(record_date + " 00:00:00").getTime() / 1000
       );
+      // alert(record_date+"))))")
+
+
       var nowTime = new Date();
       // this.form.monitor_time = parseTime(nowTime, "{h}:{i}");
       // this.monitor_time_str = this.handleTime(nowTime);
@@ -804,6 +799,7 @@ export default {
       params.dispose = this.form.dispose;
       params.result = this.form.result;
       params.monitoring_nurse = this.form.monitoring_nurse;
+
       addMonitorRecord(params)
         .then(rs => {
           var resp = rs.data;

src/pages/main/dialog/PrescriptionDialog.vue

@@ -240,6 +240,15 @@
 
 
 
+        <!--<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 class="item" style="display: none">
@@ -268,7 +277,7 @@
         <!--处方医生：刘小军 医生-->
         <!--</div>-->
         <div class="PrescSubmit">
-          <button v-if="isShowSign"  class="tj" @click="sign()">医生签名</button>
+          <button style="display: none"  class="tj" @click="sign()">医生签名</button>
           <button class="tjcq" @click="commitSolutionInfo">保存并设为长期处方</button>
           <button class="tj" @click="commitInfo">保存</button>
         </div>
@@ -277,6 +286,7 @@
     <!--<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>
+    <!--<multiple-sub-menu :goodTypes="types" :visibility="is_show" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></multiple-sub-menu>-->
 
     <mt-datetime-picker
       ref="picker"
@@ -286,11 +296,19 @@
       @confirm="handleTimeConfirm"
       v-model="time">
     </mt-datetime-picker>
+
+
+
+
+
+
+
   </div>
 </template>
 
 <script>
   import CheckBoxSubMenu from "./subMenu/checkBoxSubMenu";
+  // import MultipleSubMenu from "./subMenu/multipleSubMenu"
   import {commitDialysisPrescription, postSign, postSolution} from "@/api/dialysis";
   import {Toast} from 'vant';
   import {getDataConfig} from '@/utils/data';
@@ -305,12 +323,21 @@
       solution_prop: {
         type: Object
       },
+      config: {
+        type: Object
+      },
       operators:{
         type:Array,
         default: function () {
           return new Array();
         }
       },
+      types:{
+        type:Array,
+        default: function () {
+          return new Array();
+        }
+      },
       prescription_prop: {
         type: Object,
       },
@@ -417,6 +444,7 @@
         }
       };
     },
+
     methods: {
       isShow(name){
         var filedList = this.$store.getters.user.fileds
@@ -884,6 +912,23 @@
             break;
         }
 
+      },getFloat: function(x) {
+        if (x != '.') {
+          var f = Math.round(x * 100) / 100;
+          var s = f.toString();
+          var rs = s.indexOf('.');
+          if (rs <= 0) {
+            rs = s.length;
+            s += '.';
+          }
+          while (s.length <= rs + 1) {
+            s += '0';
+          }
+          return s;
+        } else {
+          return '0.0';
+        }
+
       }
     },
     created() {
@@ -964,11 +1009,18 @@
         }
 
       }
+      this.dialysisPrescription.kalium = this.getFloat(this.dialysisPrescription.kalium )
+      this.dialysisPrescription.sodium = this.getFloat(this.dialysisPrescription.sodium )
+      this.dialysisPrescription.calcium = this.getFloat(this.dialysisPrescription.calcium )
+      this.dialysisPrescription.ultrafiltration = this.getFloat(this.dialysisPrescription.ultrafiltration )
+      this.dialysisPrescription.target_ultrafiltration = this.getFloat(this.dialysisPrescription.target_ultrafiltration )
+
 
 
     },
 
     components: {
+      // MultipleSubMenu,
       CheckBoxSubMenu
     }
   };

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

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

src/pages/main/today/TodayTab.vue

@@ -106,8 +106,8 @@
     </van-popup> -->
 
     <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"
-                           :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
+      <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
+                           :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators" :types="goodTypes"
                            @close="closePrescriptionDialog" @prescription="prescriptionFunc" @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
@@ -256,6 +256,7 @@ export default {
         { value: "9", label: " 透后评估", showPopup: false },
         { value: "10", label: " 治疗小结", showPopup: false }
       ],
+      config:{},//库存自动扣减
       operators: [], //操作人
       patient: {}, // 患者信息
       schedual: {}, // 患者排班信息
@@ -286,7 +287,8 @@ export default {
       device_map: {}, // {device_id: device}
       device_number_map: {}, // {device_number_id: device_number}
       scrollTop: "",
-      goTopShow: false
+      goTopShow: false,
+      goodTypes:[],
     };
   },
   computed: {
@@ -754,6 +756,9 @@ export default {
 
           var special_premission = resp.data.special_premission // 特殊权限
 
+          var config = resp.data.config // 库存自动扣减配置
+
+          var types = resp.data.types // 所有系统库存商品类型
 
           var last_predialysis_evaluation =
             resp.data.last_predialysis_evaluation; // 上一次透前评估
@@ -778,6 +783,9 @@ export default {
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
           this.special_premission = special_premission
+          this.config = config
+          this.goodTypes = types
+
 
           if (this.doctor_advices.length > 0) {
             var group = this.newAdviceGroupObject();

src/pages/main/today/dialysisPrescription.vue

@@ -168,7 +168,7 @@ export default {
   computed: {
     target_ultrafiltration:function(){
       var v = this.getValueStr("target_ultrafiltration", "target_ultrafiltration")
-      console.log(v)
+      v = this.getFloat(v)
       return v.length == 0 ? "0" : v
     },
     dialysis_mode: function() {
@@ -361,7 +361,11 @@ export default {
 
     },ultrafiltration:function () {
       var v = this.getValueStr("ultrafiltration", "ultrafiltration")
+      v = this.getFloat(v)
       return v.length == 0 ? "0" : v
+
+
+
     }
   },
   created() {

src/pages/waitingRoom/components/details.vue

@@ -178,6 +178,7 @@ export default {
           this.monitor_records = monitor_records == null ? {} : monitor_records
           this.dialysis_order = dialysis_order == null ? {id: ""} : dialysis_order
           this.special_premission = special_premission
+          this.config = config
 
           this.$refs.patient_info.setPatientInfo(this.patient, this.schedual.device_number.number)
           this.$refs.patient_detail.setPatientInfo(this.patient, this.schedual.device_number.number)

src/pages/waitingRoom/components/dialysisPrescription.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="plate-box">
-    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2> 
-    <div class="plate">   
+    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
+    <div class="plate">
       <ul>
         <li>
           <label>透析模式 : </label>
@@ -160,6 +160,9 @@ export default {
     solution: {
       type: Object,
     },
+    config: {
+      type: Object,
+    },
   },
   // watch: {
   //   prescription: function() {
@@ -294,7 +297,7 @@ export default {
     //     this.row2[4].content = "0"
     //     this.row2[5].content = "0"
     //     this.row2[6].content = "0"
-        
+
     //     this.row3[0].content = "0"
     //     this.row3[1].content = "0"
     //     this.row3[2].content = ""
@@ -304,7 +307,7 @@ export default {
     //     this.row3[6].content = "0"
 
     //     this.note = ""
-        
+
     //   } else if (prescription != null) {
     //     this.row1[0].content = prescription.mode_id
     //     this.row1[1].content = prescription.perfusion_apparatus
@@ -321,7 +324,7 @@ export default {
     //     this.row2[4].content = prescription.sodium
     //     this.row2[5].content = prescription.glucose
     //     this.row2[6].content = prescription.dialysate_temperature
-        
+
     //     this.row3[0].content = prescription.dialyzer
     //     this.row3[1].content = prescription.prescription_dewatering
     //     this.row3[2].content = prescription.anticoagulant
@@ -348,7 +351,7 @@ export default {
     //     this.row2[4].content = solution.sodium
     //     this.row2[5].content = solution.glucose
     //     this.row2[6].content = solution.dialysate_temperature
-        
+
     //     this.row3[0].content = solution.dialyzer
     //     this.row3[1].content = solution.prescription_dewatering
     //     this.row3[2].content = solution.anticoagulant

src/utils/data_config.js

@@ -13,6 +13,7 @@ const dialysisTimeConfigKey = 'dialysis_time_config'
 const dialysisOrWaitConfigKey = 'dialysis_or_wait_config'
 
 
+const WaitTypeConfigKey = 'wait_type_config'
 
 
 export function getDataConfigList() {
@@ -89,3 +90,13 @@ export function setDialysisOrWaitSelectedConfig(value) {
 export function getDialysisOrWaitSelectedConfig() {
   return window.sessionStorage.getItem(dialysisOrWaitConfigKey)
 }
+
+
+export function setWaitTypeSelectedConfig(value) {
+  window.sessionStorage.setItem(WaitTypeConfigKey, value)
+}
+
+
+export function getWaitTypeSelectedConfig() {
+  return window.sessionStorage.getItem(WaitTypeConfigKey)
+}