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

@@ -2917,7 +2917,7 @@ export default {
                 remark: '',
                 day: '1',
                 prescribing_number: temp3[b].prescribing_number,
-                single_dose_unit: temp3[b].drug.dose_unit,
+                single_dose_unit: temp3[b].drug.drug_dose_unit,
                 prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
                 medical_insurance_number: temp3[b].drug.medical_insurance_number
               }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2900,7 +2900,7 @@
                   remark: '',
                   day: '1',
                   prescribing_number: temp3[b].prescribing_number,
-                  single_dose_unit: temp3[b].drug.dose_unit,
+                  single_dose_unit: temp3[b].drug.drug_dose_unit,
                   prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
                   medical_insurance_number: temp3[b].drug.medical_insurance_number
                 }
@@ -3091,7 +3091,7 @@
                    good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
                 }
               }
-               
+
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -488,7 +488,7 @@
         let data = {
           'prescriptions': this.prescriptions
         }
-        
+
         createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$message.success('保存成功')
@@ -987,7 +987,7 @@
                 this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
               }
             }
-            
+
             let data = {
               'prescriptions': this.prescriptions
             }
@@ -1481,7 +1481,7 @@
                   remark: '',
                   day: 1,
                   prescribing_number: temp3[b].prescribing_number,
-                  single_dose_unit: temp3[b].drug.min_unit,
+                  single_dose_unit: temp3[b].drug.drug_dose_unit,
                   prescribing_number_unit: temp3[b].drug.max_unit,
                   medical_insurance_number: temp3[b].drug.medical_insurance_number