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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -564,7 +564,9 @@
           patient_id: this.patientInfo.id,
           start_time: val,
           end_time: this.other_end_time,
-          p_type:2
+          p_type:2,
+          type: this.radio,
+
 
         };
         getDayOrMonthHisPrescription(params).then(response => {
@@ -1040,10 +1042,10 @@
                   })
 
                 } else {
-                  this.changeRadio(1)
-                  this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
-                  this.$refs.register.hide()
-                  this.loadingone = false
+                  that.changeRadio(1)
+                  that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
+                  that.$refs.register.hide()
+                  that.loadingone = false
                   // that.radio = 1
                   // that.$refs.register.hide();
                   // let params = {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2054,7 +2054,7 @@
               }
 
               for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
-                this.prescriptions[i].addition[b].id = parseInt(this.prescriptions[i].addition[b].id)
+                this.prescriptions[i].addition[b].id = prarseInt(this.prescriptions[i].addition[b].id)
                 this.prescriptions[i].addition[b].item_id = parseInt(this.prescriptions[i].addition[b].item_id)
                 this.prescriptions[i].addition[b].price = this.prescriptions[i].addition[b].price.toString()
                 this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
@@ -2494,7 +2494,7 @@
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                   obj.prescribing_number = 1
                 }
-                
+
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
@@ -2526,7 +2526,7 @@
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
-              
+
             }
 
             // if(this.activeName == 2){