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

@@ -365,14 +365,6 @@
                                         <el-table-column label="规格" width="60">
                                             <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                         </el-table-column>
-                                        <el-table-column label="库存" width="60">
-                                            <template slot-scope="scope">
-                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}} / {{
-                                                scope.row.total * (scope.row.dose / scope.row.min_number)}}
-                                                {{(scope.row.total * (scope.row.dose /
-                                                scope.row.min_number))?scope.row.max_unit:''}}
-                                            </template>
-                                        </el-table-column>
                                         <el-table-column label="单价" width="40">
                                             <template slot-scope="scope">{{ scope.row.price }}</template>
                                         </el-table-column>

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1297,6 +1297,7 @@
                   single_dose_unit: temp3[b].drug.min_unit,
                   prescribing_number_unit: temp3[b].drug.max_unit,
                   medical_insurance_number: temp3[b].drug.medical_insurance_number
+
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -1428,7 +1429,8 @@
                     single_dose_unit: prescription.advices[b].single_dose_unit,
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
-                    id: prescription.advices[b].drug_id
+                    id: prescription.advices[b].drug_id,
+                    drug: prescription.advices[b].drug,
                   }
                   tempAdvice.push(obj)
                 }