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

@@ -550,7 +550,7 @@
         temp_med_type: '',
         dialogVisible: false,
         pwdFormVisible: false,
-        pwd: '',
+        pwd: '000000',
         form: {
           p_type: '',
           sick_type: '',

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/deskPrescription.vue

@@ -1367,8 +1367,6 @@
           this.prescriptions[i].name = '处方' + (i + 1)
           this.prescriptions[i]['pre_time'] = nowTime
 
-          this.prescriptions[i]['med_type'] = 14
-
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
               this.customTabIndex = 1
@@ -2225,6 +2223,7 @@
             }
           }
           if (index == 1) {
+            console.log(this.prescriptions)
 
             for (let i = 0; i < this.prescriptions.length; i++) {
               for(let b = 0; b < this.prescriptions[i].advices.length; b++){
@@ -2856,17 +2855,6 @@
 
             }
 
-            // if(this.activeName == 2){
-            //
-            //    for(let i = 0; i<temp2.length;i++){
-            //     for(let j=0;j<this.hisList.length;j++){
-            //         if(temp2[i].id == this.hisList[j].project_id){
-            //            temp2[i].total =  this.hisList[j].number
-            //         }
-            //     }
-            //    }
-            //  }
-
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
@@ -2885,6 +2873,15 @@
                   unit: temp2[b].unit,
                   type: temp2[b].type
                 }
+
+                if (temp2[b].type == 2){
+                  obj['project'] = temp2[b].project
+
+                }else if(temp2[b].type == 3){
+
+                  obj['good_info'] = temp2[b].good_info
+
+                }
                 if (temp2[b].team_id == undefined) {
                   obj['team_id'] = 0
                 } else {

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)

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1516,7 +1516,14 @@
                   medical_code: temp2[b].medical_code,
                   unit: temp2[b].unit,
                   type: temp2[b].type,
-                  project:temp2[b],
+                }
+                if (temp2[b].type == 2){
+                  obj['project'] = temp2[b].project
+
+                }else if(temp2[b].type == 3){
+
+                  obj['good_info'] = temp2[b].good_info
+
                 }
                 if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1