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

@@ -301,7 +301,7 @@
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
-                                            <template slot-scope="scope">{{ scope.row.retail_price }}</template>
+                                            <template slot-scope="scope">{{ scope.row.min_price }}</template>
                                         </el-table-column>
                                     </el-table>
                                     <!-- <div>{{3*(2/3)}}</div> -->
@@ -2700,7 +2700,7 @@
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
                   number_days: temp2[b].number_days.toString(),
-                  total: temp2[b].total,
+                  total: 1,
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,