提交代码

src/lang/zh.js

@@ -398,7 +398,7 @@ export default {
     manage_ment: '设备管理',
     nursing_record: '透析护理记录',
     special_record: '特殊记录',
-    template_summary: '治疗小结',
+    template_summary: '阶段小结',
     template_plan: '个性化方案',
     admitting_diagnosis: '入院诊断',
     discharge_diagnosis: '出院诊断',
@@ -414,6 +414,5 @@ export default {
     diagnostic_basis: '诊断依据',
     differential_diagnosis: '鉴别诊断',
     treatment_plan: '诊疗计划'
-
   }
 }

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -23,7 +23,7 @@
           org_id == 10138 ||
           org_id == 9504 ||
           org_id == 10028 ||
-          org_id == 4 ||
+          org_id == 0 ||
           org_id == 10278
         "
       >
@@ -32,7 +32,7 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 4 || org_id == 10278"
+          v-if="org_id == 10138 || org_id == 0 || org_id == 10278  "
         ></printThree>
         <printFour
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
@@ -64,7 +64,7 @@
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 4 &&
+            org_id != 0 &&
             org_id != 10278 && org_id != 10387 && org_id != 0 && org_id != 10191 &&org_id != 10210"></printOne>
 
     </div>
@@ -406,7 +406,7 @@
             };
             if (
               this.org_id == 10138 ||
-              this.$store.getters.xt_user.org_id == 4 ||
+              this.$store.getters.xt_user.org_id == 0 ||
               this.org_id == 10278
             ) {
               getPrivateExpenses(params).then((response) => {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -659,14 +659,14 @@ export default {
       if (this.org_id == 10138 || this.org_id == 10278 ) {
         const style =
             '@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%;}}}'
-            
+
           printJS({
           printable: 'printMain',
           type: 'html',
           style: style,
           scanStyles: false
         })
-      } 
+      }
       else {
         const style =
             '@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,7 +1440,7 @@ export default {
           }else{
             this.diagnoses = []
           }
-         
+
           this.additions = response.data.data.additions
 
         }
@@ -3223,8 +3223,6 @@ export default {
                       groupno: prescription.advices[b].groupno,
                       hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
                       execution_state: prescription.advices[b].execution_state
-
-
                     }
                     tempAdvice.push(obj)
                   }

src/xt_pages/user/components/PatientDetail.vue

@@ -206,8 +206,8 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            
-        
+
+
             <el-col :span="6">
               <el-form-item
                 label="本院首次透析 : "
@@ -301,7 +301,7 @@
                 ></el-date-picker>
               </el-form-item>
             </el-col>
-   
+
             <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="患者来源 : "
@@ -807,7 +807,7 @@
 
        <el-col :span="6">
         <el-form-item label="医生 : ">
-       
+
            <el-select v-model="form.doctor"    disabled>
               <el-option
                 v-for="item in adminUserOptions"
@@ -930,7 +930,7 @@
                     <div class="td_proj_title">现<br />病<br />史</div>
                   </td>
                   <td colspan="7">
-                    <div 
+                    <div
                       class="td_proj_content td_align_left"
                       v-html="patientPrint.present_history"
                     ></div>
@@ -1034,7 +1034,7 @@
         </div>
       </div>
     </div>
-    
+
     <div hidden="hidden">
       <div id="print-card-info">
         <div
@@ -1272,7 +1272,7 @@ export default {
     this.org_id = this.$store.getters.xt_user.org.id;
     this.form.doctor = this.$store.getters.xt_user.user.id
     console.log("owowow",this.$store.getters.xt_user.user.id)
-  
+
     this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");
@@ -1875,7 +1875,7 @@ export default {
         }
       }
     }
-  
+
     return url
    },
    getDcotorNameOne(admin_user_id){
@@ -1982,10 +1982,12 @@ export default {
       });
     },
     checkIdCardNo() {
-      if (!isCardNo(this.form.idCardNo)) {
-        this.$message.error("身份证号码信息有误!");
-        this.form.birth = "";
-        return false;
+      if(this.$store.getters.xt_user.org_id != 10278 && this.$store.getters.xt_user.org_id != 10138) {
+        if (!isCardNo(this.form.idCardNo)) {
+          this.$message.error("身份证号码信息有误!");
+          this.form.birth = "";
+          return false;
+        }
       }
       var thisLen = this.form.idCardNo.length;
       var birth = "";

src/xt_pages/workforce/template.vue

@@ -112,7 +112,7 @@
       <!-- </el-col> -->
     </div>
     <div class="app-container">
-      
+
       <!-- <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick"> -->
 <!--        <el-tab-pane name="schedules">-->
 <!--          <span slot="label"> 排班信息 </span>-->
@@ -178,8 +178,8 @@
 
       <!-- </el-tabs> -->
       <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
-                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode" 
-                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" 
+                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"
+                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"
                          @setTemplate="setTemplate" @changeLoading="changeLoading">
             <div class="position">
               <div>
@@ -192,6 +192,18 @@
              <span v-if="schedule.mode ==1">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
+
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(下下周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(本周)</span>
+
+
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+
+
           </span>
 
         </el-tab-pane>
@@ -202,6 +214,17 @@
 
               <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
+
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(本周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(下下周)</span>
+
+
+              <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+
           </span>
         </el-tab-pane>
 
@@ -485,19 +508,15 @@ export default {
         if(templates.length > 1){
           this.secondWeekData = templates[1].items
           this.second_template = templates[1]
-
         }
         if(templates.length > 2){
           this.thirdWeekData = templates[2].items
           this.third_template = templates[2]
-
         }
         if(templates.length > 3){
           this.fourWeekData = templates[3].items
           this.four_template = templates[3]
-
         }
-
         var patients = resp.data.patients
         this.template_mode = mode
         this.origin_mode = mode.mode
@@ -505,17 +524,12 @@ export default {
         this.patients = patients
         this.tar_template = this.first_template
         this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
-
         var fakeTemplateItems = []
-
         this.this_week_schedules.items = fakeTemplateItems
-
       } else {
         this.$message(resp.msg)
       }
     })
-
-
   },
   methods: {
     changeLoading(){
@@ -3472,7 +3486,7 @@ export default {
         this.schedulingTableVisible=false
         this.$message.success("保存成功")
         this.$router.back()
-        
+
       }
 
     },

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