浏览代码

提交代码

陈少旭 2 年前
父节点
当前提交
7dd5bfddce

+ 1 - 2
src/lang/zh.js 查看文件

398
     manage_ment: '设备管理',
398
     manage_ment: '设备管理',
399
     nursing_record: '透析护理记录',
399
     nursing_record: '透析护理记录',
400
     special_record: '特殊记录',
400
     special_record: '特殊记录',
401
-    template_summary: '治疗小结',
401
+    template_summary: '阶段小结',
402
     template_plan: '个性化方案',
402
     template_plan: '个性化方案',
403
     admitting_diagnosis: '入院诊断',
403
     admitting_diagnosis: '入院诊断',
404
     discharge_diagnosis: '出院诊断',
404
     discharge_diagnosis: '出院诊断',
414
     diagnostic_basis: '诊断依据',
414
     diagnostic_basis: '诊断依据',
415
     differential_diagnosis: '鉴别诊断',
415
     differential_diagnosis: '鉴别诊断',
416
     treatment_plan: '诊疗计划'
416
     treatment_plan: '诊疗计划'
417
-
418
   }
417
   }
419
 }
418
 }

+ 4 - 4
src/xt_pages/outpatientCharges/statementPrint.vue 查看文件

23
           org_id == 10138 ||
23
           org_id == 10138 ||
24
           org_id == 9504 ||
24
           org_id == 9504 ||
25
           org_id == 10028 ||
25
           org_id == 10028 ||
26
-          org_id == 4 ||
26
+          org_id == 0 ||
27
           org_id == 10278
27
           org_id == 10278
28
         "
28
         "
29
       >
29
       >
32
           :info="info"
32
           :info="info"
33
           :paramsObj="paramsObj"
33
           :paramsObj="paramsObj"
34
           :balanceAccounts="balanceAccounts"
34
           :balanceAccounts="balanceAccounts"
35
-          v-if="org_id == 10138 || org_id == 4 || org_id == 10278"
35
+          v-if="org_id == 10138 || org_id == 0 || org_id == 10278  "
36
         ></printThree>
36
         ></printThree>
37
         <printFour
37
         <printFour
38
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
38
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
64
             org_id != 10138 &&
64
             org_id != 10138 &&
65
             org_id != 9504 &&
65
             org_id != 9504 &&
66
             org_id != 10028 &&
66
             org_id != 10028 &&
67
-            org_id != 4 &&
67
+            org_id != 0 &&
68
             org_id != 10278 && org_id != 10387 && org_id != 0 && org_id != 10191 &&org_id != 10210"></printOne>
68
             org_id != 10278 && org_id != 10387 && org_id != 0 && org_id != 10191 &&org_id != 10210"></printOne>
69
 
69
 
70
     </div>
70
     </div>
406
             };
406
             };
407
             if (
407
             if (
408
               this.org_id == 10138 ||
408
               this.org_id == 10138 ||
409
-              this.$store.getters.xt_user.org_id == 4 ||
409
+              this.$store.getters.xt_user.org_id == 0 ||
410
               this.org_id == 10278
410
               this.org_id == 10278
411
             ) {
411
             ) {
412
               getPrivateExpenses(params).then((response) => {
412
               getPrivateExpenses(params).then((response) => {

+ 3 - 5
src/xt_pages/outpatientDoctorStation/doctorDesk.vue 查看文件

659
       if (this.org_id == 10138 || this.org_id == 10278 ) {
659
       if (this.org_id == 10138 || this.org_id == 10278 ) {
660
         const style =
660
         const style =
661
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
661
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
662
-            
662
+
663
           printJS({
663
           printJS({
664
           printable: 'printMain',
664
           printable: 'printMain',
665
           type: 'html',
665
           type: 'html',
666
           style: style,
666
           style: style,
667
           scanStyles: false
667
           scanStyles: false
668
         })
668
         })
669
-      } 
669
+      }
670
       else {
670
       else {
671
         const style =
671
         const style =
672
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
672
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
1440
           }else{
1440
           }else{
1441
             this.diagnoses = []
1441
             this.diagnoses = []
1442
           }
1442
           }
1443
-         
1443
+
1444
           this.additions = response.data.data.additions
1444
           this.additions = response.data.data.additions
1445
 
1445
 
1446
         }
1446
         }
3223
                       groupno: prescription.advices[b].groupno,
3223
                       groupno: prescription.advices[b].groupno,
3224
                       hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
3224
                       hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
3225
                       execution_state: prescription.advices[b].execution_state
3225
                       execution_state: prescription.advices[b].execution_state
3226
-
3227
-
3228
                     }
3226
                     }
3229
                     tempAdvice.push(obj)
3227
                     tempAdvice.push(obj)
3230
                   }
3228
                   }

