Bläddra i källkod

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

28169 3 dagar sedan
förälder
incheckning
ed3baf0b88

+ 6 - 5
src/pages/main/template/DialysisPrintOrderSeventythree.vue Visa fil

@@ -466,13 +466,14 @@
466 466
                   <div class="inline_block" style="flex: 1">
467 467
                     处方脱水量:
468 468
                     <div class="under_line" style="width: 50px; text-align: center">
469
-                      {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
469
+                      {{ prescription.prescription_water ? prescription.prescription_water : "/" }}
470 470
                     </div>ml
471 471
                   </div>
472 472
                   <div class="inline_block" style="flex: 1">
473 473
                     超滤总量:
474 474
                     <div class="under_line" style="width: 50px; text-align: center">
475
-                      {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
475
+                      {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
476
+                      <!-- {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }} -->
476 477
                     </div>ml
477 478
                   </div>
478 479
                   <div class="inline_block" style="flex: 1">
@@ -1626,9 +1627,9 @@ export default {
1626 1627
               this.monitors[index].end = '【结束透析】回血' + this.dialysisOrder.blood_drawing  + "ml/min"
1627 1628
               tempmonitorflag = false
1628 1629
             }
1629
-            if (tempmonitorflag && index == this.monitors.length - 1) {
1630
-              this.monitors[index].end = '【结束透析】回血' + this.dialysisOrder.blood_drawing  + "ml/min"
1631
-            }
1630
+            // if (tempmonitorflag && index == this.monitors.length - 1) {
1631
+            //   this.monitors[index].end = '【结束透析】回血' + this.dialysisOrder.blood_drawing  + "ml/min"
1632
+            // }
1632 1633
           }
1633 1634
         }
1634 1635
 

+ 5 - 4
src/pages/main/template/DialysisPrintOrderSix.vue Visa fil

@@ -359,10 +359,11 @@
359 359
                     </div>
360 360
                   </div>
361 361
                   <div class="inline_block" style="margin-left:10px;flex:1;">
362
-                    置换量:
362
+                    <span v-if="org_id!=9538">置换量:</span>
363
+                    <span v-if="org_id==9538">预计置换液量:</span>
363 364
                     <div class="under_line" style="width: 70px;text-align: center">
364
-                      <span v-if="org_id!=10206">{{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}</span>
365
-                      <span v-if="org_id==10206">{{prescription.replacement_total?prescription.replacement_total:'/'}}</span>
365
+                      <span v-if="org_id!=10206 && org_id!=10624">{{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}</span>
366
+                      <span v-if="org_id==10206 || org_id==10624">{{prescription.replacement_total?prescription.replacement_total:'/'}}</span>
366 367
                     </div>
367 368
                     L
368 369
                   </div>
@@ -793,7 +794,7 @@
793 794
                       <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id ==10629 || org_id == 10567 || org_id ==10724">KT/V</td>
794 795
                       <td width="50" v-if="org_id == 9919">在线尿素监测</td>
795 796
                       <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>
796
-                      
797
+
797 798
                       <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id == 9919">血容量<br />(L)</td>
798 799
                       <td width="50" v-if="org_id ==10490">碳酸氢钠用量<br />(ml)</td>
799 800
                       <td width="200">病情变化及处理</td>

+ 2 - 2
src/pages/new_Patientscheduling/ScheduleItem.vue Visa fil

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

+ 29 - 17
src/pages/new_Patientscheduling/new_content.vue Visa fil

@@ -25,7 +25,7 @@
25 25
         </div>
26 26
       </div>
27 27
     </div>
28
-    <div style="margin-top: 20px;height: 81vh;">
28
+    <div style="margin-top: 20px;height: 82vh;">
29 29
       <el-table
30 30
         :row-style="{ color: '#303133' }"
31 31
         :header-cell-style="{
@@ -175,11 +175,14 @@
175 175
             :append-to-body = 'true'
176 176
 
177 177
             :show-close="false"
178
-              width="50%">
178
+              width="70%">
179 179
               <div>
180
-                <div class="listBox">
180
+                <div style="border-bottom: 1px solid #e5e5e5;">
181 181
                   <van-search v-model="schedulingVal2" @clear="onclear2"
182 182
                   @input="onUpdate2" placeholder="请输入搜索关键词" />
183
+                </div>
184
+                <div class="listBox">
185
+                 
183 186
                   <div v-for="(item,index) in huangxiu_arr" :key='index' @click="Select_click(item)">
184 187
                     {{ item.name }}
185 188
                   </div>
@@ -870,29 +873,34 @@ export default{
870 873
     onclear(){
871 874
       this.getlist()
872 875
     },
873
-    onclear2(){
876
+    onclear2(){    
874 877
       this.getGetAllPatients()
875 878
     },
876 879
     // 搜索
877 880
     onUpdate(val){
878
-      this.schedulingVal = val
879
-      this.scheduleZone
880
-      var suos=[]
881
-      for(let i in this.scheduleZone){
882
-        if(this.schedulingVal!=''){
883
-          if(this.scheduleZone[i].Mon_A.patient.includes(this.schedulingVal)||
884
-            this.scheduleZone[i].Mon_M.patient.includes(this.schedulingVal)||
885
-            this.scheduleZone[i].Mon_N.patient.includes(this.schedulingVal))
886
-          {
887
-            suos.push(this.scheduleZone[i])
881
+      if(val !=''){
882
+        this.schedulingVal = val
883
+        this.scheduleZone
884
+        var suos=[]
885
+        for(let i in this.scheduleZone){
886
+          if(this.schedulingVal!=''){
887
+            if(this.scheduleZone[i].Mon_A.patient.includes(this.schedulingVal)||
888
+              this.scheduleZone[i].Mon_M.patient.includes(this.schedulingVal)||
889
+              this.scheduleZone[i].Mon_N.patient.includes(this.schedulingVal))
890
+            {
891
+              suos.push(this.scheduleZone[i])
892
+            }
893
+          }else{
894
+            this.getlist()
888 895
           }
889
-        }else{
890
-          this.getlist()
891 896
         }
897
+        this.scheduleZone=suos
898
+      }else{
899
+        this.getlist()
892 900
       }
893
-      this.scheduleZone=suos
894 901
     },
895 902
     onUpdate2(val){
903
+      if(val != ''){
896 904
         this.schedulingVal2=val
897 905
         const namearr = []
898 906
         for(let i in this.huangxiu_arr){
@@ -905,7 +913,11 @@ export default{
905 913
           }
906 914
         }
907 915
         this.huangxiu_arr = namearr
916
+      }else{
917
+        this.getGetAllPatients()
918
+      }
908 919
     },
920
+   
909 921
     // 修改
910 922
     patientedit(value){
911 923
       this.xiugaishow=true