Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/home/login.vue

           >
             登录
           </button>
-          <router-link to="/forgetPassword">
-            <div class="newForget">忘记密码</div>
-          </router-link>
+          <!-- <router-link to="/forgetPassword"> -->
+          <div class="newForget" @click="ok">忘记密码</div>
+          <!-- </router-link> -->
           <!-- </router-link> -->
           <!-- <div class="forget">
           <a href="">免密码登录</a>
 import { loginByPwd } from "@/api/login";
 import { hex_md5 } from "@/utils/md5";
 import { getLoginInfoCache, cacheLoginInfo } from "@/utils/admin_info_cache";
+import { Toast } from "vant";
 
 export default {
   name: "Home",
     },
     to: function() {
       this.$router.push({ path: "/forgetPassword" });
+    },
+    ok() {
+      Toast.success("程序员还在开发中");
     }
   }
 };

src/pages/main/PatientBox.vue

   width: 47%;
   margin: 0 3% 0.5rem 0;
   float: left;
+  border-radius: 5px;
   @media only screen and (max-width: 415px) {
     width: 96% !important;
   }

src/pages/main/dialog/AcceptsDialog.vue

         <span class="success" @click="commitInfo">保存</span>
       </div>
       <div class="DialogContent choose">
-        <el-form :model="receiveTreatmentAsses" label-width="130px">
+        <el-form
+          class="acceptsForm"
+          :model="receiveTreatmentAsses"
+          label-width="130px"
+        >
           <el-form-item label="入室方式: " v-if="isShow('入室方式')">
             <el-radio v-model="receiveTreatmentAsses.way" label="1"
               >步行</el-radio
 }
 </style>
 <style lang="scss">
