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_sixtyeight.vue

@@ -800,7 +800,8 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          {{
+                         <span v-if="org_id!=10677">
+                         {{
                             record.prescription &&
                             record.prescription.dialyzer_perfusion_apparatus
                               ? record.prescription.dialyzer_perfusion_apparatus
@@ -812,6 +813,7 @@
                               ? record.prescription.dialysis_dialyszers
                               : "/"
                           }}
+                          </span>
                           {{record.dialysis_order.dialysis_dialyszers}}
                         </div>
                       </div>
@@ -821,12 +823,14 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
+                         <span v-if="org_id!=10677">
                           {{
                             record.prescription &&
                             record.prescription.dialysis_irrigation
                               ? record.prescription.dialysis_irrigation
                               : "/"
                           }}
+                          </span>
                           {{record.dialysis_order.dialysis_irrigation}}
                         </div>
                       </div>
@@ -850,7 +854,7 @@
                     </div>
 
                     <div
-                    
+
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
@@ -881,7 +885,7 @@
                           <span>{{
                             record.lastafterweight.weight_after
                           }}</span>
-                       
+
                         </div>
                         kg
                       </div>
@@ -918,7 +922,7 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span> 
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span>
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460">L</span>
                       </div>
 
@@ -1186,7 +1190,7 @@
                           >mg</span
                         >
                       </div>
-                      
+
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：
                         <div
@@ -1211,7 +1215,7 @@
                         >
                           {{
                              record.assessment_before_dislysis.machine_type ?
-                              record.assessment_before_dislysis.machine_type : '' 
+                              record.assessment_before_dislysis.machine_type : ''
                           }}
                         </div>
                       </div>
@@ -1243,7 +1247,7 @@
                         </div>
                         h
                       </div>
-                      
+
                       <span>&nbsp;&nbsp;&nbsp;</span>
                     </div>
 
@@ -1313,7 +1317,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id == 10121 || org_id == 9675 
+                              org_id == 10121 || org_id == 9675
                             "
                           >
                             SpO₂<br />(%)
@@ -1458,14 +1462,14 @@
                             }}
                           </td>
 
-                      
+
                           <td
                             v-if="
                               org_id != 9538 &&
                               org_id != 10121 &&
-                              org_id != 9675 && 
+                              org_id != 9675 &&
                               org_id!=10490