+ 14 - 12
src/xt_pages/user/components/PatientDetail.vue 查看文件

206
                 ></el-input>
206
                 ></el-input>
207
               </el-form-item>
207
               </el-form-item>
208
             </el-col>
208
             </el-col>
209
-            
210
-        
209
+
210
+
211
             <el-col :span="6">
211
             <el-col :span="6">
212
               <el-form-item
212
               <el-form-item
213
                 label="本院首次透析 : "
213
                 label="本院首次透析 : "
301
                 ></el-date-picker>
301
                 ></el-date-picker>
302
               </el-form-item>
302
               </el-form-item>
303
             </el-col>
303
             </el-col>
304
-   
304
+
305
             <el-col :span="8" style="height: 59px">
305
             <el-col :span="8" style="height: 59px">
306
               <el-form-item
306
               <el-form-item
307
                 label="患者来源 : "
307
                 label="患者来源 : "
807
 
807
 
808
        <el-col :span="6">
808
        <el-col :span="6">
809
         <el-form-item label="医生 : ">
809
         <el-form-item label="医生 : ">
810
-       
810
+
811
            <el-select v-model="form.doctor"    disabled>
811
            <el-select v-model="form.doctor"    disabled>
812
               <el-option
812
               <el-option
813
                 v-for="item in adminUserOptions"
813
                 v-for="item in adminUserOptions"
930
                     <div class="td_proj_title">现<br />病<br />史</div>
930
                     <div class="td_proj_title">现<br />病<br />史</div>
931
                   </td>
931
                   </td>
932
                   <td colspan="7">
932
                   <td colspan="7">
933
-                    <div 
933
+                    <div
934
                       class="td_proj_content td_align_left"
934
                       class="td_proj_content td_align_left"
935
                       v-html="patientPrint.present_history"
935
                       v-html="patientPrint.present_history"
936
                     ></div>
936
                     ></div>
1034
         </div>
1034
         </div>
1035
       </div>
1035
       </div>
1036
     </div>
1036
     </div>
1037
-    
1037
+
1038
     <div hidden="hidden">
1038
     <div hidden="hidden">
1039
       <div id="print-card-info">
1039
       <div id="print-card-info">
1040
         <div
1040
         <div
1272
     this.org_id = this.$store.getters.xt_user.org.id;
1272
     this.org_id = this.$store.getters.xt_user.org.id;
1273
     this.form.doctor = this.$store.getters.xt_user.user.id
1273
     this.form.doctor = this.$store.getters.xt_user.user.id
1274
     console.log("owowow",this.$store.getters.xt_user.user.id)
1274
     console.log("owowow",this.$store.getters.xt_user.user.id)
1275
-  
1275
+
1276
     this.styleOptions = this.$store.getters.patient_types;
1276
     this.styleOptions = this.$store.getters.patient_types;
1277
     // this.partitionOptions = this.$store.getters.partitions;
1277
     // this.partitionOptions = this.$store.getters.partitions;
1278
     this.maritalOptions = getDataConfig("patient", "marital_options");
1278
     this.maritalOptions = getDataConfig("patient", "marital_options");
1875
         }
1875
         }
1876
       }
1876
       }
1877
     }
1877
     }
1878
-  
1878
+
1879
     return url
1879
     return url
1880
    },
1880
    },
1881
    getDcotorNameOne(admin_user_id){
1881
    getDcotorNameOne(admin_user_id){
1982
       });
1982
       });
1983
     },
1983
     },
