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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3031,7 +3031,7 @@ export default {
 
           for (let i = 0; i < good_info.length; i++) {
             good_info[i].stock_count = 0
-            if (good_info[i].good_stock_in.length > 0) {
+            if (good_info[i].good_stock_in&&good_info[i].good_stock_in.length > 0) {
               for (let j = 0; j < good_info[i].good_stock_in.length; j++) {
                 good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
               }
@@ -3059,6 +3059,9 @@ export default {
 
           this.allProject = this.tabProject
 
+
+
+
         }
       })
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2186,6 +2186,16 @@ export default {
       if (this.activeName == 'first') {
         this.getPatientList()
       } else if (this.activeName == 'second') {
+
+
+
+
+
+
+
+
+
+
         const params = {
           'record_date': this.record_date,
           'patient_id': this.patientInfo.id,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3012,7 +3012,7 @@
 
             for (let i = 0; i < good_info.length; i++) {
                good_info[i].stock_count = 0
-              if(good_info[i].good_stock_in.length >0 ){
+              if(good_info[i].good_stock_in&&good_info[i].good_stock_in.length >0 ){
                 for(let j=0;j<good_info[i].good_stock_in.length;j++){
                    good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
                 }