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

@@ -80,7 +80,7 @@
             </el-table-column>
             <el-table-column align="center" prop="retail_price" width="80" label="单价">
               <template slot-scope="scope">
-                <div>{{scope.row.retail_price}}</div>
+                <div>{{scope.row.price}}元</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="remark" label="备注">
@@ -131,7 +131,7 @@
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                <div>{{ scope.row.total }}{{scope.row.unit}}</div>
+                <div>{{ scope.row.count }}{{scope.row.unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="name" width="60" label="单价">