-                             
+
                             "
                           >
                             {{
@@ -1477,7 +1481,7 @@
 
                           <td
                             v-if="
-                              org_id == 10121 || org_id == 9675 
+                              org_id == 10121 || org_id == 9675
                             "
                           >
                             {{
@@ -1489,7 +1493,7 @@
 
                           <td
                             v-if="
-                              org_id == 10469 
+                              org_id == 10469
                             "
                           >
                             {{
@@ -1661,7 +1665,7 @@
                         <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
                         <td v-if="org_id == 9538"></td>
                         <td v-if="org_id == 10490 || org_id == 0"></td>
-                         
+
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1832,7 +1836,7 @@
                                 style="height: 40px"
                               />
                             </td>
-                            
+
                             <td height="35px" v-if="org_id == 10375">
                               <span
                                 v-if="
@@ -2010,7 +2014,7 @@
                 </div>
               </div>
             </div>
-            
+
             <div class="row">
               <div class="inline_block">
                 入科方式：
@@ -2286,7 +2290,7 @@
                         style="flex: 1"
                         v-if="org_id != 10223 || org_id!=10375"
                       >
-  
+
                         <span v-if="org_id!=10460 && org_id!=10551">
                           透析中入量  (L)：
                         </span>
@@ -2547,10 +2551,10 @@
                         </div>
                       </div>
 
-                  
+
                     </div>
 
-                   
+
                   </td>
                 </tr>
                 <tr>
@@ -3436,7 +3440,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-     
+
      if (val.id_card_no) {
        var thisLen = val.id_card_no.length
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -170,13 +170,13 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 ">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -125,6 +125,7 @@
        :prescription="prescription"
        :dryWeightList="dryWeightList"
        :docList="docList"
+       :first_monitor="first_monitor"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog
@@ -195,6 +196,7 @@
       :predialysis_evaluation="predialysis_evaluation"
       :dialysis_order="dialysis_order"
       :schedual="temp_schedual"
+      :last_monitor="last_monitor"
     ></assessment-after-dislysis>
   </div>
 </template>
@@ -595,6 +597,18 @@ export default {
       default: () => {
         return { id: 0 };
       }
+    },
+    first_monitor:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    },
+    last_monitor:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
     }
   },
   methods: {

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -771,6 +771,12 @@ export default {
     schedual: {
         type: Object
     },
+    last_monitor:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    }
   },
   data() {
     return {
@@ -1423,6 +1429,26 @@ export default {
 
     // 数据开始
     show(predialysis,last_after) {
+      console.log("头号好地方阿道夫地方阿道夫阿道夫",this.last_monitor)
+
+      if(this.$store.getters.xt_user.template_info.org_id == 10679){
+        if(this.form.systolic_blood_pressure == 0){
+           this.form.systolic_blood_pressure = this.last_monitor.systolic_blood_pressure
+        }
+
+        if(this.form.diastolic_blood_pressure == 0){
+          this.form.diastolic_blood_pressure = this.last_monitor.diastolic_blood_pressure
+        }
+
+        if(this.form.breathing_rate == 0){
+          this.form.breathing_rate = this.last_monitor.breathing_rate
+        }
+
+        if(this.form.pulse_frequency == 0){
+          this.form.pulse_frequency = this.last_monitor.pulse_frequency
+        }
+
+      }
       this.isVisibility = true
       this.predialysis = predialysis
       this.form.observation_content = predialysis.observation_content
@@ -1584,7 +1610,7 @@ export default {
   },
   created() {
     // console.log("this.form", this.form.consciousness);
-
+   
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -1061,7 +1061,13 @@
         default:()=>{
           return [];
         }
-       }
+       },
+       first_monitor:{
+        type: Object,
+        default: () => {
+          return { id: 0 };
+        }
+      },
 
     },
     methods: {
@@ -1130,6 +1136,8 @@
            this.record_date = record_date
         }
 
+        console.log("第一条监测数据23333333333333333",this.first_monitor)
+
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
         //     console.log("2o2o3232o23o2o3o23")
@@ -1900,6 +1908,9 @@
 
       console.log("hhh32h323h23h23h23h23h23h",getDataConfig("befor_symptoms", "befor_symptoms"))
 
+
+     
+
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -448,9 +448,9 @@ export default {
         nuclein_date: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
         catheter_operation:"",
         blood_flow_volume:"" ,
+        schedual_type:0,
       },
       blood_access_option: [],
-      schedual_type: 0,
       schedules_type: [
         { id: 1, name: "上午" },
         { id: 2, name: "下午" },
@@ -544,7 +544,7 @@ export default {
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
     this.form.blood_drawing = this.dialysis_order.blood_drawing
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
-    // this.form.schedual_type = this.dialysis_order.schedule_type
+    this.form.schedual_type = this.dialysis_order.schedual_type
     // this.schedual_type = this.dialysis_order.schedule_type
     // console.log("班次",this.form.schedual_type)
     this.punctureNeedleOptions = getDataConfig(
@@ -602,7 +602,7 @@ export default {
       this.form.blood_access_id = this.dialysis_order.blood_access_id;
       this.form.blood_drawing = this.dialysis_order.blood_drawing
       var blood_access_option_name = this.changeBloodAccessOpionOne(this.dialysis_order.blood_access_id)
-      // this.form.schedual_type = this.dialysis_order.schedule_type
+      this.form.schedual_type = this.dialysis_order.schedual_type
       // console.log("8823832323223",this.form.schedual_type)
       this.blood_access_option_name = blood_access_option_name
       this.form.catheter_operation = this.dialysis_order.catheter_operation
@@ -748,7 +748,7 @@ export default {
     },
     GetSchedualNumber: function () {
       let ParamsQuery = {};
-      ParamsQuery["schedual_type"] = this.schedual_type;
+      ParamsQuery["schedual_type"] = this.form.schedual_type;
       ParamsQuery["record_date"] = this.$route.query.date;
       console.log("列表33333333333333333333", ParamsQuery);
       // console.log("路由",this.$route.query.date)
@@ -858,15 +858,15 @@ export default {
         let now = new Date();
         let hour = now.getHours();
         if (hour >= 6 && hour < 12) {
-          this.schedual_type = 1;
+          this.form.schedual_type = 1;
         } else if (hour >= 12 && hour < 18) {
-          this.schedual_type = 2;
+          this.form.schedual_type = 2;
         } else if (hour >= 18) {
-          this.schedual_type = 3;
+          this.form.schedual_type = 3;
         }
       } else {
         this.form.schedual_type = this.dialysis_order.schedual_type;
-        this.schedual_type = this.dialysis_order.schedual_type;
+        // this.schedual_type = this.dialysis_order.schedual_type;
       }
 
       if (this.dialysis_order.id > 0) {
@@ -914,7 +914,7 @@ export default {
             this.form.lood_drawing,
             this.form.puncture_nurse_id,
             this.form.start_time,
-            this.schedual_type,
+            this.form.schedual_type,
             mode,
             this.form.washpipe_nurse,
             this.form.change_nurse,
@@ -962,7 +962,7 @@ export default {
     },
     editOrder() {
       let ParamsQuery = {};
-      ParamsQuery["schedual_type"] = this.schedual_type;
+      ParamsQuery["schedual_type"] = this.form.schedual_type;
       ParamsQuery["id"] = this.dialysis_order.id;
       ParamsQuery["nurse"] = this.form.nurse_id;
       ParamsQuery["bed"] = this.form.bed_id;

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -143,7 +143,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -153,7 +153,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -268,7 +268,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677) &&
                 org_id!=10387
             "
           >
@@ -339,7 +339,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677)
               || org_id == 10387
             "
           >
@@ -395,7 +395,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677)
                 && org_id!=10387
             "
           >
@@ -448,7 +448,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677) ||
               org_id == 10387
             "
           >
@@ -511,7 +511,8 @@
                 org_id ==10445 ||
                 org_id ==10410 ||
                 org_id == 10395||
-                org_id == 10617
+                org_id == 10617 ||
+                org_id ==10677
 
                )&& org_id!=10598 && org_id!=10414
             "
@@ -542,7 +543,7 @@
               org_id !=10445 &&
               org_id!=10395 &&
               org_id !=10410 &&
-              org_id!=10617)|| org_id==10598 || org_id ==10414
+              org_id!=10617 && org_id!=10677)|| org_id==10598 || org_id ==10414
             "
           >
             <template slot-scope="scope">
@@ -1311,7 +1312,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629)
+                org_id==10580 || org_id ==10629 || org_id == 10677)
                 && org_id!=10387
             "
           >
@@ -1378,7 +1379,8 @@
               org_id!=10612 &&
               org_id!=10617 &&
               org_id!=10580 &&
-              org_id!=10629
+              org_id!=10629 &&
+              org_id!=10677
               )
               || org_id == 10387
             "
@@ -1423,7 +1425,8 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10395 &&
-              org_id!=10617)
+              org_id!=10617 &&
+              org_id!=10677)
               || org_id ==10558 || org_id==10598
             "
           >
@@ -1451,7 +1454,7 @@
                 org_id==10445 ||
                 org_id==10410 ||
                 org_id==10395 || 
-                org_id==10617) && org_id !=10558 && org_id!=10598 && org_id!=10414
+                org_id==10617 || org_id==10677) && org_id !=10558 && org_id!=10598 && org_id!=10414
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,14 +15,14 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617) && org_id!=10558 && org_id!=10598 && org_id!=10414" width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617) || org_id == 10558 || org_id ==10598 || org_id ==10414" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677) && org_id!=10558 && org_id!=10598 && org_id!=10414" width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677) || org_id == 10558 || org_id ==10598 || org_id ==10414" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414" width="92px" > 置换量(L) </th>

src/xt_pages/dialysis/details/index.vue

@@ -1061,6 +1061,8 @@
           :dryWeightList="dryWeightList"
           :docList="docList"
           :lastTreat="lastTreat"
+          :first_monitor="first_monitor"
+          :last_monitor="last_monitor"
         >
         </nav-igation>
 
@@ -1541,9 +1543,11 @@ export default {
       start_time:moment().startOf('months').format('YYYY-MM-DD'),
       end_time:moment().endOf('months').format('YYYY-MM-DD'),
       orderList:[],
-      lastTreat:{id:0}
+      lastTreat:{id:0},
       // start_time2:'',
       // end_time2:'',
+      first_monitor:{},
+      last_monitor:{},
     }
   },
   created() {
@@ -2130,7 +2134,12 @@ export default {
           this.stockType = stockType
 
           this.lastTreat = resp.data.lastAcceptTreatment
-          console.log("上次透后平出-----------",this.lastTreat)
+          console.log("上次透后平出22222222222222222222-----------",resp.data.firstMonitor)
+
+          this.first_monitor = resp.data.firstMonitor
+
+          console.log("上次透后体重-----------",resp.data.firstMonitor)
+          this.last_monitor = resp.data.lastMonitor
 
           this.dryWeightList = resp.data.dryWeightList
           this.docList = resp.data.docList
@@ -2521,7 +2530,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0
@@ -2700,7 +2709,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
-    
+
     <div id="dialysis-print-box-1"  ref="pdfContent">
       <div
         id="dialysis-print-box-1-1"
@@ -379,7 +379,7 @@
                     </div>
                     <div
                       class="inline_block"
-                      style="flex: 1" 
+                      style="flex: 1"
                     >
                       透析机型：
                       <div
@@ -795,7 +795,7 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        {{
+                       <span v-if="org_id!=10677">  {{
                           prescription.dialyzer_perfusion_apparatus
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
@@ -806,6 +806,7 @@
                             ? prescription.dialysis_dialyszers
                             : ""
                         }}
+                        </span>
 
                         {{dialysisOrder.dialysis_dialyszers  }}
                       </div>
@@ -829,12 +830,15 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
+                       <span v-if="org_id!=10677">
                         {{
                           prescription.dialysis_irrigation
                             ? prescription.dialysis_irrigation
                             : "/"
                         }}
+                         </span>
                          {{dialysisOrder.dialysis_irrigation  }}
+
                       </div>
                     </div>
 
@@ -1021,7 +1025,7 @@
                         }}
                       </div>
 
-                  
+
 
                     <span>
                       <span v-if="prescription.anticoagulant == 4">iu</span>
@@ -1051,7 +1055,7 @@
                             : "/"
                         }}
                       </div>
