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

src/pages/main/DetailsPage.vue

@@ -234,7 +234,7 @@ export default {
   position: fixed;
   right: 0.6rem;
   bottom: 2.25rem;
-  font-size: 0.4rem;
+  font-size: 0.34rem;
   text-align: center;
   @media only screen and (max-width: 767px) {
     display: none;
@@ -250,7 +250,7 @@ export default {
     // }
     @media only screen and (min-width: 768px) {
       width: 50px;
-      margin: 14px auto 0;
+      margin: 17px auto 0;
     }
   }
 }

src/pages/main/PatientBox.vue

@@ -451,7 +451,7 @@ export default {
 }
 .yztx {
   margin: 0 5px;
-  padding: 5px 10px;
+  padding: 4px 10px;
   background-color: #f56c6c;
   color: #fff;
   border-radius: 15px;

src/pages/main/add_urgent_schedule.vue

@@ -594,7 +594,7 @@ export default {
         font-size: 0.4rem;
         line-height: 40px;
         text-align: center;
-        color: red;
+        color: #f56c6c;
         @media only screen and (max-width: 812px) {
           margin-left: -10px !important;
         }

src/pages/main/dialog/MonitDialog.vue

@@ -74,7 +74,7 @@
         <div class="DialogTit">
           <div class="back" @click="formPanel=false;listPanel=true;"><span class="iconfont">&#xe720; </span>返回</div>
           <h1 class="name">{{formTitle}}</h1>
-          <span class="success" v-if="form.id>0" @click="submitEditAction()">完成</span>
+          <span class="success" v-if="form.id>0" @click="submitEditAction()">保存</span>
           <span class="success" v-else @click="submitAction()">保存</span>
 
         </div>
@@ -118,12 +118,12 @@
             <div class="cell">
               <label>静脉压(mmHg)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.venous_pressure" style="width:60%">
-               <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;border-radius:5px" @click="venousPressureChange(1)" >转换</button>
+               <button class="typeButton" style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;border-radius:5px" @click="venousPressureChange(1)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('跨膜压')">
               <label>跨膜压(mmHg)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.transmembrane_pressure" style="width:60%">
-              <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;border-radius:5px" @click="venousPressureChange(2)" >转换</button>
+              <button class="typeButton" style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;border-radius:5px" @click="venousPressureChange(2)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('超滤量')">
               <label v-if="template_id == 6">超滤量(ml)</label>
@@ -141,7 +141,7 @@
             <div class="cell">
               <label>动脉压(mmHg)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.arterial_pressure" style="width:60%">
-              <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;border-radius:5px" @click="venousPressureChange(3)" >转换</button>
+              <button class="typeButton" style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;border-radius:5px" @click="venousPressureChange(3)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('透析液温度')">
               <label>透析液温度(℃)</label>
@@ -209,7 +209,7 @@
 
             <div class="cell width">
               <label>监测人：</label>
-              <span>{{doctor}}</span>
+              <span class="doctor">{{doctor}}</span>
             </div>
 
           </div>
@@ -1082,6 +1082,8 @@ export default {
         height: 0.55rem;
         line-height: 0.55rem;
         color: $pgh-color;
+        font-size: 0.45rem;
+        margin-bottom: 0.2rem;
       }
       select {
         width: 100%;
@@ -1097,6 +1099,19 @@ export default {
         padding: 0.18rem 0;
         padding-left: 5px;
         width: 100%;
+        @media only screen and (min-width: 768px) {
+          height: 60px;
+          line-height: 60px;
+          font-size: 0.45rem;
+        }
+      }
+      .typeButton{
+        @media only screen and (min-width: 768px) {
+          height: 60px;
+          line-height: 60px;
+          font-size: 0.45rem;
+          padding: 0 !important;
+        }
       }
       .input_focus {
         margin-bottom: 2rem;
@@ -1135,6 +1150,9 @@ export default {
 .row-class-active > td {
   background: #badcff !important;
 }
+.doctor{
+  font-size: 0.45rem;
+}
 </style>
 <style lang="scss">
 .el-table td {

src/pages/main/dialog/OrdersDialog.vue

@@ -10,23 +10,24 @@
         <span
           @click="openNewAdvice"
           :class="{ forbid: this.$store.getters.user.user.user_type == 3 }"
-        >新增医嘱</span>
+        >新增</span>
         <span
           v-if="isShowExce"
           @click="execAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0)||(this.$store.getters.user.user.user_type == 2 && !isPremission) }"
-        >执行医嘱</span>
+        >执行</span>
         <span
           v-if="isShowMofifyExce"
           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
-        >修改执行医嘱</span>
+        >修改</span>
         <span
           v-if="template_id != 6"
           @click="checkAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || (this.$store.getters.user.user.user_type == 2 && !isPremission) }"
-        >医嘱核对</span>
+        >核对</span>
         <span
+        id="fontSize"
           @click="openNewChild"
           :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1 || this.$store.getters.user.user.user_type == 3 }"
         >添加子药</span>
@@ -34,12 +35,12 @@
           v-if="currentSubAdvices.length <= 0"
           @click="modifyAdviceAction"
           :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 }"
-        >修改医嘱</span>
+        >修改</span>
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="deleteAdviceAction"
           :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0  }"
-        >删除医嘱</span>
+        >删除</span>
 
         <span v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
         <span v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
@@ -1498,7 +1499,7 @@
   display: flex;
   flex-wrap: wrap;
   span {
-    width: 18%;
+    width: 15%;
     @media only screen and (max-width: 415px) {
       padding: 0;
     }
@@ -1507,4 +1508,7 @@
     // }
   }
 }
+#fontSize{
+  font-size: 0.34rem;
+}
 </style>

src/pages/main/dialog/PrescriptionDialog.vue

@@ -4,14 +4,15 @@
     <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">
@@ -35,7 +36,6 @@
         </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"/>
@@ -60,57 +60,37 @@
         </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">
@@ -118,10 +98,10 @@
         </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">
@@ -132,7 +112,7 @@
         </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"/>
@@ -196,15 +176,7 @@
             <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">
 
@@ -243,16 +215,15 @@
           </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"/>
@@ -309,7 +280,7 @@
           <textarea class="textarea" id="bz" placeholder="请输入内容" v-model="dialysisPrescription.remark"
                     @focus="lastInputFocus" @blur="lastInputBlur"></textarea>
         </div>
-
+        </div>
         <!--<div class="footer">-->
         <!--处方医生：刘小军 医生-->
         <!--</div>-->
@@ -341,12 +312,11 @@
     <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>
 
@@ -357,7 +327,6 @@
   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'
@@ -453,7 +422,6 @@
         msgtip_visibility: false,
         time: '03:00',
         timeValue: '',
-        tempTimeValue:'',
         isShowSign: false,
         anticoagulantsConfit: {},
         dialysateFormulationOptions: [],
@@ -466,8 +434,8 @@
           result: [],
           operators: [],
 
-        },
-        is_show: false,
+      },
+      is_show: false,
 
         perfusion_apparatus: {},
         replacementWays: [],
