合并带嘛

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2912,9 +2912,9 @@ export default {
             this.pwd = ''
           } else {
             if (this.activeName == 'first') {
-              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             } else {
-              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             }
 
           }
@@ -2922,7 +2922,7 @@ export default {
           if (this.activeName == 'first') {/////////////////////////押金shows
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           } else {
-            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           }
         }
 
@@ -4527,7 +4527,6 @@ export default {
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       // medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
                       execution_state: prescription.project[b].execution_state,
 
@@ -4545,14 +4544,14 @@ export default {
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['spec'] = ''
                       obj['name_id'] = 0
-
+                      obj['unit']=  prescription.project[b].project.unit
                     } 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['spec'] = prescription.project[b].good_info.specification_name
                       obj['name_id'] = prescription.project[b].good_info.manufacturer
-
+                      obj['unit']=  prescription.project[b].good_info.packing_unit
                     }
 
                     tempProject.push(obj)