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

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -1288,11 +1288,7 @@
                               <td width="50">
                                 <div class="under-line">
                                   &nbsp;{{
-                                    record.assessment_before_dislysis
-                                      .weight_before
-                                      ? record.assessment_before_dislysis
-                                          .weight_before
-                                      : ""
+                                    record.lastafterweight.weight_after ? record.lastafterweight.weight_after : ""
                                   }}
                                 </div>
                               </td>
@@ -1316,11 +1312,7 @@
                               <td width="50">
                                 <div class="under-line">
                                   &nbsp;{{
-                                    record.assessment_before_dislysis
-                                      .weight_before
-                                      ? record.assessment_before_dislysis
-                                          .weight_before
-                                      : ""
+                                   record.assessment_after_dislysis.weight_after ? record.assessment_after_dislysis.weight_after : ""
                                   }}
                                 </div>
                               </td>

src/xt_pages/dialysis/signPrint.vue

@@ -20,8 +20,6 @@
                             <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
-                            
-                            
                             </span> 
                             </div>  
                             <div v-if="org_id == 10138 || org_id == 10278">
@@ -32,8 +30,8 @@
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
-                            <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
+                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{it.delivery_way}}</span></div>  
+                            <div v-if="org_id!=10278 && org_id !=10740">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
@@ -53,8 +51,8 @@
                             
                             </div>  
                             <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
-                            <div>给药途径:{{its.delivery_way}}</div>  
+                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{its.delivery_way}}</span></div>  
+                            <div v-if="org_id !=10740">给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>

src/xt_pages/medicalScheduling/index.vue

@@ -1021,8 +1021,6 @@ export default {
                         }
                     })
                     newDoctor.sort(this.compare('sort'))
-
-
                     let arr2 = []
 
                     arr2.push({class_name:oneStr,schedule_week:1})
@@ -1040,15 +1038,30 @@ export default {
                     arr2.push(obj)
 
                     let data = []
-
+                    let data2 = []
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
                     console.log("data2o2oo2o2o2o22o",data)
-
+                    // if(this.typeValue!=0){
+                    //   console.log("医生",this.typeValue)
+                    //   for(let i in data){
+                    //     if(data[i].user_type == this.typeValue){
+                    //       data2.push(data[i])
+                    //     }
+                    //   }
+                    //   data2.push(obj)
+                    //   this.tableData = data2
+                    // }else{
+                    //   console.log("护士",this.typeValue)
+                    //   data.push(obj)
+                    //   this.tableData = data
+                    // }
+                    
+                    
                     // this.tableData = this.distinct(data)
                     this.tableData = data
-
+                   
 
                 }
             })
@@ -2018,6 +2031,8 @@ export default {
             }
         },
         tableCellStyle (row, rowIndex, column) {
+          // console.log('3333',row);
+          
             var week = (row.column.label).split('');
             var weeks = 0
             if (week.length == 13) {
@@ -2026,6 +2041,9 @@ export default {
             if (week.length == 14) {
                 weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
             }
+            if (week.length == 15) {
+                weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]+week[13]
+            }
             var weekdate =  this.getTimestamp(weeks)
             if(weekdate  < this.timeNow){
             return 'background-color:#e5e5e5;'
@@ -2072,7 +2090,7 @@ export default {
 
        },
 
-     getTimestamp(time) { //把时间日期转成时间戳
+      getTimestamp(time) { //把时间日期转成时间戳
           return (new Date(time)).getTime() / 1000
        },
        exportList(){
@@ -2130,7 +2148,6 @@ export default {
          })
        },
 
-
        hoverMouse(row,column, cell, event){
         this.name=row.user_name
         this.column_lie= column.label.split('\n')[0]