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

@@ -2225,6 +2225,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++){
@@ -2885,6 +2886,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/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