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

src/lang/en.js

     user_detail: 'user_detail',
     objectRegistration:'objectRegistration',
     Dialysisanalysis:'Dialysisanalysis',
+    eleFaPiao:'eleFaPiao',
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

     summary_tool: '结算明细汇总',
     p_summary_tool: '处方明细汇总',
     labelPrint: '标签打印',
-    faPiao: '发票设置',
+    // faPiao: '发票设置',
+    // fapiao:'电子发票',
     chargeDetailManagement: '收费明细',
     yidiClear: '异地清分',
     zeroSummary: '零用明细汇总',
     queryData:"结算数据查询",
     chargeDetailManagementTwo:"门诊明细上传",
     orgExportData:"数据导出",
-
-
+    eleFaPiao:"电子发票",
 
     settleDetail:"结算明细列表",
     patientSettleDetail:"患者结算列表",
-    elefapiao:"电子发票列表",
+    fapiao:"电子发票列表",
 
   },
   navbar: {

src/router/index.js

 import hospitalCharges from './modules/hospitalCharges'
 import DepositManagement from './modules/DepositManagement'
 import hisTool from './modules/hisTool'
-import faPiao from './modules/faPiao'
+import eleFaPiao from './modules/eleFaPiao'
 
 import supply from './modules/supply'
 
   hospitalStation,
   hospitalCharges,
   hisTool,
-  faPiao,
+  eleFaPiao,
   integration,
   basicConfig,
   supply,

src/router/modules/eleFaPiao.js

+import Layout from '@/views/layout/Layout'
+
+
+export default {
+  path: '/eleFaPiao',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'eleFaPiao',
+  alwaysShow: true,
+  meta: {
+    title: 'eleFaPiao',
+    icon: 'eleFaPiao',
+    isChild: true
+  },
+  children: [
+    {
+      path: '/eleFaPiao/settle',
+      component: () => import('@/xt_pages/eleFaPiao/settleDetail'),
+      name: 'settleDetail',
+      meta: { title: 'settleDetail', noCache: true }
+    },
+    {
+      path: '/eleFaPiao/patientsettle',
+      component: () => import('@/xt_pages/eleFaPiao/patientSettleDetail'),
+      name: 'patientSettleDetail',
+      meta: { title: 'patientSettleDetail', noCache: true },
+    },
+    {
+      path: '/eleFaPiao/fapiao',
+      component: () => import('@/xt_pages/eleFaPiao/fapiao'),
+      name: 'fapiao',
+      meta: { title: 'fapiao', noCache: true },
+    },
+
+   
+  ]
+}

src/router/modules/faPiao.js

-import Layout from '@/views/layout/Layout'
-
-export default {
-  path: '/fapiao',
-  component: Layout,
-  redirect: 'noredirect',
-  name: 'fapiao',
-  alwaysShow: true,
-  meta: {
-    title: 'fapiao',
-    isChild: true
-  },
-  children: [
-    {
-      path: '/fapiao/settle',
-      component: () => import('@/xt_pages/fapiao/settleDetail'),
-      name: 'settleDetail',
-      meta: { title: 'settleDetail', noCache: true }
-    },
-    {
-      path: '/fapiao/patientsettle',
-      component: () => import('@/xt_pages/fapiao/patientSettleDetail'),
-      name: 'patientSettleDetail',
-      meta: { title: 'patientSettleDetail', noCache: true },
-    },
-    {
-      path: '/fapiao/elefapiao',
-      component: () => import('@/xt_pages/fapiao/fapiao'),
-      name: 'elefapiao',
-      meta: { title: 'elefapiao', noCache: true },
-    },
-  ]
-}

src/router/modules/hisTool.js

       meta: { title: 'labelPrint', noCache: true }
     },
 
+    // {
+    //   path: '/hisTool/faPiao',
+    //   component: () => import('@/xt_pages/outpatientTool/fapiao'),
+    //   name: 'faPiao',
+    //   meta: { title: 'faPiao', noCache: true }
+    // },
+    // {
+    //   path: '/hisTool/faPiao',
+    //   component: () => import('@/xt_pages/outpatientTool/fapiao'),
+    //   name: 'faPiao',
+    //   meta: { title: 'faPiao', noCache: true }
+    // }, 
     {
-      path: '/hisTool/faPiao',
-      component: () => import('@/xt_pages/outpatientTool/fapiao'),
-      name: 'faPiao',
-      meta: { title: 'faPiao', noCache: true }
-    }, {
       path: '/hisTool/yidiClear',
       component: () => import('@/xt_pages/outpatientTool/yidiClear'),
       name: 'yidiClear',
             noCache: true
           },
         },