-                     
+
                       <span>
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
@@ -1117,7 +1121,7 @@
                             : "/"
                         }}
                       </div>
-                     
+
                     <span>
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
@@ -1174,11 +1178,11 @@
                         }}
                       </div>
                     </div>
-                  
+
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px">
-                   
+
                   </div>
 
                 </td>
@@ -1237,15 +1241,15 @@
                               : "mmHg"
                           }})
                         </td>
-                        
+
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121">
-                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490"> 电导度<br />(ms/cm)</span> 
-                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span> 
-                          <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span> 
+                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490"> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
+                          <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
@@ -1256,8 +1260,8 @@
                         </td> -->
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">KT/V</td>
-                        <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
-                        <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
+                        <td width="50" v-if="org_id == 9919">在线尿素监测</td>
+                        <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
                         <td width="200">病情变化及处理</td>
@@ -1346,7 +1350,7 @@
                           <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "/" }}</span>
                         </td>
 
-                      
+
                         <td v-if="org_id == 10375 || org_id == 0"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: "/"}}
                         </td>
@@ -1417,7 +1421,7 @@
                                 "
                                 >【开始透析】
                                 </template>
-                              
+
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
                                 monitor.dispose
                               }}
@@ -1509,7 +1513,7 @@
                         <td style="font-size: 16px" width="10%">医生签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                       
+
                       </tr>
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
@@ -1527,7 +1531,7 @@
                           class="advice-name"
                           style="padding-left: 7px"
                         >
-                      
+
                           <span v-if="advice.parent_id > 0"></span>
                           <span>{{ advice.advice_name }}</span>
                           <span v-if="advice && advice.advice_desc"
@@ -1555,7 +1559,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                      
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1569,7 +1573,7 @@
                             v-else
                           />
                         </td>
-                       
+
                         <td height="32px">
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
@@ -1624,7 +1628,7 @@
               <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
               <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
              </span>
-            
+
             </div>
           </div>
           <div class="row">
@@ -1810,7 +1814,7 @@
                     医嘱内容
                   </td>
                 </tr>
-              
+
                 <tr style="line-height: 35px; padding: 8px 5px">
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" colspan="2" width="45%">
@@ -1819,9 +1823,9 @@
                   <td style="font-size: 15px" width="10%">医生签名</td>
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" width="10%">执行人签名</td>
-                 
+
                 </tr>
-               
+
                 <tr
                   v-for="(advice, advice_index) in doctor_advices"
                   :key="advice_index"
@@ -1830,7 +1834,7 @@
                     <span v-if="advice.start_time">
                       {{ getTime(advice.start_time, "{h}:{i}") }}
                     </span>
-                  
+
                   </td>
                   <td
                     height="32px"
@@ -1865,7 +1869,7 @@
                       >({{ advice.remark }})</span
                     >
                   </td>
-                
+
                   <td height="32px">
                     <span
                       v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1879,7 +1883,7 @@
                       v-else
                     />
                   </td>
-                  
+
                   <td height="32px">
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
@@ -2597,7 +2601,7 @@
                           核对护士
                         </td>
                       </tr>
-                     
+
 
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
@@ -2607,7 +2611,7 @@
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-                          
+
                         </td>
                         <td
                           height="32px"
@@ -2642,7 +2646,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                    
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -2656,7 +2660,7 @@
                             v-else
                           />
                         </td>
-                      
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.execution_staff) == ''"
@@ -2688,15 +2692,15 @@
                           />
                         </td>
                       </tr>
-                     
+
                     </tbody>
      </table>
 
 
-    
-     
 
-     
+
+
+
     </div>
   </div>
 </template>
@@ -3474,7 +3478,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-   
+
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -3555,7 +3559,7 @@ export default {
         // }
 
 
-        
+
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
         if(this.org_id ==10515 || this.org_id == 0){
@@ -3575,15 +3579,15 @@ export default {
         });
         this.projects = projects;
 
-      
+
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
-      
+
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
              if(this.projects[i].type== 2){
-            
+
               this.projects[i].project_team_name = ""
               this.projects[i].project_team_id = 0
               console.log("this.projects[i].project.team",this.projects[i].project.team)
@@ -3594,10 +3598,10 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].execution_staff= this.projects[i].execution_staff
                 this.projects[i].advice_name =  this.projects[i].team.project_team
-              
-               
+
+
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.project[i])
               }else{
@@ -3607,18 +3611,18 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].execution_staff= this.projects[i].execution_staff
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.projects[i])
               }
-             
+
              }
-             
+
            }
         }
-         
+
         }
-      
+
         console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 3;
@@ -3655,7 +3659,7 @@ export default {
         }
         // console.log(this.advice_groups);
 
-       
+
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -3691,7 +3695,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-     
+
       if (val.id_card_no) {
         var thisLen = val.id_card_no.length
 
@@ -3801,7 +3805,7 @@ export default {
       "vascular_access_desc"
     );
     this.org_id = this.$store.getters.xt_user.org.id;
-   
+
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1655,6 +1655,7 @@ export default {
       form['diagnosis'] = this.form.diagnosis.join(',')
       form['sick_type'] = this.form.sick_type
 
+
       form['ids'] = this.temp_ids
       if (this.activeName == 'first') {
         form['settle_accounts_type'] = 1

src/xt_pages/outpatientCharges/summary.vue

@@ -646,9 +646,9 @@
     </el-dialog>
 
     <el-dialog title="修改发票号码" :visible.sync="dialogfapiaoVisible">
-      <el-input v-model="fapiao_code" type="text"></el-input>
+      <el-input v-model="fapiao_number" type="text"></el-input>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogfapiaoVisible = false">取 消</el-button>
+        <el-button @click="camcleModifyFaPiaoCode">取 消</el-button>
         <el-button type="primary" @click="modifyFaPiaoCode">确 定</el-button>
       </div>
     </el-dialog>
@@ -711,7 +711,7 @@ export default {
       admins:[],
       orderObj: {},
       batchOrderObj: {},
-      fapiao_code:"",
+      fapiao_number:"",
       med_options: [
         { id: 0, text: '全部' },
         { id: 11, text: '普通门诊' },
@@ -4015,10 +4015,27 @@ export default {
         }
       }
       return res
+    },camcleModifyFaPiaoCode(){
+      this.dialogfapiaoVisible = false
+      this.invoiceVisible = true
+      var obj = this.targeObj
+      let paramsObj = {
+        order_id: obj.id,
+        patient_id: obj.patient_id,
+        number: obj.mdtrt_id,
+        name: obj.patient.name,
+        age: obj.age,
+        gend: obj.patient.gender,
+        setl_time: obj.setl_time,
+        chargeName: this.getName(obj.creator)
+      }
+      this.dialogfapiaoVisible = false
+      this.invoiceParams = paramsObj
+      this.invoiceVisible = true
     },modifyFaPiaoCode(){
       let params = {
           id:this.targeOrderId,
-          fapiao_code: this.fapiao_code
+          fapiao_number: this.fapiao_number
       }
       modifyFapiaoCodetwo(params).then((response) => {
         if (response.data.state == 0) {
@@ -4039,14 +4056,15 @@ export default {
           this.dialogfapiaoVisible = false
           this.invoiceParams = paramsObj
           this.invoiceVisible = true
+          this.getHisOrderList()
         }
       })
 
     },
 
     invoicePrint(obj) {
-      if(this.$store.getters.xt_user.org_id == 10480){
-        this.fapiao_code = obj.fa_piao_code
+      if(this.$store.getters.xt_user.org_id == 10480 || this.$store.getters.xt_user.org_id == 0){
+        this.fapiao_number  = obj.fa_piao_number
         this.dialogfapiaoVisible = true
         this.targeOrderId = obj.id
         this.targeObj = obj

src/xt_pages/role/admin.vue

@@ -227,12 +227,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <el-button
+         <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button>
+          @click="toAutoDiagnose">自动脚本</el-button> -->
 
         <!-- <el-button
           type="primary"

src/xt_pages/user/courseOfDisease.vue

@@ -678,7 +678,7 @@
         </div>
       </div>
       <!-- </div> -->
-      <el-dialog title="新增病程记录" width="50%" top="5vh" :visible.sync="show_dialog">
+      <el-dialog title="新增病程记录" width="70%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
@@ -707,7 +707,7 @@
               <keep-alive>
                 <editor ref="editor"
                         id="editors"
-                        style="width: 600px"
+                        style="width: 80%"
                         v-bind:r_content="new_content"
                         >
                 </editor>

src/xt_pages/user/coursePrint.vue

@@ -56,7 +56,7 @@
             </div>
 
             <div class="inline_block" style="width:100%; word-wrap: break-word; word-break: break-all;">
-              <div v-html="item.content" class="printP">
+              <div v-html="item.content" class="printP" >
 
               </div>
             </div>
@@ -363,6 +363,15 @@
   .printP{
     line-height: 20px;
     font-weight: bold;
+    
+  }
+  .printP table{
+    border: 1px solid black;
+    border-collapse: collapse;
+  }
+  .printP table tr td{
+    border: 1px solid black;
+    border-collapse: collapse;
   }
 </style>
 

src/xt_pages/user/dialysisRecord.vue

@@ -14,9 +14,19 @@
           @click="printThisInfo()"
           type="primary"
           icon="el-icon-printer"
-          >打印</el-button
+          >打印2</el-button
         >
-        <span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        
+        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <el-button
+          style="float:right;"
+          size="small"
+          @click="printThisInfoOne()"
+          type="primary"
+          icon="el-icon-printer"
+          >打印1</el-button
+        >
+        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
         <el-button
           style="float:right;margin-right:20px"
           size="small"
@@ -414,6 +424,77 @@
         </div>
 
       </div>
+
+
+      <div style="display:none;">
+        <div id="printRecordOne" class="record-order">
+          <div class="rd-title">{{ orgname }}</div>
+          <div class="rd-name">
+            <span
+              >姓名：<span class="item-value">{{
+                currentPatient.name
+              }}</span></span
+            >
+            <span style="margin-left:10px;"
+              >透析号：<span class="item-value">{{
+                currentPatient.dialysis_no
+              }}</span></span
+            >
+            <span style="margin-left:10px;"
+              >性别：
+              <span class="item-value">
+                <span v-if="currentPatient.gender==1">男</span>
+                <span v-if="currentPatient.gender==2">女</span>
+              </span>
+             </span>
+
+            <span style="margin-left:10px;"
+              >年龄：<span class="item-value">{{
+                currentPatient.age
+              }}</span></span
+            >
+          </div>
+          <table
+            cellspacing="0"
+            cellpadding="0"
+            border="1"
+            class="el-table__body"
+            style="width: 100%;"
+          >
+            <thead>
+              <th>序号</th>
+              <th>透析日期</th>
+              <th>班次</th>
+              <th>分区机号</th>
+              <th>透析模式</th>
+              <th>透析用药</th>
+              <th>治疗护士</th>
+              <th>治疗医生</th>
+              <th>开始透析时间</th>
+              <th>结束透析时间</th>
+              <th>患者签名</th>
+            </thead>
+            <tbody>
+              <tr v-for="item,index in recordData" :key="item.id">
+                <td align="center">{{ index +1 }}</td>
+                <td align="center">{{ item.dialysis_date | parseTime("{y}-{m}-{d}") }}</td>
+                <td align="center">{{ scheduleType(item.schedule_type) }}</td>
+                <td align="center">{{ item.partition_name }}-{{ item.device.number }}</td>
+                <td align="center">{{ modeName(item.prescription.mode_id) }}</td>
+                <td align="center">{{ getAdviceStr(item.doctor_advice) }}</td>
+                <td align="center">{{ getNurseName(item.start_nurse) }}</td>
+                <td align="center">{{ getDoctorName(item.prescription.creater) }}</td>
+                <td align="center">{{ item.start_time | parseTime("{y}-{m}-{d} {h}:{i}")  }}</td>
+                <td align="center">{{ item.end_time | parseTime("{y}-{m}-{d} {h}:{i}")  }}</td>
+                <td align="center">
+                 <span v-if="item.url!=''"> <img :src="item.url" style="width: 50px;height:50px"></span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+      </div>
     </div>
     <!-- 透析记录弹窗 -->
     <div>
@@ -679,6 +760,7 @@ export default {
       return "";
     },
     onTranPatient: function(tranPatient) {
+      
       this.currentPatient = tranPatient;
     },
     printThisInfo() {
@@ -693,6 +775,18 @@ export default {
         });
       }, 1);
     },
+    printThisInfoOne() {
+      const style =
+        "@media print { .record-order .rd-title{  text-align: center; font-weight: 600; font-size: 30px; line-height: 80px; margin-bottom: 20px; } .record-order .rd-type{ text-align: center;  margin-bottom: 20px; } .record-order .rd-name { align-items: center; justify-content: space-between; padding: 30px 2em; } .record-order .el-table__body{ border: 1px solid #333; } .record-order .el-table__body td{ border: 1px solid #333; } .record-order .item-value {  border-bottom: 1px solid #333; padding: 0 20px;} .record-order th, .record-order td {  padding: 5px 10px; }}";
+      setTimeout(() => {
+        printJS({
+          printable: "printRecordOne",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      }, 1);
+    },
     clickCurrent(val) {
 
       this.patient_id = val.patient_id
@@ -759,6 +853,25 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
 
+    getAdviceStr(arr){
+     
+      var advice_name_str = ""
+      var newArr = []
+      if(arr!=null && arr.length >0){
+        for(let i=0;i<arr.length;i++){
+           if(arr[i].advice_name.indexOf("促红")!=-1){
+              newArr.push(arr[i])
+           }
+        }
+      }
+      if(newArr!=null){
+        for(let i=0;i<newArr.length;i++){
+           advice_name_str += newArr[i].advice_name + "*"+ newArr[i].prescribing_number + newArr[i].prescribing_number_unit+ "  "
+        }
+      }
+      console.log("HHHHHHHHHHHHHHHHHHHHHHHHHHHHH",advice_name_str)
+      return advice_name_str
+    }
   },
   created() {
     const id = this.$route.params && this.$route.params.id;

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,16 +1,14 @@
 <template>
   <!-- 排班表填充内容 -->
     <div >
-
-      <div >
-          <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>         
+      <div>
+          <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
           <template v-if="schedulMode">
             <span v-if="scheduleDetail.mode_name.length>0"  :class='modeColor(scheduleDetail.mode_name)' >{{'('+scheduleDetail.mode_name+')'}}</span>
           </template>
           <template v-if="schedulFlag">
             <br/><span >{{scheduleDetail.dialysis_machine_name}}</span>
           </template>
-
       </div>
     </div>
 </template>
@@ -54,6 +52,8 @@ export default {
                 return 'modeRed'
             }else if(name == 'HD+HP'){
                 return 'modePurple'
+            }else if(name == 'PHF'){
+                return 'modephf'
             }
         }
   }
@@ -67,4 +67,7 @@ export default {
 .modePurple{
   color: #53b86e;
 }
+.modephf{
+  color:rgb(224, 80, 80)
+}
 </style>

src/xt_pages/workforce/components/tableData.vue

@@ -1463,7 +1463,9 @@ export default {
       if(this.org_id!=10503 && this.org_id!=10447 && this.org_id!=0 && this.org_id !=10471){
         return 'border: 1px solid #707174;border-collapse: collapse;'
       }
-      
+      if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
+        return 'color:red'
+      }
       
       // 分区蓝线
       // for(let i=0;i<this.subzone.length;i++){

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -72,17 +72,16 @@
                 <template v-if="schedule_type ==1">
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_M.patient_id">
-                      <span>{{ item.Mon_M.patient }} </span><br/>
-                      <span >{{ item.Mon_M.mode_name }}</span><br/>
-                     
+                      <span>{{ item.Mon_M.patient }} </span>&nbsp;
+                      <span >{{ item.Mon_M.mode_name }}</span>&nbsp;
                       <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
                       </span>
                     </span>
                   </td>
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_M.patient_id">
-                        <span>{{ item.Tue_M.patient }} </span><br/>
-                        <span >{{ item.Tue_M.mode_name }}</span><br/>
+                        <span>{{ item.Tue_M.patient }} </span>&nbsp;
+                        <span >{{ item.Tue_M.mode_name }}</span>&nbsp;
                         <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
                          
@@ -91,8 +90,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
                       <span v-if="item.Wed_M.patient_id">
-                        <span>{{ item.Wed_M.patient }} </span><br/>
-                          <span >{{ item.Wed_M.mode_name }}</span><br/>
+                        <span>{{ item.Wed_M.patient }} </span>&nbsp;
+                          <span >{{ item.Wed_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>
                           <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
                             
@@ -101,8 +100,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
                       <span v-if="item.Thurs_M.patient_id">
-                        <span>{{ item.Thurs_M.patient }} </span><br/>
-                          <span >{{ item.Thurs_M.mode_name }}</span><br/>
+                        <span>{{ item.Thurs_M.patient }} </span>&nbsp;
+                          <span >{{ item.Thurs_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
                           <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}
                           
@@ -111,8 +110,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
                       <span v-if="item.Fri_M.patient_id">
-                        <span>{{ item.Fri_M.patient }} </span><br/>
-                          <span >{{ item.Fri_M.mode_name }}</span><br/>
+                        <span>{{ item.Fri_M.patient }} </span>&nbsp;
+                          <span >{{ item.Fri_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
                           <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
                             
@@ -121,8 +120,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
                       <span v-if="item.Sat_M.patient_id">
-                        <span>{{ item.Sat_M.patient }} </span><br/>
-                          <span >{{ item.Sat_M.mode_name }}</span><br/>
+                        <span>{{ item.Sat_M.patient }} </span>&nbsp;
+                          <span >{{ item.Sat_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}
                           
@@ -131,8 +130,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
                       <span v-if="item.Sun_M.patient_id">
-                        <span>{{ item.Sun_M.patient }} </span><br/>
-                          <span >{{ item.Sun_M.mode_name }}</span><br/>
+                        <span>{{ item.Sun_M.patient }} </span>&nbsp;
+                          <span >{{ item.Sun_M.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
                           <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}
                           
@@ -144,8 +143,8 @@
                 <template v-if="schedule_type ==2">
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_A.patient_id">
-                      <span>{{ item.Mon_A.patient }} </span><br/>
-                      <span >{{ item.Mon_A.mode_name }}</span><br/>
+                      <span>{{ item.Mon_A.patient }} </span>&nbsp;
+                      <span >{{ item.Mon_A.mode_name }}</span>&nbsp;
                       <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
                       <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
                       </span>
@@ -153,8 +152,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
                       <span v-if="item.Tue_A.patient_id">
-                        <span>{{ item.Tue_A.patient }} </span><br/>
-                          <span >{{ item.Tue_A.mode_name }}</span><br/>
+                        <span>{{ item.Tue_A.patient }} </span>&nbsp;
+                          <span >{{ item.Tue_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
                           <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}
                           
@@ -164,8 +163,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
                       <span v-if="item.Wed_A.patient_id">
-                        <span>{{ item.Wed_A.patient }} </span><br/>
-                          <span >{{ item.Wed_A.mode_name }}</span><br/>
+                        <span>{{ item.Wed_A.patient }} </span>&nbsp;
+                          <span >{{ item.Wed_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
                           <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}
                           
@@ -174,8 +173,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
                       <span v-if="item.Thurs_A.patient_id">
-                        <span>{{ item.Thurs_A.patient }} </span><br/>
-                          <span >{{ item.Thurs_A.mode_name }}</span><br/>
+                        <span>{{ item.Thurs_A.patient }} </span>&nbsp;
+                          <span >{{ item.Thurs_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
 
                           <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}
@@ -185,8 +184,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
                       <span v-if="item.Fri_A.patient_id">
-                        <span>{{ item.Fri_A.patient }} </span><br/>
-                          <span >{{ item.Fri_A.mode_name }}</span><br/>
+                        <span>{{ item.Fri_A.patient }} </span>&nbsp;
+                          <span >{{ item.Fri_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}
                             
@@ -195,8 +194,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
                       <span v-if="item.Sat_A.patient_id">
-                        <span>{{ item.Sat_A.patient }} </span><br/>
-                          <span >{{ item.Sat_A.mode_name }}</span><br/>
+                        <span>{{ item.Sat_A.patient }} </span>&nbsp;
+                          <span >{{ item.Sat_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}
                             
@@ -205,8 +204,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
                       <span v-if="item.Sun_A.patient_id">
-                        <span>{{ item.Sun_A.patient }} </span><br/>
-                          <span >{{ item.Sun_A.mode_name }}</span><br/>
+                        <span>{{ item.Sun_A.patient }} </span>&nbsp;
+                          <span >{{ item.Sun_A.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
                           <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}
                           
@@ -219,8 +218,8 @@
                 <template v-if="schedule_type ==3">
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_N.patient_id">
-                      <span>{{ item.Mon_N.patient }} </span><br/>
-                      <span >{{ item.Mon_N.mode_name }}</span><br/>
+                      <span>{{ item.Mon_N.patient }} </span>&nbsp;
+                      <span >{{ item.Mon_N.mode_name }}</span>&nbsp;
                       <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
                       <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
                       </span>
@@ -228,8 +227,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
                       <span v-if="item.Tue_N.patient_id">
-                        <span>{{ item.Tue_N.patient }} </span><br/>
-                          <span >{{ item.Tue_N.mode_name }}</span><br/>
+                        <span>{{ item.Tue_N.patient }} </span>&nbsp;
+                          <span >{{ item.Tue_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
                           <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}
                             
@@ -238,8 +237,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
                       <span v-if="item.Wed_N.patient_id">
-                        <span>{{ item.Wed_N.patient }} </span><br/>
-                          <span >{{ item.Wed_N.mode_name }}</span><br/>
+                        <span>{{ item.Wed_N.patient }} </span>&nbsp;
+                          <span >{{ item.Wed_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
                           <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}
                           
@@ -248,8 +247,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
                       <span v-if="item.Thurs_N.patient_id">
-                        <span>{{ item.Thurs_N.patient }} </span><br/>
-                          <span >{{ item.Thurs_N.mode_name }}</span><br/>
+                        <span>{{ item.Thurs_N.patient }} </span>&nbsp;
+                          <span >{{ item.Thurs_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}
                           
@@ -258,8 +257,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
                       <span v-if="item.Fri_N.patient_id">
-                        <span>{{ item.Fri_N.patient }} </span><br/>
-                          <span >{{ item.Fri_N.mode_name }}</span><br/>
+                        <span>{{ item.Fri_N.patient }} </span>&nbsp;
+                          <span >{{ item.Fri_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
                           <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}
                             
@@ -268,8 +267,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
                       <span v-if="item.Sat_N.patient_id">
-                        <span>{{ item.Sat_N.patient }} </span><br/>
-                          <span >{{ item.Sat_N.mode_name }}</span><br/>
+                        <span>{{ item.Sat_N.patient }} </span>&nbsp;
+                          <span >{{ item.Sat_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
                           <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}
                           
@@ -278,8 +277,8 @@
                   </td>
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
                       <span v-if="item.Sun_N.patient_id">
-                        <span>{{ item.Sun_N.patient }} </span><br/>
-                          <span >{{ item.Sun_N.mode_name }}</span><br/>
+                        <span>{{ item.Sun_N.patient }} </span>&nbsp;
+                          <span >{{ item.Sun_N.mode_name }}</span>&nbsp;
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
                           <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}
                             

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))