1984
     checkIdCardNo() {
1984
     checkIdCardNo() {
1985
-      if (!isCardNo(this.form.idCardNo)) {
1986
-        this.$message.error("身份证号码信息有误!");
1987
-        this.form.birth = "";
1988
-        return false;
1985
+      if(this.$store.getters.xt_user.org_id != 10278 && this.$store.getters.xt_user.org_id != 10138) {
1986
+        if (!isCardNo(this.form.idCardNo)) {
1987
+          this.$message.error("身份证号码信息有误!");
1988
+          this.form.birth = "";
1989
+          return false;
1990
+        }
1989
       }
1991
       }
1990
       var thisLen = this.form.idCardNo.length;
1992
       var thisLen = this.form.idCardNo.length;
1991
       var birth = "";
1993
       var birth = "";

+ 27 - 13
src/xt_pages/workforce/template.vue 查看文件

112
       <!-- </el-col> -->
112
       <!-- </el-col> -->
113
     </div>
113
     </div>
114
     <div class="app-container">
114
     <div class="app-container">
115
-      
115
+
116
       <!-- <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick"> -->
116
       <!-- <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick"> -->
117
 <!--        <el-tab-pane name="schedules">-->
117
 <!--        <el-tab-pane name="schedules">-->
118
 <!--          <span slot="label"> 排班信息 </span>-->
118
 <!--          <span slot="label"> 排班信息 </span>-->
178
 
178
 
179
       <!-- </el-tabs> -->
179
       <!-- </el-tabs> -->
180
       <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
180
       <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
181
-                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode" 
182
-                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" 
181
+                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"
182
+                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"
183
                          @setTemplate="setTemplate" @changeLoading="changeLoading">
183
                          @setTemplate="setTemplate" @changeLoading="changeLoading">
184
             <div class="position">
184
             <div class="position">
185
               <div>
185
               <div>
192
              <span v-if="schedule.mode ==1">(本周)</span>
192
              <span v-if="schedule.mode ==1">(本周)</span>
193
              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
193
              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
194
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
194
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
195
+
196
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(下下周)</span>
197
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
198
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(本周)</span>
199
+
200
+
201
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
202
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
203
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
204
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
205
+
206
+
195
           </span>
207
           </span>
196
 
208
 
197
         </el-tab-pane>
209
         </el-tab-pane>
202
 
214
 
203
               <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
215
               <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
204
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
216
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
217
+
218
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(本周)</span>
219
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
220
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(下下周)</span>
221
+
222
+
223
+              <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
224
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
225
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
226
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
227
+
205
           </span>
228
           </span>
206
         </el-tab-pane>
229
         </el-tab-pane>
207
 
230
 
485
         if(templates.length > 1){
508
         if(templates.length > 1){
486
           this.secondWeekData = templates[1].items
509
           this.secondWeekData = templates[1].items
487
           this.second_template = templates[1]
510
           this.second_template = templates[1]
488
-
489
         }
511
         }
490
         if(templates.length > 2){
512
         if(templates.length > 2){
491
           this.thirdWeekData = templates[2].items
513
           this.thirdWeekData = templates[2].items
492
           this.third_template = templates[2]
514
           this.third_template = templates[2]
493
-
494
         }
515
         }
495
         if(templates.length > 3){
516
         if(templates.length > 3){
496
           this.fourWeekData = templates[3].items
517
           this.fourWeekData = templates[3].items
497
           this.four_template = templates[3]
518
           this.four_template = templates[3]
498
-
499
         }
519
         }
500
-
501
         var patients = resp.data.patients
520
         var patients = resp.data.patients
502
         this.template_mode = mode
521
         this.template_mode = mode
503
         this.origin_mode = mode.mode
522
         this.origin_mode = mode.mode
505
         this.patients = patients
524
         this.patients = patients
506
         this.tar_template = this.first_template
525
         this.tar_template = this.first_template
507
         this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
526
         this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
508
-
509
         var fakeTemplateItems = []
527
         var fakeTemplateItems = []
510
-
511
         this.this_week_schedules.items = fakeTemplateItems
528
         this.this_week_schedules.items = fakeTemplateItems
512
-
513
       } else {
529
       } else {
514
         this.$message(resp.msg)
530
         this.$message(resp.msg)
515
       }
531
       }
516
     })
532
     })
517
-
518
-
519
   },
533
   },
520
   methods: {
534
   methods: {
521
     changeLoading(){
535
     changeLoading(){
3472
         this.schedulingTableVisible=false
3486
         this.schedulingTableVisible=false
3473
         this.$message.success("保存成功")
3487
         this.$message.success("保存成功")
3474
         this.$router.back()
3488
         this.$router.back()
3475
-        
3489
+
3476
       }
3490
       }
3477
 
3491
 
3478
     },
3492
     },

+ 13 - 13
src/xt_permission.js 查看文件

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28
   // 线上注释
28
   // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))