-    {
-      path: '/fapiao/settle',
-      component: () => import('@/xt_pages/fapiao/settleDetail'),
-      name: 'settleDetail',
-      meta: { title: 'settleDetail', noCache: true }
-    },
-    {
-      path: '/fapiao/patientsettle',
-      component: () => import('@/xt_pages/fapiao/patientSettleDetail'),
-      name: 'patientSettleDetail',
-      meta: { title: 'patientSettleDetail', noCache: true },
+    // {
+    //   path: '/fapiao/settle',
+    //   component: () => import('@/xt_pages/fapiao/settleDetail'),
+    //   name: 'settleDetail',
+    //   meta: { title: 'settleDetail', noCache: true }
+    // },
+    // {
+    //   path: '/fapiao/patientsettle',
+    //   component: () => import('@/xt_pages/fapiao/patientSettleDetail'),
+    //   name: 'patientSettleDetail',
+    //   meta: { title: 'patientSettleDetail', noCache: true },
 
-    },
-    {
-      path: '/fapiao/elefapiao',
-      component: () => import('@/xt_pages/fapiao/fapiao'),
-      name: 'fapiao',
-      meta: { title: 'fapiao', noCache: true },
-
-    },
+    // },
+    // {
+    //   path: '/fapiao/elefapiao',
+    //   component: () => import('@/xt_pages/fapiao/fapiao'),
+    //   // name: 'fapiao',
+    //   name:'elefapiao',
+    //   // meta: { title: 'fapiao', noCache: true },
+    //   meta: { title: 'elefapiao', noCache: true },
+    // },
   ]
 }

src/views/layout/Layout.vue

     }
   },
   created(){
-    let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool","faPiao",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
+    let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool","eleFaPiao",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','log_index'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];

src/views/layout/components/Sidebar/index.vue

     navTitle:{
       handler(newVal,oldVal){
         if(newVal == 'HIS管理'){
-          let nameArr = ['hospitalStation','hospitalRecord','hospitalCharges','DepositManagement','hisTool','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
+          let nameArr = ['hospitalStation','hospitalRecord','hospitalCharges','DepositManagement','hisTool','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','eleFaPiao'];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/fapiao/newSettleDetail.vue → src/xt_pages/eleFaPiao/newSettleDetail.vue

                 .catch(() => {
                 })
             }
-
           }
-
         }
       }).catch(function(error) {
       })
-
     },
     query(){
 

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

         </div>
         <div class="listInfo">
             <div>总金额：{{ order.medfee_sumamt }}</div>
-            <div>个人支付金额：{{ order.psn_part_amt }}</div>
+            <div>个人支付金额：{{ order.psn_cash_pay }}</div>
             <div>基金支付金额：{{ order.fund_pay_sumamt }}</div>
             <div>收费日期：{{getTimes(order.ctime)}}</div>
         </div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                   } else if (this.schedule.schedule_type == 2) {
                      if(this.org_id == 10206  || this.org_id == 0 ){
                       preTime = this.record_date + ' ' + '10:30'
-                    }else{
+                    }else if(this.org_id == 10598){
+                       preTime = this.record_date + ' ' + '09:00'
+
+                     }else{
                      preTime = this.record_date + ' ' + '11:00'
                    }
                   } else if (this.schedule.schedule_type == 3) {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
 
+                if(this.$store.getters.xt_user.org.id == 10510){
+                  preTime = nowTime
+                }
+
               } else {
-                console.log("test")
+
                 if (prescription.pre_time == 0) {
-                  console.log("++=========")
-                  console.log(nowTime.split(" ")[0])
-                  console.log(this.record_date)
-                  console.log("++=========")
 
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     }else if(this.schedule.schedule_type == 2){
                       if(this.org_id == 10206  || this.org_id == 0){
                         preTime = this.record_date + ' ' + '10:30'
+                      }else if(this.org_id == 10598){
+                        preTime = this.record_date + ' ' + '09:00'
+
                       }else {
                         preTime = this.record_date + ' ' + '11:00'
                       }
                       preTime = this.record_date + ' ' + '17:00'
                     }
 
+
+                    if(this.$store.getters.xt_user.org.id == 10510){
+                      preTime = nowTime
+                    }
+
                   }
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
               }
 
 