@@ -619,7 +587,7 @@
         }
         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) {
@@ -689,139 +657,139 @@
             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) {
 
@@ -1024,6 +992,10 @@
                 }
               }
 
+              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)
 
 
 
@@ -1967,10 +1939,6 @@
 
       }
 
-
-
-
-
       if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {
         this.timeValue = ''
         this.time = '03:00'
@@ -2019,19 +1987,6 @@
       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: {
@@ -2042,37 +1997,40 @@
       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
@@ -2081,6 +2039,8 @@
     }
   }
 </script>
+
+
 <style style="stylesheet/scss" lang="scss" scoped>
   .DialogContent {
   // padding-bottom:2rem !important;
@@ -2101,7 +2061,7 @@
     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

@@ -6,23 +6,29 @@
           <span class="iconfont">&#xe720;</span>返回
         </div>
         <h1 class="name">新增医嘱</h1>
-        <span class="success" @click="comfirmAction">保存</span>
+        <span class="success" @click="comfirmAction">完成</span>
       </div>
       <div class="yzNav" style="width:100%;">
-        <span @click="addOrderByTemplateAction">选择医嘱模板</span>
-        <span @click="addNewOrderAction">新增医嘱内容</span>
-        <span @click="modifyOrderAction">修改医嘱内容</span>
-        <span @click="deleteOrderAction">删除医嘱内容</span>
+        <span class="newSpan" @click="addOrderByTemplateAction">选择模板</span>
+        <span class="newSpan" @click="addNewOrderAction">新增内容</span>
+        <span class="newSpan" @click="modifyOrderAction">修改内容</span>
+        <span class="newSpan" @click="deleteOrderAction">删除内容</span>
       </div>
       <div class="content clearfix backgroundColor">
         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input ref="advice_type" value="临时" disabled></el-input>
+            <el-input
+              class="typeInput"
+              ref="advice_type"
+              value="临时"
+              disabled
+            ></el-input>
           </div>
           <div class="cell" style="margin-top: 0;">
             <label>开始时间</label>
             <el-input
+              class="typeInput"
               :value="start_time_str"
               readonly
               @focus="selectStartTimeAction"
@@ -37,123 +43,88 @@
             <label>开嘱时间 {{ record_date_str }}</label>
           </div>
         </div>
-
-        <!-- <el-table :data="advices" border style="width: 100%" :row-class-name="tableRowClassName" @row-click="clickAdviceAction">
-            <el-table-column fixed prop="date" label="医嘱内容" width="150">
-              <template slot-scope="scope">
-                   {{ scope.row.title }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="药品规格" width="120">
-              <template slot-scope="scope">
-              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="province" label="开药数量" width="120">
-              <template slot-scope="scope">
-              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="city" label="单次用量" width="120">
-              <template slot-scope="scope">
-
-              </template>
-            </el-table-column>
-            <el-table-column prop="address" label="给药途径" width="300">
-               <template slot-scope="scope">
-                   {{ scope.row.delivery_way }}
-               </template>
-            </el-table-column>
-            <el-table-column prop="zip" label="执行频率" width="120">
-              <template slot-scope="scope">
-                  {{ scope.row.execution_frequency }}
-              </template>
-            </el-table-column>
-          </el-table>-->
-      </div>
-      <div
-        id="newDialogContent"
-        class="DialogContent choose"
-        style="height: 6.2rem;"
-      >
-        <div class="newAddTable">
-          <table class="table">
-            <tr>
-              <th width="26%">医嘱内容</th>
-              <th width="20%">药品规格</th>
-              <th width="12%">开药数量</th>
-              <th width="12%">单次用量</th>
-              <th width="15%">给药途径</th>
-              <th width="15%">执行频率</th>
-            </tr>
-            <template v-for="(advice, advice_index) in advices">
-              <tr
-                :key="advice_index"
-                @click="clickAdviceAction(advice_index)"
-                :class="{
-                  'row-class-active':
-                    advice_index == selecting_advice_index &&
-                    selecting_subdrug_index < 0
-                }"
-              >
-                <td
-                  style="text-align: left; padding-left: 5px; padding-right: 5px;"
-                >
-                  {{ advice.title }}
-                </td>
-
-                <td v-if="advice.advice_desc">
-                  {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
-                </td>
-
-                <td v-if="advice.prescribing_number">
-                  {{ advice.prescribing_number
-                  }}{{ advice.prescribing_number_unit }}
-                </td>
-                <td v-else></td>
-                <td v-if="advice.single_dose">
-                  {{ advice.single_dose }} {{ advice.single_dose_unit }}
-                </td>
-                <td v-else></td>
-
-                <td>{{ advice.delivery_way }}</td>
-
-                <td>{{ advice.execution_frequency }}</td>
+        <div
+          id="newDialogContent"
+          class="DialogContent choose"
+          style="height: 6.2rem;"
+        >
+          <div class="newAddTable">
+            <table class="table">
+              <tr>
+                <th width="30%">医嘱内容</th>
+                <th width="20%">药品规格</th>
+                <th width="10%">开药数量</th>
+                <th width="10%">单次用量</th>
+                <th width="15%">给药途径</th>
+                <th width="15%">执行频率</th>
               </tr>
-              <tr
-                v-for="(subdrug, subdrug_index) in advice.subdrugs"
-                :key="advice_index + '_' + subdrug_index"
-                @click="clickSubdrugAction(advice_index, subdrug_index)"
-                :class="{
-                  'row-class-active':
-                    advice_index == selecting_advice_index &&
-                    subdrug_index == selecting_subdrug_index
-                }"
-              >
-                <td
-                  style="text-align: left; padding-right: 5px; padding-left: 25px;"
+              <template v-for="(advice, advice_index) in advices">
+                <tr
+                  :key="advice_index"
+                  @click="clickAdviceAction(advice_index)"
+                  :class="{
+                    'row-class-active':
+                      advice_index == selecting_advice_index &&
+                      selecting_subdrug_index < 0
+                  }"
                 >
-                  {{ subdrug.title }}
-                </td>
-                <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
-                <td>
-                  <span v-if="subdrug.prescribing_number"
-                    >{{ subdrug.prescribing_number
-                    }}{{ subdrug.prescribing_number_unit }}</span
+                  <td
+                    style="text-align: left; padding-left: 5px; padding-right: 5px;"
                   >
-                </td>
-                <td>
-                  <span v-if="subdrug.single_dose"
-                    >{{ subdrug.single_dose }}
-                    {{ subdrug.single_dose_unit }}</span
+                    {{ advice.title }}
+                  </td>
+                  <td v-if="advice.advice_desc">
+                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
+                  </td>
+                  <td v-if="advice.prescribing_number">
+                    {{ advice.prescribing_number
+                    }}{{ advice.prescribing_number_unit }}
+                  </td>
+                  <td v-else></td>
+                  <td v-if="advice.single_dose">
+                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
+                  </td>
+                  <td v-else></td>
+                  <td>{{ advice.delivery_way }}</td>
+                  <td>{{ advice.execution_frequency }}</td>
+                </tr>
+                <tr
+                  v-for="(subdrug, subdrug_index) in advice.subdrugs"
+                  :key="advice_index + '_' + subdrug_index"
+                  @click="clickSubdrugAction(advice_index, subdrug_index)"
+                  :class="{
+                    'row-class-active':
+                      advice_index == selecting_advice_index &&
+                      subdrug_index == selecting_subdrug_index
+                  }"
+                >
+                  <td
+                    style="text-align: left; padding-right: 5px; padding-left: 25px;"
                   >
