上传代码

src/pages/main/dialog/AcceptsDialog.vue

@@ -475,6 +475,9 @@ export default {
   .el-radio {
     margin-right: 14px;
     width: 2.2rem;
+    @media only screen and (min-width: 768px) {
+      margin-bottom: 0.34rem;
+    }
   }
   .el-radio__inner {
     width: 16px !important;

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,7 +1086,11 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow = true
+<<<<<<< .mine
               console.log("aa")
+=======
+
+>>>>>>> .theirs
             }
           }
         }

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

@@ -6,7 +6,7 @@
           <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 class="newSpan" @click="addOrderByTemplateAction">选择模板</span>
@@ -18,7 +18,12 @@
         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input class="typeInput" 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>
@@ -38,7 +43,11 @@
             <label>开嘱时间 {{ record_date_str }}</label>
           </div>
         </div>
-        <div id="newDialogContent" class="DialogContent choose" style="height: 6.2rem;">
+        <div
+          id="newDialogContent"
+          class="DialogContent choose"
+          style="height: 6.2rem;"
+        >
           <div class="newAddTable">
             <table class="table">
               <tr>
@@ -61,16 +70,20 @@
                 >
                   <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>
+                  >
+                    {{ 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-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>
@@ -87,8 +100,12 @@
                 >
                   <td
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
-                  >{{ subdrug.title }}</td>
-                  <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
+                  >
+                    {{ subdrug.title }}
+                  </td>
+                  <td>
+                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
+                  </td>
                   <td>
                     <span v-if="subdrug.prescribing_number">
                       {{ subdrug.prescribing_number

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

@@ -5,7 +5,7 @@
         <span class="iconfont">&#xe720;</span>返回
       </div>
       <h1 class="name">{{ title }}</h1>
-      <span class="success"></span>
+      <span class="success" style="width:36px;"></span>
     </div>
 
     <div class="optionsBox">
@@ -82,17 +82,21 @@ export default {
 .optionsBox {
   background: #fff;
   min-height: 5rem;
-  @media only screen and (max-width: 812px) {
-    min-height: 8rem !important;
+  @media only screen and (max-width: 767px) {
+    min-height: 13.8rem;
   }
+  // @media only screen and (max-width: 812px) {
+  //   min-height: 11.8rem;
+  // }
   ul {
     overflow-y: scroll;
-    max-height: 9rem;
+    max-height: 16rem;
     li {
-      height: 1rem;
-      line-height: 1rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       border-bottom: 1px #e5e5e5 solid;
       padding: 0 0.38rem;
+      font-size: 0.45rem;
     }
     .tick {
       position: relative;
@@ -117,10 +121,14 @@ export default {
   max-height: 6.8rem;
   min-height: 5rem;
   overflow-y: scroll;
-  @media only screen and (max-width: 812px) {
-    max-height: 8rem !important;
+  @media only screen and (max-width: 767px) {
+    max-height: 11.8rem !important;
     min-height: 8rem !important;
   }
+  // @media only screen and (max-width: 812px) {
+  //   max-height: 8rem !important;
+  //   min-height: 8rem !important;
+  // }
   ul {
     li {
       line-height: 1rem;

src/pages/personal/ElectronicSignature.vue

@@ -484,7 +484,7 @@ export default {
   //   height: 400px !important;
   // }
   @media only screen and (min-width: 768px) {
-    width: 1000px !important;
+    width: 768px !important;
     height: 400px !important;
   }
 }