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

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -686,7 +686,7 @@ export default {
           this.$message.error("请选择需要记账的患者")
           return
         }
-        var that = this
+
         let obj = {
           patient_id: this.hisPatientInfo.id,
           diagnosis_time: this.record_date,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3786,20 +3786,16 @@ 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){
+                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 &&  this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
                   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
                   this.tabProject[b].price = this.zuobiao_project[i].price
-
                 }
               }
             }
           }
-
           this.allProject = this.tabProject
-
-
           // console.log('cccc',this.allProject);
         }
       })

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1634,7 +1634,6 @@ export default {
 
       }
       this.isloading = true
-      console.log('param32323232323323223233232332', params)
       getPatientInfo(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg)
@@ -1855,8 +1854,7 @@ export default {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
               }
-              console.log('is_medicine')
-              console.log(is_medicine)
+
 
               let index = i + 1
               let obj = {
@@ -2027,11 +2025,12 @@ export default {
                   obj.med_type = ''
 
                 } else {
-
                   obj.med_type = parseInt(prescription.med_type)
                 }
+
+
                 if (obj.med_type == 0 || obj.med_type == '') {
-                  if (this.org_id != 10206) {
+                  if (this.org_id != 10206 && this.org_id != 0) {
                     obj.med_type = 14
                   } else {
                     obj.med_type = 1
@@ -2055,6 +2054,10 @@ export default {
               }
               if (this.org_id != 10206) {
                 obj.med_type = 14
+              }else{
+
+                obj.med_type = 1
+
               }
               this.prescriptions.push(obj)
 
@@ -4215,7 +4218,7 @@ export default {
                         med_type: ''
 
                       }
-                      if (this.org_id != 10206) {
+                      if (this.org_id != 10206 && this.org_id != 0) {
                         if (prescription.med_type == 0 || prescription.med_type == '') {
 
                           obj.med_type = ''
@@ -4230,9 +4233,10 @@ export default {
 
                         }
                       }else{
-
-                        obj.med_type = prescription.med_type
-
+                        obj.med_type = parseInt(prescription.med_type)
+                        if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = 1
+                        }
                       }
                       this.prescriptions.push(obj)
                     }
@@ -4252,7 +4256,7 @@ export default {
                     if (this.org_id != 10206) {
                       obj.med_type = 14
                     }else{
-                      obj.med_type = "1"
+                      obj.med_type = 1
                     }
 
                     this.prescriptions.push(obj)
@@ -4921,9 +4925,13 @@ export default {
                       med_type: ''
 
                     }
-                    if (this.org_id != 10206) {
+                    if (this.org_id != 10206 && this.org_id != 0) {
 
                       obj.med_type = 14
+                    }else{
+
+                      obj.med_type = 1
+
                     }
 
                     this.prescriptions.push(obj)

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){
+                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
                     this.tabProject[b]["zuobiao_stock_num"] = this.zuobiao_project[i].lsqty
                     this.tabProject[b].price = this.zuobiao_project[i].price