Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/template/DialysisPrintOrderSeventythree.vue

@@ -466,13 +466,14 @@
                   <div class="inline_block" style="flex: 1">
                     处方脱水量：
                     <div class="under_line" style="width: 50px; text-align: center">
-                      {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
+                      {{ prescription.prescription_water ? prescription.prescription_water : "/" }}
                     </div>ml
                   </div>
                   <div class="inline_block" style="flex: 1">
                     超滤总量：
                     <div class="under_line" style="width: 50px; text-align: center">
-                      {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
+                      {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
+                      <!-- {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }} -->
                     </div>ml
                   </div>
                   <div class="inline_block" style="flex: 1">
@@ -1626,9 +1627,9 @@ export default {
               this.monitors[index].end = '【结束透析】回血' + this.dialysisOrder.blood_drawing  + "ml/min"
               tempmonitorflag = false
             }
-            if (tempmonitorflag && index == this.monitors.length - 1) {
-              this.monitors[index].end = '【结束透析】回血' + this.dialysisOrder.blood_drawing  + "ml/min"
-            }
+            // if (tempmonitorflag && index == this.monitors.length - 1) {
+            //   this.monitors[index].end = '【结束透析】回血' + this.dialysisOrder.blood_drawing  + "ml/min"
+            // }
           }
         }
 

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -359,10 +359,11 @@
                     </div>
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
-                    置换量：
+                    <span v-if="org_id!=9538">置换量：</span>
+                    <span v-if="org_id==9538">预计置换液量：</span>
                     <div class="under_line" style="width: 70px;text-align: center">
-                      <span v-if="org_id!=10206">{{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}</span>
-                      <span v-if="org_id==10206">{{prescription.replacement_total?prescription.replacement_total:'/'}}</span>
+                      <span v-if="org_id!=10206 && org_id!=10624">{{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}</span>
+                      <span v-if="org_id==10206 || org_id==10624">{{prescription.replacement_total?prescription.replacement_total:'/'}}</span>
                     </div>
                     L
                   </div>
@@ -793,7 +794,7 @@
                       <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id ==10629 || org_id == 10567 || org_id ==10724">KT/V</td>
                       <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                       <td width="50" v-if="org_id != 9919 && org_id!=9538 && org_id!=9675 && org_id!=10617 && org_id!=10629&&org_id!=10644&& org_id!=10679&& org_id!=10683 && org_id!=9829 && org_id!=10567 && org_id!=10724">KT/V</td>
-                      
+
                       <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id == 9919">血容量<br />(L)</td>
                       <td width="50" v-if="org_id ==10490">碳酸氢钠用量<br />(ml)</td>
                       <td width="200">病情变化及处理</td>

src/pages/new_Patientscheduling/ScheduleItem.vue

@@ -1,13 +1,13 @@
 <template>
   <!-- 排班表填充内容 -->
     <div>
-      <div style="min-width: 60px;min-height: 20px;">
+      <div style="min-width: 60px;min-height: 20px;font-size: 12px;">
           <span :class='modeColor(scheduleDetail.mode_id)'>{{scheduleDetail.patient}}</span>
           <span v-if="scheduleDetail.mode_id>2 && scheduleDetail.mode_id !=0">
             <br/>
           </span>
           <template v-if="schedulMode">
-            <span v-if="scheduleDetail.mode_id>0"  :class='modeColor(scheduleDetail.mode_id)' >{{'('+modename(scheduleDetail.mode_id)+')'}}</span>
+            <span v-if="scheduleDetail.mode_id>0"  :class='modeColor(scheduleDetail.mode_id)'>{{'('+modename(scheduleDetail.mode_id)+')'}}</span>
           </template>
           <!-- <template v-if="schedulFlag">
             <br/><span>{{scheduleDetail.dialysis_machine_name}}</span>

src/pages/new_Patientscheduling/new_content.vue

@@ -25,7 +25,7 @@
         </div>
       </div>
     </div>
-    <div style="margin-top: 20px;height: 81vh;">
+    <div style="margin-top: 20px;height: 82vh;">
       <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
@@ -175,11 +175,14 @@
             :append-to-body = 'true'
 
             :show-close="false"
-              width="50%">
+              width="70%">
               <div>
-                <div class="listBox">
+                <div style="border-bottom: 1px solid #e5e5e5;">
                   <van-search v-model="schedulingVal2" @clear="onclear2"
                   @input="onUpdate2" placeholder="请输入搜索关键词" />
+                </div>
+                <div class="listBox">
+                 
                   <div v-for="(item,index) in huangxiu_arr" :key='index' @click="Select_click(item)">
                     {{ item.name }}
                   </div>
@@ -870,29 +873,34 @@ export default{
     onclear(){
       this.getlist()
     },
-    onclear2(){
+    onclear2(){    
       this.getGetAllPatients()
     },
     // 搜索
     onUpdate(val){
-      this.schedulingVal = val
-      this.scheduleZone
-      var suos=[]
-      for(let i in this.scheduleZone){
-        if(this.schedulingVal!=''){
-          if(this.scheduleZone[i].Mon_A.patient.includes(this.schedulingVal)||
-            this.scheduleZone[i].Mon_M.patient.includes(this.schedulingVal)||
-            this.scheduleZone[i].Mon_N.patient.includes(this.schedulingVal))
-          {
-            suos.push(this.scheduleZone[i])
+      if(val !=''){
+        this.schedulingVal = val
+        this.scheduleZone
+        var suos=[]
+        for(let i in this.scheduleZone){
+          if(this.schedulingVal!=''){
+            if(this.scheduleZone[i].Mon_A.patient.includes(this.schedulingVal)||
+              this.scheduleZone[i].Mon_M.patient.includes(this.schedulingVal)||
+              this.scheduleZone[i].Mon_N.patient.includes(this.schedulingVal))
+            {
+              suos.push(this.scheduleZone[i])
+            }
+          }else{
+            this.getlist()
           }
-        }else{
-          this.getlist()
         }
+        this.scheduleZone=suos
+      }else{
+        this.getlist()
       }
-      this.scheduleZone=suos
     },
     onUpdate2(val){
+      if(val != ''){
         this.schedulingVal2=val
         const namearr = []
         for(let i in this.huangxiu_arr){
@@ -905,7 +913,11 @@ export default{
           }
         }
         this.huangxiu_arr = namearr
+      }else{
+        this.getGetAllPatients()
+      }
     },
+   
     // 修改
     patientedit(value){
       this.xiugaishow=true