+
+
               let index = i + 1
               let obj = {
                 id: prescription.id,
                   } else if (this.schedule.schedule_type == 2) {
                     if(this.org_id == 10206  || this.org_id == 0){
                       preTime = this.record_date + ' ' + '10:30'
+                    }else if(this.org_id == 10598){
+                      preTime = this.record_date + ' ' + '09:00'
+
                     }else {
                       preTime = this.record_date + ' ' + '11:00'
                     }
                   } else if (this.schedule.schedule_type == 3) {
                     preTime = this.record_date + ' ' + '17:00'
                   }
+
+                  if(this.$store.getters.xt_user.org.id == 10510){
+                    preTime = nowTime
+                  }
                 }
 
                 if(nowTime.split(" ")[0] != this.record_date){
                   }else if(this.schedule.schedule_type == 2){
                     if(this.org_id == 10206  || this.org_id == 0){
                       preTime = this.record_date + ' ' + '10:30'
+                    }else if(this.org_id == 10598){
+                      preTime = this.record_date + ' ' + '09:00'
+
                     }else {
                       preTime = this.record_date + ' ' + '11:00'
                     }
                 }else if(this.schedule.schedule_type == 2){
                   if(this.org_id == 10206  || this.org_id == 0){
                     preTime = this.record_date + ' ' + '10:30'
+                  }else if(this.org_id == 10598){
+                    preTime = this.record_date + ' ' + '09:00'
+
                   }else {
                     preTime = this.record_date + ' ' + '11:00'
                   }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
+
+                      if(this.$store.getters.xt_user.org.id == 10510){
+                        preTime = nowTime
+                      }
                     } else {
                       if (prescription.pre_time == 0) {
                         if(nowTime.split(" ")[0] != this.record_date){
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
                               preTime = this.record_date + ' ' + '10:30'
+                            }else if(this.org_id == 10598){
+                              preTime = this.record_date + ' ' + '09:00'
+
                             }else {
                               preTime = this.record_date + ' ' + '11:00'
                             }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime =this.record_date + ' ' + '10:30'
-                          }else{
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
 
+                          }else{
                             preTime = this.record_date + ' ' + '11:00'
-
                           }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+
+                        if(this.$store.getters.xt_user.org.id == 10510){
+                          preTime = nowTime
+                        }
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        } else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                     }else if(this.schedule.schedule_type == 2){
                       if(this.org_id == 10206  || this.org_id == 0){
                         preTime = this.record_date + ' ' + '10:30'
+                      }else if(this.org_id == 10598){
+                        preTime = this.record_date + ' ' + '09:00'
+
                       }else {
                         preTime = this.record_date + ' ' + '11:00'
                       }
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
 
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
+
+                      if(this.$store.getters.xt_user.org.id == 10510){
+                        preTime = nowTime
+                      }
                     } else {
                       console.log("0---00000000000")
                       if (prescription.pre_time == 0) {
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
                               preTime = this.record_date + ' ' + '10:30'
+                            }else if(this.org_id == 10598){
+                              preTime = this.record_date + ' ' + '09:00'
+
                             }else {
                               preTime = this.record_date + ' ' + '11:00'
                             }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+
+                        if(this.$store.getters.xt_user.org.id == 10510){
+                          preTime = nowTime
+                        }
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime =this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
 
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
+
+                      if(this.$store.getters.xt_user.org.id == 10510){
+                        preTime = nowTime
+                      }
                     } else {
                       if (prescription.pre_time == 0) {
                         preTime = nowTime
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
                               preTime = this.record_date + ' ' + '10:30'
+                            }else if(this.org_id == 10598){
+                              preTime = this.record_date + ' ' + '09:00'
+
                             }else {
                               preTime = this.record_date + ' ' + '11:00'
                             }
                           if(this.org_id == 10206 ||  this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
 
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+
+                        if(this.$store.getters.xt_user.org.id == 10510){
+                          preTime = nowTime
+                        }
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }