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

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -322,7 +322,7 @@
                 total:prescription.project[b].count,
                 remark:prescription.project[b].remark,
                 unit: prescription.project[b].unit,
-                type: prescription.project[b].type
+                type: prescription.project[b].type,
                 // medical_code:prescription.project[b].project.medical_code,
               };
               if(prescription.project[b].type == 2){
@@ -330,11 +330,15 @@
                 obj['medical_code'] =  prescription.project[b].project.medical_code
                 obj['project_name'] =  prescription.project[b].project.project_name
                 obj['price'] = prescription.project[b].project.price
+                obj['project']=prescription.project[b].project
+
               }else if(prescription.project[b].type == 3){
                 obj['statistical_classification'] = ""
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
                 obj['project_name'] =  prescription.project[b].good_info.good_name
                 obj['price'] = prescription.project[b].good_info.packing_price
+                obj['good_info']=prescription.project[b].good_info
+
               }
 
               tempProject.push(obj)

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -376,17 +376,20 @@
 
                 // medical_code:prescription.project[b].project.medical_code,
               };
-
               if(prescription.project[b].type == 2){
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
                 obj['medical_code'] =  prescription.project[b].project.medical_code
                 obj['project_name'] =  prescription.project[b].project.project_name
                 obj['price'] = prescription.project[b].project.price
+                obj['project']=prescription.project[b].project
+
               }else if(prescription.project[b].type == 3){
                 obj['statistical_classification'] = ""
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
                 obj['project_name'] =  prescription.project[b].good_info.good_name
                 obj['price'] = prescription.project[b].good_info.packing_price
+                obj['good_info']=prescription.project[b].good_info
+
               }
 
               tempProject.push(obj)