Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -717,8 +717,8 @@ export default {
 
               } else {
                 that.radio = 2
-                that.getPatientList()
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
+                that.getPatientList()
               }
             }
           })

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3786,7 +3786,7 @@ export default {
             console.log("-=======")
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
-                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 &&  this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
+                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 &&  this.zuobiao_project[i].bby06 == this.tabProject[b].single_dose){
                   console.log( this.zuobiao_project[i].lsqty)
                   console.log( this.tabProject[b].zuobiao_stock_num)
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -608,11 +608,15 @@
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
           if (scope.row.prescribing_number > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+            if(this.$store.getters.xt_user.org_id != 10206) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
         } else {
           if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+            if(this.$store.getters.xt_user.org_id != 10206) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1829,17 +1829,23 @@ export default {
               // }
 
               var preTime = nowTime
-              if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                    } else if(this.org_id == 10206  || this.org_id == 0){
+                      preTime = this.record_date + ' ' + '6:00'
                     } else {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                     }
                   } else if (this.schedule.schedule_type == 2) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                     if(this.org_id == 10206  || this.org_id == 0 ){
+                      preTime = this.record_date + ' ' + '10:00'
+                    }else{
+                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                   }
                   } else if (this.schedule.schedule_type == 3) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                   }
@@ -1992,17 +1998,23 @@ export default {
                   tempProject.push(obj)
                 }
                 var preTime = nowTime
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                    } else if(this.org_id == 10206  || this.org_id == 0) {
+                      preTime = this.record_date+ ' ' + '6:00'
                     } else {
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                     }
                     // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    if(this.org_id == 10206  || this.org_id == 0){
+                      preTime = this.record_date + ' ' + '6:00'
+                    }else {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    }
                   } else if (this.schedule.schedule_type == 3) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                   }
@@ -2321,18 +2333,24 @@ export default {
                     // }
 
                     var preTime = nowTime
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                    if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -2487,17 +2505,25 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                      if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime =this.record_date + ' ' + '10:00'
+                          }else{
+
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4025,18 +4051,27 @@ export default {
 
                     var preTime = nowTime
 
-                    if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                    if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 || this.org_id == 0){
+
+                            preTime = this.record_date + ' ' + '6:00'
+
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+
+                          }else {
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4190,17 +4225,22 @@ export default {
 
                       // var preTime = nowTime
                       var preTime = nowTime
-                      if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                      if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date+ ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4695,19 +4735,25 @@ export default {
 
                     var preTime = nowTime
 
-                    if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                    if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 || this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206  || this.org_id == 0){
+                            preTime =this.record_date + ' ' + '10:00'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }
@@ -4862,17 +4908,23 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if (this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+                      if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          } else if(this.org_id == 10206 ||  this.org_id == 0){
+                            preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          if(this.org_id == 10206 ||  this.org_id == 0){
+                            preTime = this.record_date + ' ' + '10:00'
+
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                          }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
                         }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -2036,7 +2036,7 @@
               console.log("-=======")
               for (let i = 0; i < this.zuobiao_project.length; i++) {
                 for (let b = 0; b < this.tabProject.length; b++) {
-                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
+                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].single_dose){
                     this.tabProject[b]["zuobiao_stock_num"] = this.zuobiao_project[i].lsqty
                     this.tabProject[b].price = this.zuobiao_project[i].price