hah阿凡达

src/api/patient.js

@@ -211,10 +211,11 @@ export function getRescueRecords(patient_id, start_time_ymd, end_time_ymd) {
   })
 }
 
-export function createRescueRecord(patient_id, content) {
+export function createRescueRecord(patient_id, content,record_date) {
   var params = {
     patient_id: patient_id,
-    content: content
+    content: content,
+    record_date:record_date,
   }
   return request({
     url: '/api/patient/rescue/create',

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -301,14 +301,17 @@
 
       <el-dialog
         title="药品追溯码"
+        @open="openDialog"
         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
         <el-input
+          ref="inputRef"
           @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
+          autofocus
           :rows="10"
         >
         </el-input>
@@ -427,6 +430,11 @@ export default {
     // this.selectedbydefault();
   },
   methods: {
+    openDialog(){
+      this.$nextTick(() => {
+        this.$refs.inputRef.$refs.input.focus()
+      });
+    },
     changevalue(row){
       var params = {
         id:row.ID,
@@ -1242,6 +1250,7 @@ export default {
        this.is_source = is_source
        this.textarea = DrugCode
        this.currentIndex = index
+      
        this.dialogVisibleOne = true
 
     },
@@ -1265,12 +1274,45 @@ export default {
       })
     },
     changeText(event){
+     
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
+       
         var textarea = ""
-        textarea += this.textarea + ","
+        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+         
+      
+
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0){
+          var arr= []
+          arr = textarea.split(",")
+          var is_err_check = false
+          var i_index = ""
+          if(arr!=null && arr.length>0){
+            for(let i=0;i<arr.length;i++){
+               if(arr[i]!=""){
+                 if(arr[i].length!=20){
+                   this.$message.error("药品追溯码长度没有满足20位!")
+                   is_err_check = true
+                   i_index = i
+                 }
+               }
+
+            }
+          }
+          console.log("is_err_check+++++++++++++",is_err_check)
+          if(is_err_check == true){
+              arr.splice(i_index,1)
+          }
+          console.log("arr-------------------------",arr)
+          this.textarea = arr.join(",")
+        }else{
+
+          this.textarea = textarea
+        }
+        
 
-        this.textarea = textarea
+       
       }
 
 
@@ -1278,6 +1320,7 @@ export default {
 
 
   },
+  
 };
 </script>
 

src/xt_pages/data/components/addDrugs.vue

@@ -541,6 +541,13 @@
                     <el-form-item label="" style="visibility: hidden;">
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
+
+                    <el-form-item label="扫码次数:" prop="scan_code">
+                        <el-input v-model="form.scan_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    </el-form-item>
+                    <el-form-item label="药品标识码:" prop="drug_identification_code">
+                        <el-input v-model="form.drug_identification_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -689,7 +696,8 @@
           is_show:"",
           is_self_drug:"2",
           is_zero_flag:"",
-
+          scan_code:"",
+          drug_identification_code:""
         },
 
         rules: {
@@ -1034,7 +1042,8 @@
         form['is_show'] = this.form.is_show
         form['is_self_drug'] = parseInt(this.form.is_self_drug)
         form['is_zero_flag'] = parseInt(this.form.is_zero_flag)
-
+        form["scan_code"] = this.form.scan_code
+        form["drug_identification_code"] = this.form.drug_identification_code
 
 
         return form

src/xt_pages/data/components/drugs.vue

@@ -343,6 +343,8 @@
           bbx01:"",
           bby01:"",
           is_show:"",
+          scan_code:"",
+          drug_identification_code:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -779,6 +781,8 @@
                 this.formValue.is_self_drug = this.formValue.is_self_drug.toString()
               }
 
+              
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -1212,11 +1212,18 @@
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          <span>
-                           {{ record.assessment_after_dislysis &&
+                          <span v-if="record.assessment_before_dislysis.weight_before>0&&record.assessment_after_dislysis.weight_after>0">
+                           <!-- {{ record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss
-                              : "/"}}
+                              : "/"}} -->
+                              {{
+                              record.assessment_after_dislysis && 
+                              record.assessment_before_dislysis&&
+                              (record.assessment_before_dislysis.weight_before  - record.assessment_after_dislysis.weight_after).toFixed(1)
+                                ?(record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after).toFixed(1)
+                                : "/"
+                            }}
                           </span>
 
                         </div>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1701,7 +1701,7 @@
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
-                          <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
+                          <td width="50" v-if="org_id == 10478 || org_id ==10510 || org_id ==10735">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
                           <td width="60" v-if="org_id != 9836 && org_id!=10644">透析液温度(°C)
@@ -1718,7 +1718,8 @@
                               org_id!=10644 &&
                               org_id!=0&&
                               org_id!=10567 &&
-                              org_id!=10724
+                              org_id!=10724 &&
+                              org_id!=10735
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1872,7 +1873,7 @@
                             }}
                           </td>
 
-                          <td v-if="org_id == 10478 || org_id ==10510">
+                          <td v-if="org_id == 10478 || org_id ==10510 || org_id == 10735">
                             {{
                               monitor_record.arterial_pressure
                                 ? monitor_record.arterial_pressure
@@ -1931,7 +1932,8 @@
                               org_id!=10644 &&
                               org_id!=0 &&
                               org_id!=10567 &&
-                              org_id!=10724
+                              org_id!=10724 &&
+                              org_id!=10735
 
 
                             "
@@ -3103,7 +3105,8 @@
                          </span>
 
                          <span v-if="org_id == 10551">{{
-                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis && 
+                            record.assessment_before_dislysis&&
                             record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
                               ?record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
                               : "/"

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

@@ -161,7 +161,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 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
+                            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 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -171,7 +171,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 || 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 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721">
+                            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 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -3316,7 +3316,7 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10735){
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742){
           this.getPatientBefor()
         }
 
@@ -5167,11 +5167,11 @@ mu
           var prescription = response.data.data.prescription
           if(patientBefor!=undefined){
 
-            if(this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731){
+            if(this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742 ){
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               
                  this.dialysisPrescription.target_ultrafiltration = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000
-                 console.log("hhhhhhhhhhhhhhhhhh",this.dialysisPrescription.target_ultrafiltration)
+                
               }
             }else{
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,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!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206)
+               && 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!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740&&org_id!=10742)
               || org_id == 10387
             "
           >
@@ -529,7 +529,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 ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206)
+                || 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 == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,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!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206) ||
+              && 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!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742 ) ||
               org_id == 10387
             "
           >
@@ -1685,7 +1685,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742) &&
                 org_id!=10387
             "
           >
@@ -1733,7 +1733,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742)
               || org_id == 10387
             "
           >
@@ -1806,7 +1806,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1884,7 +1884,9 @@
               org_id!=10723 &&
               org_id!=10721 &&
               org_id!=10727 &&
