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

src/pages/main/dialog/ComputerDialog.vue

@@ -265,7 +265,6 @@ export default {
           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) {
@@ -312,7 +311,7 @@ export default {
         } else {
           Toast.success("上机成功");
           var monitor = response.data.data.monitor;
-          // this.$emit('did_add_monitor', monitor)
+          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/PrescriptionDialog.vue

@@ -59,51 +59,71 @@
           </div>
         </div>
 
-        <div class="item" v-if="anticoagulant.shouji != -1&&isShow('首剂')">
-          <label class="name" for="sj">首剂({{anticoagulant.shouji_unit}})</label>
-          <div class="content">
-            <input type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.anticoagulant_shouji"
-                   :disabled="anticoagulant.shouji==1?false:true"/>
+          <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>
+            <div class="content">
+              <input v-if="dialysisPrescription.anticoagulant != 1" 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>
-        <div class="item" v-if="anticoagulant.weichi != -1&&isShow('维持')">
-          <label class="name" for="wz">维持({{anticoagulant.weichi_unit}})</label>
-          <div class="content">
-            <input type="tel" @focus="inputFocus" id="wz" class="inputBox"
-                   v-model="dialysisPrescription.anticoagulant_weichi"
-                   :disabled="anticoagulant.weichi==1?false:true">
+          <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>
+            <div class="content">
+              <input v-if="dialysisPrescription.anticoagulant != 1" 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>
-        <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
-          <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>
+          <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 == 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 type="tel" @focus="inputFocus" id="zl" class="inputBox"
-                   v-model="dialysisPrescription.anticoagulant_zongliang"
-                   :disabled="anticoagulant.zongliang==1?false:true">
+            <div class="content">
+              <input v-if="dialysisPrescription.anticoagulant != 1" 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>
 
-        <div class="item" v-if="anticoagulant.gaimingcheng != -1 && isShow('钙名称')">
-          <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 class="item" v-if="anticoagulant.gaimingcheng != -1 && isShow('钙名称')">
+            <label class="name" for="g">钙名称</label>
+            <div class="content">
+              <input type="text" id="g" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaimingcheng"
+                     :disabled="anticoagulant.gaimingcheng==1?false:true">
+            </div>
           </div>
-        </div>
 
-        <div class="item" v-if="anticoagulant.gaijiliang != -1 && isShow('钙剂量')">
-          <label class="name" for="gjl">钙剂量</label>
-          <div class="content">
-            <input type="text" id="gjl" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaimingcheng"
-                   :disabled="anticoagulant.gaimingcheng==1?false:true">
+          <div class="item" v-if="anticoagulant.gaijiliang != -1 && isShow('钙剂量')">
+            <label class="name" for="gjl">钙剂量({{anticoagulant.gaimingcheng_unit}})</label>
+            <div class="content">
+              <input type="text" id="gjl" class="inputBox" v-model="dialysisPrescription.anticoagulant_gaijiliang"
+                     :disabled="anticoagulant.gaijiliang==1?false:true">
+            </div>
           </div>
-        </div>
         <!-- <div class="item">
           <label class="name" for="gtz">干体重(kg)</label>
           <div class="content">
@@ -1049,7 +1069,7 @@
       GetModeByModeId: function (val) {
         let treatment_mode_name = ''
         let treatment_mode = this.modeOption
-        
+
         for (let keys in treatment_mode) {
           if (treatment_mode[keys].id == val) {
             treatment_mode_name = treatment_mode[keys].name
@@ -1066,6 +1086,7 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow = true
+
             }
           }
         }