Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_fifteen.vue

@@ -56,7 +56,7 @@
                                     <label-box showValue="住院" :isChecked="record.receive_assessment.condition == 1 ? true : false"></label-box>
                                 </td>
                                 <td style="padding-left:5px;width:25%;text-align:left;border-left:none;border-right:none;">其他</td>
-                                
+
                             </tr>
                         </table>
                         <table class="table-box" border="1" style="border:none;border-color:#000;border-collapse: collapse;">
@@ -221,8 +221,8 @@
                                     </span>
                                 </span>
                             <!-- </span> -->
-                            
-                            
+
+
                         </span>
                     </td>
                     <td>
@@ -282,7 +282,7 @@
                         <p style="height:20px;line-height:20px">电导率</p>
                         <p style="height:20px;line-height:20px">ms/cm</p>
                     </th>
-                    
+
                     <th style="min-width:60px">
                         <p style="height:20px;line-height:20px">温度</p>
                         <p style="height:20px;line-height:20px">℃</p>
@@ -332,7 +332,7 @@
                         </span>
                     </td>
 
-                    
+
                     </tr>
                 </table>
                 <table class="print-table" border="1">
@@ -444,9 +444,9 @@
                     </tr>
                     </tbody>
                 </table>
-                
+
                 <table class="print-table" border="1">
-                    
+
                 </table>
 
 
@@ -575,7 +575,7 @@ export default {
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
   },
   mounted() {
-    console.log(this.records)
+    // console.log(this.records)
     this.loading = true
     var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids
     if (ids.length == 0) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -35,7 +35,7 @@
         <span v-else>出血部位：无</span>
       </div>
       <div class="lineHeight">
-          <div class="widthLength25">是否跌倒：暂无</div>
+          <div class="widthLength25">是否跌倒：{{ receiverTreatmentAccess.tumble == 1 ? '是' : '否' }}</div>
           <div class="widthLength25">跌倒预防措施：{{ receiverTreatmentAccess.precaution ? receiverTreatmentAccess.precaution : '/' }}</div>
           <div class="widthLength25">跌倒风险：
               <span v-if="receiverTreatmentAccess.danger_level == 1">无</span>
@@ -97,9 +97,16 @@
           </div>
           <div class="widthLength25">T：{{ afterdialysis.temperature ? afterdialysis.temperature : '' }}℃</div>
           <div class="widthLength25">意识：
-
+            <span v-for="(item, index) in consciousness_arr" :key="index">
+              <span v-if="afterdialysis.consciousness == item.id">{{ item.name }}</span>
+            </span>
+          </div>
+          <div class="widthLength25">跌倒风险：
+            <span v-if="afterdialysis.fallrisk == 1">无</span>
+            <span v-if="afterdialysis.fallrisk == 2">低风险</span>
+            <span v-if="afterdialysis.fallrisk == 3">中度风险</span>
+            <span v-if="afterdialysis.fallrisk == 4">高风险</span>
           </div>
-          <div class="widthLength25">跌倒风险：</div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">实际进食量：{{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }} g</div>