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

@@ -3807,6 +3807,9 @@
             if (this.radio == 1) {
               this.all_table_data = this.unique_four(this.all_table_data)
             }
+            console.log("~~~~~~~~~~")
+
+            console.log(this.all_table_data)
 
             switch (this.radio) {
               case 1:

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -387,6 +387,9 @@
                                         <el-table-column label="规格" width="60">
                                             <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                         </el-table-column>
+                                        <el-table-column label="库存" width="40">
+                                            <template slot-scope="scope">{{ scope.row.total }}</template>
+                                        </el-table-column>
                                         <el-table-column label="单价" width="40">
                                             <template slot-scope="scope">{{ scope.row.price }}</template>
                                         </el-table-column>
@@ -2750,7 +2753,8 @@
                 price: project[i].price,
                 medical_code: project[i].medical_code,
                 unit: project[i].unit,
-                type: 2
+                type: 2,
+                total:project[i].total
               }
 
               this.tabProject.push(obj)
@@ -2763,14 +2767,15 @@
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
                 statistical_classification: 0,
-                single_dose: 1,
+                single_dose: good_info[i].specification_name,
                 delivery_way: '',
                 execution_frequency: '',
                 number_days: 1,
-                price: good_info[i].retail_price,
+                price: good_info[i].packing_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
-                type: 3
+                type: 3,
+                total:good_info[i].total
               }
               this.tabProject.push(obj)
             }