-              org_id!=10206
+              org_id!=10206 &&
+              org_id!=10740 &&
+              org_id!=10742
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,11 +20,11 @@
           <th v-if="isShow('血流量1')" 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('跨膜压1')" 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 == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " 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!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  width="76px"> 超滤量(L) </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 == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 " 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!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 ||   this.$store.getters.xt_user.template_info.org_id == 10742"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </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 == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) && 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!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 ) || 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 == 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 == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742) && 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!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1805,7 +1805,7 @@
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
-                        <td width="50" v-if="org_id==10478 || org_id == 10598 || org_id ==10510">
+                        <td width="50" v-if="org_id==10478 || org_id == 10598 || org_id ==10510 || org_id == 10735">
                           动脉压<br />({{
                             monitors[0] &&
                             monitors[0]["venous_pressure_type"] == 2
@@ -1834,8 +1834,8 @@
                         <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 && org_id!=10644">透析液温度(°C)</td>
-                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 && org_id!=10724 "> 电导度<br />(ms/cm)</span>
+                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644 && org_id!=10735">
+                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 && org_id!=10724"> 电导度<br />(ms/cm)</span>
                           <span v-if="org_id ==10469 || org_id == 0 || org_id == 10567 || org_id==10724"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
@@ -1880,7 +1880,7 @@
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
-                        <td v-if="org_id ==10478 || org_id == 10598 || org_id ==10510">
+                        <td v-if="org_id ==10478 || org_id == 10598 || org_id ==10510 || org_id ==10735">
                           {{
                             monitor.arterial_pressure
                               ? monitor.arterial_pressure
@@ -1960,7 +1960,7 @@
                         </td>
 
 
-                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
+                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644 && org_id!=10735">
                           <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567 && org_id!=10724"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
                           <span v-if="org_id==10469 || org_id == 10567 || org_id == 0 || org_id == 10724"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
@@ -2873,7 +2873,7 @@
                             : "/"
                            }}
                          </span> -->
-                         <span>
+                         <span v-if="predialysis&&predialysis.weight_before>0&&afterdialysis&&afterdialysis.weight_after>0">
                           {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
                          </span>
 
@@ -4819,13 +4819,7 @@ export default {
          window.open(fileURL);//打开ppf文件
        }
      },
-     compare (property) {
-       return function (a, b) {
-           var value1 = a[property]
-           var value2 = b[property]
-           return value1 - value2
-       }
-     },
+   
 
      openPdf(blob) {
        const objectUrl = URL.createObjectURL(blob);
@@ -5624,7 +5618,14 @@ export default {
               newHisArr[i].advice_name_str = ""
               newHisArr[i].advice_name_str = newHisArr[i].project_team + (newHisArr[i].prescription_id).toString()
             }
-            console.log("newHisArr===================================",newHisArr)
+            // console.log("newHisArr===================================",newHisArr)
+
+
+            // newHisArr.sort(this.compareOne('id'))
+            // newHisArr.map((item, index) => {
+            //   console.log("item=----------------",item)
+            //   // item.sort(this.compare('execution_time'))
+            // })
 
             var ordHisArr = this.getQuChong(newHisArr)
 
@@ -5738,7 +5739,7 @@ export default {
         console.log("this.totollength",this.totollength)
 
 
-        if (this.totollength > 18) {
+        if (this.totollength > 20) {
           var temp_advice_length = this.doctor_advices.length
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
@@ -5763,6 +5764,21 @@ export default {
       }
       // })
     },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+     },
+
+     compareOne (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+     },
      getQuChong(tempArr) {
       let result = [];
         let obj = {};

src/xt_pages/user/components/PatientSidebar.vue

@@ -187,10 +187,10 @@ export default {
               name: '1-11',
               label: '首次病程记录'
             },
-            // {
-            //   name: '1-2',
-            //   label: '病程记录'
-            // }, 
+            {
+              name: '1-2',
+              label: '病程记录'
+            }, 
             {
               name: '1-5',
               label: '抢救记录'

src/xt_pages/user/rescueRecord.vue

@@ -124,7 +124,19 @@
       >
         <div>
           <div class="new_record_form">
-            <diV>
+            <div style="margin-bottom: 10px;">
+              <span class="filter_title">抢救时间:</span>
+              <el-date-picker
+                size="small"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                placeholder="选择开始时间"
+                style="width:150px"
+                v-model="record_date"
+              ></el-date-picker>
+            </div>
+            <div>
               <span class="filter_title">日常抢救:</span>
               <el-select
                 v-model="select_template"
@@ -176,6 +188,18 @@
         <div>
           <div class="new_record_form">
             <diV>
+              <div style="margin-bottom: 10px;">
+              <span class="filter_title">抢救时间:</span>
+              <el-date-picker
+                size="small"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                placeholder="选择开始时间"
+                style="width:150px"
+                v-model="record_date"
+              ></el-date-picker>
+            </div>
               <span class="filter_title">日常抢救:</span>
               <el-select
                 v-model="select_template"
@@ -230,6 +254,7 @@ import {
   modifyCoursePrint
 } from "@/api/patient";
 import { parseTime } from "@/utils";
+import { uParseTime } from '@/utils/tools'
 const moment = require('moment')
 export default {
   name: "RescueRecord",
@@ -256,6 +281,7 @@ export default {
 
       selectingRows: [],
       id:0,
+      record_date:""
     };
   },
   created() {
@@ -343,7 +369,7 @@ export default {
         return;
       }
       this.uploading_new_record = true;
-      createRescueRecord(this.patient_id, this.new_content)
+      createRescueRecord(this.patient_id, this.new_content,this.record_date)
         .then(rs => {
           this.uploading_new_record = false;
           var resp = rs.data;
@@ -368,6 +394,7 @@ export default {
          if(response.data.state == 1){
             var rescueRecord =  response.data.data.rescueRecord
             console.log("rescueRecord",rescueRecord)
+            this.record_date = this.getTime(rescueRecord.record_time)
             this.new_content = rescueRecord.content
             this.edit_show_dialog = true
          }
@@ -433,6 +460,7 @@ export default {
       var params = {
         id:this.id,
         content:this.new_content,
+        record_date:this.record_date,
       }
       modifyCoursePrint(params).then(response=>{
          if(response.data.state == 1){
@@ -451,7 +479,10 @@ export default {
           return
        }
        this.$router.push({ path: "/rescue/record/print?id="+this.id+"&patient_id="+this.patient_id});
-    }
+    },
+    getTime (time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
 
   }
 };

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))