-.el-radio {
-  margin-right: 26px;
-  width: 2.4rem;
+.acceptsForm {
+  .el-radio {
+    margin-right: 20px;
+    width: 2.4rem;
+  }
 }
+
 .el-radio__inner {
   width: 20px;
   height: 20px;
+  @media only screen and (min-width: 768px) {
+    width: 26px;
+    height: 26px;
+    margin-bottom: 4px;
+  }
 }
 .illnessInput {
   .el-input__inner {
+    font-size: 0.45rem;
     @media only screen and (min-width: 768px) {
       height: 60px;
       line-height: 60px;

src/pages/main/dialog/ComputerDialog.vue

           return false;
         } else {
           Toast.success("修改成功");
+          this.$emit('did_add_monitor', monitor)
           this.$emit("did_start", response.data.data.dialysis_order);
           var record = this.record;
           for (const key in response.data.data.dialysis_order) {

src/pages/main/dialog/DoubleDialog.vue

       <div style="height: 8rem" class="DialogContent choose">
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
-          label-width="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="透析物品核查 : ">
             <el-radio v-model="doubleReview.dialysis_item_check" label="1"
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
-            <el-input v-model="doubleReview.dialysis_item_desc"></el-input>
+          <el-form-item label="差错描述 : " label-width="3.4rem">
+            <el-input
+              class="doubleInput"
+              v-model="doubleReview.dialysis_item_desc"
+            ></el-input>
           </el-form-item>
         </el-form>
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
-          label-width="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="透析参数核查 : ">
             <el-radio v-model="doubleReview.dialysis_parameter_check" label="1"
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
-            <el-input v-model="doubleReview.dialysis_parameter_desc"></el-input>
+          <el-form-item label="差错描述 : " label-width="3.4rem">
+            <el-input
+              class="doubleInput"
+              v-model="doubleReview.dialysis_parameter_desc"
+            ></el-input>
           </el-form-item>
         </el-form>
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
-          label-width="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="血管通路核查 : ">
             <!--<el-radio-group v-model="form.appetite">-->
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
-            <el-input v-model="doubleReview.vascular_access_desc"></el-input>
+          <el-form-item label="差错描述 : " label-width="3.4rem">
+            <el-input
+              class="doubleInput"
+              v-model="doubleReview.vascular_access_desc"
+            ></el-input>
           </el-form-item>
         </el-form>
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
-          label-width="140px"
+          label-width="3.4rem"
         >
           <el-form-item label="管道连接核查 : ">
             <!--<el-radio-group v-model="form.condition">-->
             >
             <!--</el-radio-group>-->
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="140px">
+          <el-form-item label="差错描述 : " label-width="3.4rem">
             <el-input
+              class="doubleInput"
               v-model="doubleReview.pipeline_connection_desc"
             ></el-input>
           </el-form-item>
           <div class="content">
             <span
               class="text"
-              style="width: 160px"
+              style="width: 3.4rem"
               @click="selectCheckTimeAction"
               >{{ check_time_str }}</span
             >
 
         <el-form
           :inline="true"
-          class="demo-form-inline"
+          class="demo-form-inline doubleForm"
           :model="doubleReview"
-          label-width="160px"
+          label-width="3.4rem"
         >
           <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">
             {{ getFirstCheckDesc() }}
 }
 </style>
 <style lang="scss">
-.el-radio__inner {
-  @media only screen and (min-width: 768px) {
-    width: 20px;
-    height: 20px;
+.doubleForm {
+  .el-radio__inner {
+    @media only screen and (min-width: 768px) {
+      width: 26px;
+      height: 26px;
+      margin-bottom: 4px;
+    }
   }
 }
+
 .el-radio__input {
   @media only screen and (min-width: 768px) {
     margin-top: -6px;
     font-size: 0.45rem;
   }
 }
+.doubleInput {
+  .el-input__inner {
+    font-size: 0.45rem;
+  }
+}
 </style>

src/pages/main/dialog/MonitDialog.vue

           <div style="width:100%;overflow:hildden;">
             <table class="table" style="">
               <tr @click="selectRow(-1, null)">
-                <th v-if="isShow('监测时间')" width="124px">时间</th>
-                <th v-if="isShow('血压')" width="72px">血压(mmHg)</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="92px">血流量(ml/min)</th>
+                <th v-if="isShow('监测时间')" width="60px">时间</th>
+                <th v-if="isShow('血压')" width="60px">血压(mmHg)</th>
+                <th v-if="isShow('脉搏')" width="50px">脉搏(次/分)</th>
+                <th v-if="isShow('体温')" width="50px">体温(℃)</th>
+                <th v-if="isShow('呼吸频率')" width="80px">呼吸频率(次/分)</th>
+                <th v-if="isShow('血流量')" width="70px">血流量(ml/min)</th>
                 <th width="76px">静脉压/动脉压(mmHg)</th>
-                <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
-                <th v-if="isShow('超滤量') && template_id ==6" width="76px">超滤量(ml)</th>
-                <th v-if="isShow('超滤量') && template_id !=6" width="76px">超滤量(L)</th>
-                <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
+                <th v-if="isShow('跨膜压')" width="70px">跨膜压(mmHg)</th>
+                <th v-if="isShow('超滤量') && template_id ==6" width="60px">超滤量(ml)</th>
+                <th v-if="isShow('超滤量') && template_id !=6" width="60px">超滤量(L)</th>
+                <th v-if="isShow('钠浓度')" width="82px">钠浓度(mmol/L)</th>
                 <th v-if="isShow('透析液温度')" width="82px">透析液温度(℃)</th>
                 <th v-if="isShow('置换率') && template_id ==6" width="92px">置换率(ml/min)</th>
                 <th v-if="isShow('置换率') && template_id !=6" width="92px">置换率(L/h)</th>
       this.$emit('close')
     },
     setRecords (records) {
-      if (records == null) {
-        records = []
-      }
-      this.tableDate.splice(0, this.tableDate.length)
-      this.tableDate.push(...records)
+        this.monitorRecords = records
     },
     parseTime (time, layout) {
       return parseTime(time, layout)

src/pages/main/dialog/OrdersDialog.vue

 <template>
   <div>
     <div class="Dialog" v-show="index==0" style="width: 11.8rem;">
-      <div class="DialogTit" @click="$emit('orderDialog')">
-        <span class="iconfont">&#xe6e9;</span>
+      <div class="DialogTit">
+        <span class="iconfont" @click="$emit('orderDialog')">&#xe6e9;</span>
         <h1 class="name">临时医嘱</h1>
         <span class="success">&nbsp;</span>
       </div>
           v-if="isShowMofifyExce"
           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
-        >修改</span>
+        >执行</span>
         <span
           v-if="template_id != 6"
           @click="checkAdvice"
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="modifyAdviceAction"
-          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 }"
+          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
         >修改</span>
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="deleteAdviceAction"
-          :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0  }"
+          :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
         >删除</span>
 
-        <span v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
-        <span v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
+        <span :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
+        <span :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
       </div>
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
-       
+
         <div class="content clearfix">
           <div class="orderTable">
 
             <table class="table">
               <tr @click="cancelAdviceSelect">
                 <th width="8%">开嘱医生</th>
-                <th width="16%">开始时间</th>
-                <th width="44%">医嘱内容</th>
-                <th width="16%">执行时间</th>
+                <th width="12%">开始时间</th>
+                <th width="52%">医嘱内容</th>
+                <th width="12%">执行时间</th>
                 <th width="8%">执行护士</th>
                 <th v-if="template_id != 6" width="8%">核对人员</th>
               </tr>
         }
         return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':00'
       }, deleteSubAdviceAction: function () {
+        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
+          return
+        }
         if (this.currentSubAdvices.length <= 0) {
           return
         }
 
       },
       deleteAdviceAction: function () {
+        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
+          return
+        }
         if (this.current_select_object == 1) {
           if (this.currentAdvices.length <= 0) {
             return
         this.current_advice_index = -1
         this.current_advice = null
       }, modifySubdviceAction: function () {
+        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
+          return
+        }
         if (this.currentSubAdvices.length <= 0) {
           return
         }
 
       },
       modifyAdviceAction: function () {
+        if (this.$store.getters.user.user.user_type == 3 && !this.isPremission){
+          return
+        }
         if (this.current_group_index < 0) {
           return
         }
 }
 .table {
   width: 1200px;
+  @media only screen and (max-width: 767px) {
+      width: 800px;
+    }
   tr {
     th {
       background: $main-color;

src/pages/main/dialog/PrescriptionDialog.vue

     <div v-if="isShowDialog" class="Dialog">
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
-        <h1 class="name">透析处方</h1>
-        <button @click="showmsgtip">{{patient.name}} [透析号 {{patient.dialysis_no}} ]</button>
-        <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
+        <h1 class="name newName">透析处方</h1>
+        <button class="newButton" @click="showmsgtip">{{patient.name}}</button>
+        <span @click="commitInfo" class="success" v-if="isPermission()">保存</span>
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
 
       </div>
 
-      <div class="DialogContent" id="dialogTop">
+      <div class="DialogContent newDialogContent" id="dialogTop">
+        <div>
         <div @click="showSubMenu('mode')" class="item" ref="mode" v-if="isShow('透析模式')">
           <label class="name" for="txms">透析模式</label>
           <div class="content">
         </div>
 
         <div class="item" v-if="isShow('目标超滤量')">
-          <!--<label class="name" for="mbcll" v-if="this.$store.getters.user.template_info.template_id == 6">目标超滤量(ml)</label>-->
           <label class="name" for="mbcll">目标超滤量(L)</label>
           <div class="content">
             <input type="tel" @focus="inputFocus" id="mbcll" v-model="dialysisPrescription.target_ultrafiltration"/>
         </div>
 
         <div class="item" v-if="anticoagulant.shouji != -1&&isShow('首剂')">
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2">首剂(mg)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">首剂(mg)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">首剂(iu)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">首剂(mg)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">首剂(mg)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">首剂(mg)</label>
+          <label class="name" for="sj">首剂({{anticoagulant.shouji_unit}})</label>
           <div class="content">
-            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.anticoagulant_shouji"
+            <input type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.anticoagulant_shouji"
                    :disabled="anticoagulant.shouji==1?false:true"/>
-
-            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_shouji"
-                   disabled="true"/>
           </div>
         </div>
         <div class="item" v-if="anticoagulant.weichi != -1&&isShow('维持')">
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2">维持(mg/h)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">维持(mg/h)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">维持(iu)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">维持(mg/h)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">维持(ml/h)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">维持(mg/h)</label>
+          <label class="name" for="wz">维持({{anticoagulant.weichi_unit}})</label>
           <div class="content">
-            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="wz" class="inputBox"
+            <input type="tel" @focus="inputFocus" id="wz" class="inputBox"
                    v-model="dialysisPrescription.anticoagulant_weichi"
                    :disabled="anticoagulant.weichi==1?false:true">
-
-            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_weichi"
-                   disabled="true"/>
           </div>
         </div>
         <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2">总量(mg)</label>
           <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">总量(mg)</label>
-          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">总量(iu)</label>
+          <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">总量(IU)</label>
           <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">总量(mg)</label>
           <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">总量(mg)</label>
           <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">总量(mg)</label>
 
 
           <div class="content">
-            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="zl" class="inputBox"
+            <input type="tel" @focus="inputFocus" id="zl" class="inputBox"
                    v-model="dialysisPrescription.anticoagulant_zongliang"
                    :disabled="anticoagulant.zongliang==1?false:true">
-
-            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_zongliang"
-                   disabled="true"/>
           </div>
         </div>
 
         <div class="item" v-if="anticoagulant.gaimingcheng != -1 && isShow('钙名称')">
-          <label class="name" for="g">钙名称</label>
+          <label class="name" for="g">钙名称({{anticoagulant.gaimingcheng_unit}})</label>
           <div class="content">
             <input type="text" id="g" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaimingcheng"
                    :disabled="anticoagulant.gaimingcheng==1?false:true">
         </div>
 
         <div class="item" v-if="anticoagulant.gaijiliang != -1 && isShow('钙剂量')">
-          <label class="name" for="gjl">钙剂量({{anticoagulant.gaimingcheng_unit}})</label>
+          <label class="name" for="gjl">钙剂量</label>
           <div class="content">
-            <input type="text" id="gjl" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaijiliang"
-                   :disabled="anticoagulant.gaijiliang==1?false:true">
+            <input type="text" id="gjl" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaimingcheng"
+                   :disabled="anticoagulant.gaimingcheng==1?false:true">
           </div>
         </div>
         <!-- <div class="item">
         </div> -->
 
         <div class="line"></div>
-        <div class="item" v-if="isShow('置换量')" v-show="zhiShow">
+        <div class="item" v-if="isShow('置换量')">
           <label class="name" for="zhy">置换量(L)</label>
           <div class="content">
             <input type="tel" @focus="inputFocus" id="zhy" v-model="dialysisPrescription.replacement_total"/>
             <input type="tel" @focus="inputFocus" id="dtl" v-model="dialysisPrescription.conductivity"/>
           </div>
         </div>
-        <!-- <div @click="showSubMenu('dialyzer_perfusion_apparatus')" class="item" ref="dialyzer_perfusion_apparatus" v-if="isShow('透析器/灌流器') && template_id == 6">
-          <label class="name" for="dt1">透析器/灌流器</label>
-          <div class="content">
-            <span class="text" id="dt">{{dialysisPrescription.dialyzer_perfusion_apparatus}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div> -->
-
-        <div class="item" v-if="isShow('透析器/灌流器') ">
+        <div class="item" v-if="isShow('透析器/灌流器')">
           <label class="name" for="dtl">透析器/灌流器</label>
           <div class="content">
 
           </div>
         </div>
 
-        <div @click="showSubMenu('displace_liqui_part')" class="item" ref="displace_liqui_part" v-if="isShow('置换液')" v-show="huShow">
-          <label class="name" for="knj" v-if="this.$store.getters.user.template_info.template_id == 6">置换方式</label>
-          <label class="name" for="knj" v-if="this.$store.getters.user.template_info.template_id != 6">置换液</label>
+        <div @click="showSubMenu('displace_liqui_part')" class="item" ref="displace_liqui_part" v-if="isShow('置换液')">
+          <label class="name" for="knj">置换液</label>
           <div class="content">
             <span class="text" id="knjaa">{{getDisplaceLiquiPart(dialysisPrescription.displace_liqui_part)}}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
 
-        <div class="item" v-if="isShow('置换液总量')" v-show="totalShow">
+        <div class="item" v-if="isShow('置换液总量')">
           <label class="name" for="knj">置换液总量(L)</label>
           <div class="content">
             <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.displace_liqui_value"/>
           <textarea class="textarea" id="bz" placeholder="请输入内容" v-model="dialysisPrescription.remark"
                     @focus="lastInputFocus" @blur="lastInputBlur"></textarea>
         </div>
-
+        </div>
         <!--<div class="footer">-->
         <!--处方医生：刘小军 医生-->
         <!--</div>-->
         <div class="PrescSubmit">
           <button style="display: none" class="tj" @click="sign()">医生签名</button>
           <button class="tjcq" @click="commitSolutionInfo" v-if="isPermission()">保存并设为长期处方</button>
-          <button class="tj" @click="commitInfo" v-if="isPermission()">保存</button>
+          <button class="tj" style="display:none;" @click="commitInfo" v-if="isPermission()">保存</button>
         </div>
       </div>
     </div>
     <long-advice-sub-menu :visibility="advice_visibility" v-on:menu-cancle-three="menuCancleThree"
                           v-on:menu-comfirm-three="menuComfirmThree" :propsForm="advicePropForm"></long-advice-sub-menu>
 
-    <msg-tip style="width:500px;" :visibility="msgtip_visibility" :predialysis="predialysis"
+    <msg-tip  :visibility="msgtip_visibility" :predialysis="predialysis"
              :last_predialysis="last_predialysis"
              :record="record"
              :last_record="last_record"
              :patient_prop="patient"
-             :dry_weight="dry_weight"
              :prescription_prop="prescription_prop"
              v-on:menu-msg-tip="menuMsgTip"></msg-tip>
 
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
   import MultipleSubMenu from './subMenu/multipleSubMenu'
   import {commitDialysisPrescription, CreateGroupAdvice, GetSolution, postSign, postSolution} from '@/api/dialysis'
-  import { calculateAnticoagulantZL} from '@/utils/tools'
 
   import {Toast} from 'vant'
   import {getDataConfig} from '@/utils/data'
         msgtip_visibility: false,
         time: '03:00',
         timeValue: '',
-        tempTimeValue:'',
         isShowSign: false,
         anticoagulantsConfit: {},
         dialysateFormulationOptions: [],
           result: [],
           operators: [],
 
-        },
-        is_show: false,
+      },
+      is_show: false,
 
         perfusion_apparatus: {},
         replacementWays: [],
         }
         this.timeValue = this.dialysisPrescription.dialysis_duration_hour + '小时' + this.dialysisPrescription.dialysis_duration_minute + '分钟'
 
-        this.dialysisPrescription.dialysis_duration = parseFloat(this.dialysisPrescription.dialysis_duration_hour) + parseFloat((this.dialysisPrescription.dialysis_duration_minute / 60).toFixed(2))
+        this.dialysisPrescription.dialysis_duration = this.dialysisPrescription.dialysis_duration_hour + '.' + (this.dialysisPrescription.dialysis_duration_minute)
 
       },
       inputFocus: function (event) {
             this.propForm.selectId = this.dialysisPrescription.perfusion_apparatus
             this.propForm.click_ref = 'perfusion_apparatus'
 
-            break
-          case 'replacement_way':
-            this.propForm.type = 4
-            this.isShowDialog = false
-            this.propForm.title = '置换方式'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.replacementWays
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.replacement_way
-            this.propForm.click_ref = 'replacement_way'
+          break
+        case 'replacement_way':
+          this.propForm.type = 4
+          this.isShowDialog = false
+          this.propForm.title = '置换方式'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.replacementWays
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.replacement_way
+          this.propForm.click_ref = 'replacement_way'
 
             break
 
-          case 'anticoagulant':
-            this.propForm.type = 5
-            this.isShowDialog = false
-            this.propForm.title = '抗疑剂'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.anticoagulantsConfit
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.anticoagulant
-            this.propForm.click_ref = 'anticoagulant'
-            break
-          case 'dialysate_formulation':
-            this.propForm.type = 6
-            this.isShowDialog = false
-            this.propForm.title = '透析液配方'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.dialysateFormulationOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.dialysate_formulation
-            this.propForm.click_ref = 'dialysate_formulation'
-            break
-          case 'body_fluid':
-            this.propForm.type = 7
-            this.isShowDialog = false
-            this.propForm.title = '体液过多症状'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.bodyFluidOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.body_fluid
-            this.propForm.click_ref = 'body_fluid'
-            break
-          case 'special_medicine':
-            this.propForm.type = 8
-            this.isShowDialog = false
-            this.propForm.title = '透析前使用特殊药物'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.specialMedicineOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.special_medicine
-            this.propForm.click_ref = 'special_medicine'
-            break
-          case 'displace_liqui_part':
-            this.propForm.type = 9
-            this.isShowDialog = false
-            this.propForm.title = '置换液'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.displaceLiquiPartOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.displace_liqui_part
-            this.propForm.click_ref = 'displace_liqui_part'
-            break
-          case 'blood_access':
-            this.propForm.type = 10
-            this.isShowDialog = false
-            this.propForm.title = '血管通路'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.bloodAccessOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.blood_access
-            this.propForm.click_ref = 'blood_access'
-            break
-          case 'dialyzer_perfusion_apparatus':
-            // this.propForm.type = 11
-            // this.isShowDialog = false
-            // this.propForm.title = '透析器/灌流器'
-            // this.visibility = true
-            // this.propForm.list = []
-            // this.propForm.optionList = this.bloodAccessOptions
-            // this.propForm.isMultiple = 1
-            // this.propForm.selectId = this.dialysisPrescription.dialyzer_perfusion_apparatus
-            // this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
-            // break
-
-            this.propForm.result = []
-            this.isHasOther = 2
-            this.propForm.type = 11
-            this.isShowDialog = false
-            this.propForm.title = '透析器/灌流器'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.list = getDataConfig('hemodialysis', 'dialyzer_perfusion_apparatus')
-            this.propForm.optionList = []
-            this.propForm.isMultiple = 2
-            // this.propForm.result = typeof(this.formValue.hemorrhage) == "string"? this.formValue.hemorrhage.split(","):[]
-            if (this.dialysisPrescription.dialyzer_perfusion_apparatus != undefined || this.dialysisPrescription.dialyzer_perfusion_apparatus != null) {
-              if (this.dialysisPrescription.dialyzer_perfusion_apparatus.length > 0) {
-                this.propForm.result = this.dialysisPrescription.dialyzer_perfusion_apparatus.split(',')
-              } else {
-                this.propForm.result = []
-              }
+        case 'anticoagulant':
+          this.propForm.type = 5
+          this.isShowDialog = false
+          this.propForm.title = '抗疑剂'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.anticoagulantsConfit
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.anticoagulant
+          this.propForm.click_ref = 'anticoagulant'
+          break
+        case 'dialysate_formulation':
+          this.propForm.type = 6
+          this.isShowDialog = false
+          this.propForm.title = '透析液配方'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.dialysateFormulationOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.dialysate_formulation
+          this.propForm.click_ref = 'dialysate_formulation'
+          break
+        case 'body_fluid':
+          this.propForm.type = 7
+          this.isShowDialog = false
+          this.propForm.title = '体液过多症状'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.bodyFluidOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.body_fluid
+          this.propForm.click_ref = 'body_fluid'
+          break
+        case 'special_medicine':
+          this.propForm.type = 8
+          this.isShowDialog = false
+          this.propForm.title = '透析前使用特殊药物'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.specialMedicineOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.special_medicine
+          this.propForm.click_ref = 'special_medicine'
+          break
+        case 'displace_liqui_part':
+          this.propForm.type = 9
+          this.isShowDialog = false
+          this.propForm.title = '置换液'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.displaceLiquiPartOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.displace_liqui_part
+          this.propForm.click_ref = 'displace_liqui_part'
+          break
+        case 'blood_access':
+          this.propForm.type = 10
+          this.isShowDialog = false
+          this.propForm.title = '血管通路'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.bloodAccessOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.blood_access
+          this.propForm.click_ref = 'blood_access'
+          break
+        case 'dialyzer_perfusion_apparatus':
+          // this.propForm.type = 11
+          // this.isShowDialog = false
+          // this.propForm.title = '透析器/灌流器'
+          // this.visibility = true
+          // this.propForm.list = []
+          // this.propForm.optionList = this.bloodAccessOptions
+          // this.propForm.isMultiple = 1
+          // this.propForm.selectId = this.dialysisPrescription.dialyzer_perfusion_apparatus
+          // this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
+          // break
+
+          this.propForm.result = []
+          this.isHasOther = 2
+          this.propForm.type = 11
+          this.isShowDialog = false
+          this.propForm.title = '透析器/灌流器'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.list = getDataConfig('hemodialysis', 'dialyzer_perfusion_apparatus')
+          this.propForm.optionList = []
+          this.propForm.isMultiple = 2
+          // this.propForm.result = typeof(this.formValue.hemorrhage) == "string"? this.formValue.hemorrhage.split(","):[]
+          if (this.dialysisPrescription.dialyzer_perfusion_apparatus != undefined || this.dialysisPrescription.dialyzer_perfusion_apparatus != null) {
+            if (this.dialysisPrescription.dialyzer_perfusion_apparatus.length > 0) {
+              this.propForm.result = this.dialysisPrescription.dialyzer_perfusion_apparatus.split(',')
             } else {
               this.propForm.result = []
             }
-            this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
-            break
-        }
-      },
-      menuCancle: function () {
-        this.visibility = false
-        this.isShowDialog = 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()
+          } else {
+            this.propForm.result = []
           }
-        })
-      },
-      menuCancleThree: function () {
-        this.advice_visibility = false
-        this.isShowDialog = true
-      },
-      menuMsgTip: function () {
-        this.msgtip_visibility = false
-        this.isShowDialog = true
-      },
+          this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
+          break
+      }
+    },
+    menuCancle: function () {
+      this.visibility = false
+      this.isShowDialog = 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()
+        }
+      })
+    },
+    menuCancleThree: function () {
+      this.advice_visibility = false
+      this.isShowDialog = true
+    },
+    menuMsgTip: function () {
+      this.msgtip_visibility = false
+      this.isShowDialog = true
+    },
 
       menuComfirmThree: function (targetAdvices) {
 
                 }
               }
 
