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/DialysisPrintOrderFortySeven.vue

@@ -1165,7 +1165,7 @@
                             {{
                               monitor.displacement_quantity
                                 ? monitor.displacement_quantity
-                                : ""
+                                : "0"
                             }}
                           </span>
                       </td>

src/pages/main/template/DialysisPrintOrderThirtyOne.vue

@@ -468,12 +468,21 @@
                 <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                 <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
                 <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
-                <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'0'}}</td>
+                <td>&nbsp;
+                  <span v-if="monitor.operate_time <= dialysisOrder.end_time">
+                    {{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'0'}}
+                  </span>
+                  
+                </td>
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                 <!-- <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td> -->
-                <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:'0'}}</td>
+                <td>&nbsp;
+                  <span v-if="monitor.operate_time <= dialysisOrder.end_time">
+                    {{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:'0'}}
+                  </span>
+                </td>
                 <td>
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>
                   <span v-if="monitor.dispose"> {{ "  " + monitor.dispose }} </span>

src/pages/new_Patientscheduling/new_content.vue

@@ -178,7 +178,7 @@
               width="70%">
               <div>
                 <div style="border-bottom: 1px solid #e5e5e5;">
-                  <van-search v-model="schedulingVal2" @clear="onclear2"
+                  <van-search v-model="schedulingVal2" @clear="onclear2" 
                   @input="onUpdate2" placeholder="请输入搜索关键词" />
                 </div>
                 <div class="listBox">
@@ -609,6 +609,7 @@ export default{
       ,{id:15,name:'IUF+HD'},{id:16,name:'UF'},{id:17,name:'HD+'},{id:18,name:'血浆胆红素吸附+HDF'},{id:19,name:'H血浆胆红素吸附'},{id:20,name:'I-HDF'},{id:21,name:'HD高通'}
       ,{id:22,name:'CVVH'},{id:23,name:'CVVHD'},{id:24,name:'CVVHDF'},{id:25,name:'PE'},{id:26,name:'血浆胆红素吸附+HP'},{id:27,name:'HPD'},{id:28,name:'HDP'}
       ,{id:29,name:'HFD'},{id:30,name:'HDF100'},{id:31,name:'HDF600'},{id:32,name:'HDF800'},{id:33,name:'HDF1000'}],
+      options_arr:[],
     }
   },
   computed:{
@@ -815,6 +816,7 @@ export default{
               }
             }
             this.scheduleZone=scheduleZone
+            this.schedule_list = scheduleZone
           }
           console.log("34455555566666",this.scheduleZone)
         }
@@ -826,6 +828,7 @@ export default{
         if(response.data.state==1){
           const huanzhi_arr = response.data.data.patients
           this.huangxiu_arr = huanzhi_arr
+          this.options_arr = huanzhi_arr
           // console.log('cccccc',this.huangxiu_arr);
         }
       })
@@ -882,13 +885,13 @@ export default{
         this.schedulingVal = val
         this.scheduleZone
         var suos=[]
-        for(let i in this.scheduleZone){
+        for(let i in this.schedule_list){
           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))
+            if(this.schedule_list[i].Mon_A.patient.indexOf(this.schedulingVal) != -1||
+              this.schedule_list[i].Mon_M.patient.indexOf(this.schedulingVal) != -1 ||
+              this.schedule_list[i].Mon_N.patient.indexOf(this.schedulingVal) != -1)
             {
-              suos.push(this.scheduleZone[i])
+              suos.push(this.schedule_list[i])
             }
           }else{
             this.getlist()
@@ -903,21 +906,16 @@ export default{
       if(val != ''){
         this.schedulingVal2=val
         const namearr = []
-        for(let i in this.huangxiu_arr){
-          if(this.schedulingVal2 !=''){
-            if(this.huangxiu_arr[i].name.includes(this.schedulingVal2)){
-              namearr.push(this.huangxiu_arr[i])
-            }
-          }else{
-            this.getGetAllPatients()
-          }
+        for(let i in this.options_arr){
+          if(this.options_arr[i].name.indexOf(this.schedulingVal2) !=-1){
+            namearr.push(this.options_arr[i])
+          } 
         }
         this.huangxiu_arr = namearr
       }else{
         this.getGetAllPatients()
       }
     },
-   
     // 修改
     patientedit(value){
       this.xiugaishow=true