-                </td>
-
-                <td></td>
-                <td></td>
-              </tr>
-            </template>
-          </table>
+                    {{ subdrug.title }}
+                  </td>
+                  <td>
+                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
+                  </td>
+                  <td>
+                    <span v-if="subdrug.prescribing_number"
+                      >{{ subdrug.prescribing_number
+                      }}{{ subdrug.prescribing_number_unit }}</span
+                    >
+                  </td>
+                  <td>
+                    <span v-if="subdrug.single_dose"
+                      >{{ subdrug.single_dose }}
+                      {{ subdrug.single_dose_unit }}</span
+                    >
+                  </td>
+                  <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
+                  <td></td>
+                  <td></td>
+                </tr>
+              </template>
+            </table>
+          </div>
         </div>
       </div>
     </div>
@@ -409,6 +380,7 @@ export default {
 
     didSelectStartTime: function(time) {
       this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      console.log(".");
     },
     didSelectTemplateAdvice: function(resp_advices) {
       this.show_dialog_key = 0;
@@ -562,7 +534,7 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 #newDialogContent {
   @media only screen and (max-width: 415px) {
-    height: 10.8rem !important;
+    height: 8.8rem !important;
   }
   @media only screen and (min-width: 768px) {
     height: 7.8rem !important;
@@ -576,9 +548,12 @@ export default {
   // overflow: auto;
 }
 .table {
-  width: 768px;
+  width: 1200px;
   overflow-x: scroll;
   // margin-top: 0rem;
+  @media only screen and (max-width: 767px) {
+    width: 1000px;
+  }
   tr {
     th {
       background: $main-color;
@@ -602,6 +577,7 @@ export default {
       line-height: 0.6rem;
       color: $pgh-color;
       font-size: 0.45rem;
+      margin-bottom: 0.2rem;
     }
     select {
       width: 100%;
@@ -637,6 +613,9 @@ export default {
     background: #badcff !important;
   }
 }
+.newSpan {
+  padding: 0 0.3rem;
+}
 </style>
 <style lang="scss">
 .newAddTable {
@@ -644,4 +623,12 @@ export default {
     padding: 0;
   }
 }
+.typeInput {
+  .el-input__inner {
+    @media only screen and (min-width: 768px) {
+      height: 60px;
+      line-height: 60px;
+    }
+  }
+}
 </style>

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

@@ -259,7 +259,7 @@ export default {
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 811px) {
-    max-height: 12.8rem !important;
+    max-height: 11.8rem !important;
   }
   ul {
     li {

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

@@ -28,7 +28,7 @@
       <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">
@@ -73,33 +73,23 @@
 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
+      predialysis.weight_before > 0 &&
+      predialysis.weight_after_last_transparency > 0
     ) {
-      this.add_weight = parseFloat(
-        this.predialysis.weight_before -
-          this.predialysis.weight_after_last_transparency
+      add_weight = parseFloat(
+        predialysis.weight_before - 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: {
@@ -124,9 +114,6 @@ export default {
     },
     prescription_prop: {
       type: Object
-    },
-    dry_weight: {
-      type: Object
     }
   },
   computed: {

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

@@ -609,7 +609,7 @@ export default {
 
 <style style="stylesheet/scss" scoped>
 .DialogContent {
-  // padding-bottom:2rem !important;
+  /* padding-bottom:2rem !important; */
 
   .textarea {
     width: 100%;

src/pages/personal/ChangePassword.vue

@@ -8,17 +8,39 @@
         <span class="name">修改密码</span>
         <div class="GoBack"></div>
       </h1>
-      <van-field v-model="username" clearable label="旧密码" placeholder="请输入旧密码" />
-      <van-field v-model="sms" center clearable label="验证码" placeholder="请输入短信验证码">
-        <van-button slot="button" size="small" type="primary">发送验证码</van-button>
+      <van-field
+        v-model="username"
+        clearable
+        label="旧密码"
+        placeholder="请输入旧密码"
+      />
+      <van-field
+        v-model="sms"
+        center
+        clearable
+        label="验证码"
+        placeholder="请输入短信验证码"
+      >
+        <van-button
+          class="changeButton"
+          slot="button"
+          size="small"
+          type="primary"
+          >发送验证码</van-button
+        >
       </van-field>
-      <van-field v-model="password" type="password" label="新密码" placeholder="请输入新密码" />
+      <van-field
+        v-model="password"
+        type="password"
+        label="新密码"
+        placeholder="请输入新密码"
+      />
       <div class="finish">完成</div>
     </div>
   </div>
 </template>
 
-<style rel="stylesheet/scss" lang="scss" >
+<style rel="stylesheet/scss" lang="scss">
 .container {
   background: #f5f5f5;
   @include box-sizing;
@@ -56,6 +78,7 @@
       }
       .name {
         margin-right: 1.3rem;
+        font-size: 0.5rem;
       }
     }
     .van-cell {
@@ -93,5 +116,15 @@
     line-height: 1.4rem;
     margin-top: 1rem;
   }
+  .changeButton {
+    font-size: 0.4rem !important;
+    border-radius: 5px;
+    @media only screen and (min-width: 768px) {
+      height: 50px;
+      line-height: 50px;
+      border-radius: 5px;
+      padding: 0 16px;
+    }
+  }
 }
 </style>

src/pages/personal/ElectronicSignature.vue

@@ -419,6 +419,7 @@ export default {
     }
     .name {
       margin-right: 1.3rem;
+      font-size: 0.5rem;
     }
   }
   .information {
@@ -503,6 +504,7 @@ export default {
     @media only screen and (min-width: 768px) {
       padding: 22px 42px;
       font-size: 0.45rem;
+      // height: 0;
     }
   }
 }

src/pages/personal/index.vue

@@ -72,7 +72,7 @@
         <img class="bannerOne" src="../../assets/my/myBanner.png" alt />
         <div class="avatar">
           <img src="../../assets/my/avatar.png" alt />
-          <p>用户姓名</p>
+          <p>{{user_name}}</p>
         </div>
       </div>
       <div class="list">
@@ -122,7 +122,8 @@ export default {
     return {
       electronicsignature: "",
       myinfo: {},
-      avatar: "@/assets/product/test.jpg"
+      avatar: "@/assets/product/test.jpg",
+      user_name: ""
     };
   },
   created() {
@@ -132,6 +133,9 @@ export default {
     GetMyInfo() {
       GetMyInfo().then(response => {
         if (response.data.state == 1) {
+          var roleInfo = response.data.data.roleInfo;
+          this.user_name = roleInfo.user_name;
+          console.log("hhhhhhhhhhhhh", response.data.data.roleInfo);
           this.electronicsignature =
             response.data.data.electronic_signature === null
               ? ""

src/styles/style.scss

@@ -228,7 +228,7 @@ body {
     @include text-align;
     margin: 0.25rem 0;
     color: #34495e;
-    font-size: 0.4rem;
+    font-size: 0.45rem;
     padding: 0 0.16rem;
   }
   .forbid {