+              console.log(this.dialysisPrescription.dialysis_duration_hour)
+              console.log(this.dialysisPrescription.dialysis_duration_minute)
+              console.log(this.dialysisPrescription.dialysis_duration_hour == '')
+              console.log(this.dialysisPrescription.dialysis_duration_minute == 0)
 
 
 
 
       }
 
-
-
-
-
       if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {
         this.timeValue = ''
         this.time = '03:00'
       this.dialysisPrescription.ultrafiltration = this.getFloat(this.dialysisPrescription.ultrafiltration)
       this.dialysisPrescription.target_ultrafiltration = this.getFloat(this.dialysisPrescription.target_ultrafiltration)
 
-      if(this.dialysisPrescription.anticoagulant_shouji == ''){
-        this.dialysisPrescription.anticoagulant_shouji = '0'
-      }
-
-      if(this.dialysisPrescription.anticoagulant_weichi == ''){
-        this.dialysisPrescription.anticoagulant_weichi = '0'
-      }
-
-      if(this.dialysisPrescription.anticoagulant_zongliang == ''){
-        this.dialysisPrescription.anticoagulant_weichi = '0'
-      }
-
-
     },
 
     components: {
       CheckBoxSubMenu
     },
     watch: {
-      "dialysisPrescription.dialysis_duration":function(){
-        console.log(this.dialysisPrescription.dialysis_duration)
-        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
-          this.dialysisPrescription.anticoagulant_shouji,
-          this.dialysisPrescription.dialysis_duration,
-          this.dialysisPrescription.anticoagulant_weichi
-        );
-        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
-          this.dialysisPrescription.anticoagulant_zongliang = ''
+      'dialysisPrescription.anticoagulant_shouji': function (val) {
+        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
+        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
+        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
         }
-      },
-      "dialysisPrescription.anticoagulant_shouji":function(){
-        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
-          this.dialysisPrescription.anticoagulant_shouji,
-          this.dialysisPrescription.dialysis_duration,
-          this.dialysisPrescription.anticoagulant_weichi
-        );
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-      },
-      "dialysisPrescription.anticoagulant_weichi":function(){
-        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
-          this.dialysisPrescription.anticoagulant_shouji,
-          this.dialysisPrescription.dialysis_duration,
-          this.dialysisPrescription.anticoagulant_weichi
-        );
+
+
+      }, 'dialysisPrescription.anticoagulant_weichi': function (val) {
+        console.log(this.dialysisPrescription.anticoagulant_shouji)
+        console.log(this.dialysisPrescription.anticoagulant_weichi)
+        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
+        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
+        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
+        }
+
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
           this.dialysisPrescription.anticoagulant_zongliang = ''
