3月1

src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue

@@ -118,7 +118,7 @@
                 v-for="(item, i) in way_arr"
                 class="under_line"
                 v-if="record.receive_assessment.way == item.id"
-                style="width: 100px; text-align: left"
+                style="width: 60px; text-align: left"
               >
                 {{ item.name }}
               </div>
@@ -126,19 +126,19 @@
             <!-- 病人意识 -->
             <div class="inline_block">
               病人意识:
-              <div class="under_line" style="width: 80px; text-align: left">
-                <div v-for="(item, index) in consciousness_arr">
+              <div class="under_line" style="width: 60px; text-align: left">
+                <span v-for="(item, index) in consciousness_arr">
                   <span v-if="record.receive_assessment.consciousness==item.id">{{ item.name }}</span>
-                </div>
+                </span>
               </div>
             </div>
             <!-- 病人情况 -->
             <div class="inline_block">
               病人情况:
-              <div class="under_line" style="width: 80px; text-align: left">
-                <div v-for="item in condition">
+              <div class="under_line" style="width: 60px; text-align: left">
+                <span v-for="item in condition">
                   <span v-if="record.receive_assessment.condition==item.id">{{ item.lable }}</span>
-                </div>
+                </span>
               </div>
             </div>
             <div class="inline_block" style="margin-left: 10px" >
@@ -1198,7 +1198,7 @@
                           <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                           <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
                           <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
-                          <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7">肝素剩余量度(ml)</div>
+                          <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">肝素剩余量度(ml)</div>
                           <div style="flex: 2;">病情变化及处理</div>
                         </div>
                     </div>
@@ -1234,7 +1234,7 @@
                       <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">
                         {{ monitor_record.replacement_speed ? monitor_record.replacement_speed : "" }}
                       </div>
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7">
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">
 
                       </div>
                       <div style="flex: 2;">
@@ -1547,7 +1547,7 @@
                   :key="index"
                   class="under_line"
                   v-if="record.receive_assessment.way == item.id"
-                  style="width: 100px; text-align: left"
+                  style="width: 60px; text-align: left"
                 >
                   {{ item.name }}
                 </div>
@@ -1555,19 +1555,19 @@
                <!-- 病人意识 -->
               <div class="inline_block">
                 病人意识:
-                <div class="under_line" style="width: 80px; text-align: left">
-                  <div v-for="(item, index) in consciousness_arr">
+                <div class="under_line" style="width: 60px; text-align: left">
+                  <span v-for="(item, index) in consciousness_arr">
                     <span v-if="record.receive_assessment.consciousness==item.id">{{ item.name }}</span>
-                  </div>
+                  </span>
                 </div>
               </div>
               <!-- 病人情况 -->
               <div class="inline_block">
                 病人情况:
-                <div class="under_line" style="width: 80px; text-align: left">
-                  <div v-for="item in condition">
+                <div class="under_line" style="width: 60px; text-align: left">
+                  <span v-for="item in condition">
                     <span v-if="record.receive_assessment.condition==item.id">{{ item.lable }}</span>
-                  </div>
+                  </span>
                 </div>
               </div>
               <div class="inline_block" style="margin-left: 10px" >

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -114,7 +114,7 @@
               v-for="(item, index) in way_arr"
               class="under_line"
               v-if="receiverTreatmentAccess.way == item.id"
-              style="width: 80px; text-align: left"
+              style="width: 60px; text-align: left"
             >
               {{ item.name }}
             </div>
@@ -123,19 +123,23 @@
           <!-- 病人意识 -->
           <div class="inline_block">
             病人意识:
-            <div class="under_line" style="width: 80px; text-align: left">
-              <div v-for="(item, index) in consciousness_arr">
+            <div class="under_line" style="width: 60px; text-align: left" 
+              >
+              <!-- <div  style="display: inline-block;"> -->
+              <span v-for="(item, index) in consciousness_arr">
                 <span v-if="receiverTreatmentAccess.consciousness==item.id">{{ item.name }}</span>
-              </div>
+              </span>
+              <!-- </div> -->
             </div>
           </div>
           <!-- 病人情况 -->
           <div class="inline_block">
             病人情况:
-            <div class="under_line" style="width: 80px; text-align: left">
-              <div v-for="item in condition">
+            <div class="under_line" style="width: 60px; text-align: left"
+            >
+              <span v-for="item in condition">
                 <span v-if="receiverTreatmentAccess.condition==item.id">{{ item.lable }}</span>
-              </div>
+              </span>
             </div>
           </div>
 
@@ -1095,7 +1099,9 @@
                       <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
                       <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name == 7">肝素剩余量度(ml)</div>
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name == 7 && 
+                        prescription.anticoagulant_name != ''">肝素剩余量度(ml)
+                      </div>
                       <div style="flex: 2;">病情变化及处理</div>
                     </div>
                   </div>
@@ -1148,7 +1154,7 @@
                     <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">
                       {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}
                     </div>
-                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7">
+                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant == 7 && prescription.anticoagulant_name != ''">
 
                     </div>
                     <div style="flex: 2;">
@@ -1428,25 +1434,26 @@
                 v-for="(item, index) in way_arr"
                 class="under_line"
                 v-if="receiverTreatmentAccess.way == item.id"
-                style="width: 80px; text-align: left"
+                style="width: 60px; text-align: left"
               >
                 {{ item.name }}
               </div>
             </div>
             <div class="inline_block">
               病人意识:
-              <div class="under_line" style="width: 80px; text-align: left">
-                <div v-for="(item, index) in consciousness_arr">
-                  <span v-if="receiverTreatmentAccess.consciousness==item.id">{{ item.name }}</span>
-                </div>
+              <div class="under_line" style="width: 60px; text-align: left">
+              <span v-for="(item, index) in consciousness_arr">
+                <span v-if="receiverTreatmentAccess.consciousness==item.id">{{ item.name }}</span>
+              </span>
               </div>
             </div>
             <div class="inline_block">
               病人情况:
-              <div class="under_line" style="width: 80px; text-align: left">
-                <div v-for="item in condition">
-                  <span v-if="receiverTreatmentAccess.condition==item.id">{{ item.lable }}</span>
-                </div>
+              <div class="under_line" style="width: 60px; text-align: left" >
+
+                  <span v-for="item in condition">
+                    <span v-if="receiverTreatmentAccess.condition==item.id">{{ item.lable }}</span>
+                  </span>
               </div>
             </div>
             <div class="inline_block" style="margin-left: 10px" >