+
         }
       },
+
       isShowDialog (val) {
         if (val) {
           this.advice_visibility = false
     }
   }
 </script>
+
+
 <style style="stylesheet/scss" lang="scss" scoped>
   .DialogContent {
   // padding-bottom:2rem !important;
   }
   }
   .newButton{
+    
     background: #258ffc;
     padding: 0 0.2rem;
     height: 0.85rem;
     line-height: 0.85rem;
-    border-radius:5px;
+    border-radius:5px; 
     color: #fff;
     margin-right: -3.5rem;
   }

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

   }
 }
 .newSpan {
-  padding: 0 0.4rem;
+  padding: 0 0.3rem;
 }
 </style>
 <style lang="scss">

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

       <div class="item">
         <label class="name" for="txms">干体重（kg）</label>
         <div class="content">
-          <span class="text" id="txms">{{ dry }}</span>
+          <span class="text" id="txms">{{ last_predialysis.dry_weight }}</span>
         </div>
       </div>
       <div class="item">
 import { parseTime } from "@/utils";
 
 export default {
-  name: "MsgTip",
+  name: "LongAdviceSubMenu",
   created() {
     if (
-      this.predialysis &&
       this.predialysis.weight_before > 0 &&
       this.predialysis.weight_after_last_transparency > 0
     ) {
-      this.add_weight = parseFloat(
-        this.predialysis.weight_before -
-          this.predialysis.weight_after_last_transparency
+      add_weight = parseFloat(
+        this.predialysis.weight_before - this.predialysis.weight_after_last_transparency
       ).toFixed(2);
     }
-
-    console.log(this.dry_weight);
-    if (this.dry_weight != null) {
-      this.dry = this.dry_weight.dry_weight;
-    } else {
-      this.dry = this.last_predialysis.dry_weight;
-    }
   },
   data() {
     return {
       result: [],
       id: 0,
       selectName: "",
-      add_weight: 0,
-      dry: 0
+      add_weight: 0
     };
   },
   props: {
     },
     prescription_prop: {
       type: Object
-    },
-    dry_weight: {
-      type: Object
     }
   },
   computed: {

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

       :show="is_show"
       v-on:menu-cancle="menuCancle"
       v-on:menu-comfirm="menuComfirm"
-      v-on:menu-empty="menuEmpty"
-      :propsForm="propForm"
+       :propsForm="propForm"
     ></new-check-box-sub-menu>
   </div>
 </template>
 
 <style style="stylesheet/scss" scoped>
 .DialogContent {
-  // padding-bottom:2rem !important;
+  /* padding-bottom:2rem !important; */
 
   .textarea {
     width: 100%;

src/pages/main/today/TodayTab.vue

     </van-popup>
 
     <van-popup
-      title="双人查对"
+      title="双人核对"
       v-model="menuList[5].showPopup"
       :overlay="true"
       :close-on-click-overlay="false"
           steps[1].value = 1
         }
 
-        if (typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.evaluator > 0) {
+        if (typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.creater > 0) {
           steps[2].value = 1
         }
 
 
     didAddMonitor (monitor) {
       this.monitor_records.push(monitor)
-
       this.monitor_records.sort((a, b) => b.operate_time - a.operate_time)
-
-      // for (let index = 0; index < this.monitor_records.length; index++) {
-      //   const record = this.monitor_records[index];
-      //   if (record.operate_time <= monitor.operate_time) {
-      //     this.monitor_records.splice(index, 0, monitor)
-      //     break
-      //   }
-      // }
       this.monitor_records.reverse()
+      this.$refs.monit_dialog.setRecords(this.monitor_records)
       this.last_monitor_record = monitor
-      // this.$refs.plane_dialog.set_last_monitor_record(monitor)
     },
 
     didEditMonitor (monitor) {

src/pages/main/today/detailsInfo.vue

         { title: "透前评估" },
         { title: "临时医嘱" },
         { title: "透析上机" },
-        { title: "双人查对" },
+        { title: "双人核对" },
         { title: "透析监测" },
         { title: "透析下机" },
         { title: "透后评估" },

src/pages/personal/index.vue

         <img class="bannerOne" src="../../assets/my/myBanner.png" alt />
         <div class="avatar">
           <img src="../../assets/my/avatar.png" alt />
-          <p>{{user_name}}</p>
+          <p>{{ user_name }}</p>
         </div>
       </div>
       <div class="list">
             <span class="iconfont jiantou">&#xe6f9;</span>
           </div>
         </router-link>
-        <router-link to="/ChangePassword">
-          <div class="name">
-            <div class="left">
-              <img src="../../assets/my/modification.png" alt />
-              <span>修改密码</span>
-            </div>
-            <span class="iconfont jiantou">&#xe6f9;</span>
+        <!-- <router-link to="/ChangePassword"> -->
+        <div class="name" @click="okk">
+          <div class="left">
+            <img src="../../assets/my/modification.png" alt />
+            <span>修改密码</span>
           </div>
-        </router-link>
+          <span class="iconfont jiantou">&#xe6f9;</span>
+        </div>
+        <!-- </router-link> -->
         <div class="name" @click="logout">
           <div class="left">
             <img src="../../assets/my/exit.png" alt />
 import SideBar from "@/pages/layout/SideBar";
 import EditPersonal from "./EditPersonal";
 import { GetMyInfo } from "@/api/admin_user";
+import { Toast } from "vant";
 
 export default {
   name: "PersonalIndex",
     logout: function() {
       // TODO 请求退出登录接口
       this.$router.push("/");
+    },
+    okk() {
+      Toast.success("程序员还在开发中");
     }
   }
 };

src/pages/waitingRoom/components/details.vue

         ></dialysis-computer>
         <double-check
           ref="double_check"
-          title="双人查对 "
+          title="双人核对 "
           :record="double_check"
         ></double-check>
         <dialysis-monitoring

src/pages/waitingRoom/components/dialog/doubleCheck.vue

         pipeline_connection_desc: "",
         collator: ""
       },
-      title: "双人查对 ",
+      title: "双人核对 ",
       patient: {
         id: 0
       },

src/styles/style.scss

       button {
         padding: 0 0.32rem;
         border: $main-color;
-        font-size: 0.36rem;
+        font-size: 0.45rem;
         text-align: center;
         height: 1rem;
         line-height: 0.7rem;