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

@@ -47,6 +47,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="总价">
+        <template slot-scope="scope">
+          <div> {{scope.row.retail_price * scope.row.prescribing_number}}元</div>
+        </template>
+      </el-table-column>
+
 
       <el-table-column align="center" prop="name" width="60" label="执行状态">
         <template slot-scope="scope">

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -46,6 +46,16 @@
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="name" width="60" label="总价">
+        <template slot-scope="scope">
+          <div> {{scope.row.prescribing_number * scope.row.retail_price}}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+
+
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
@@ -105,6 +115,14 @@
 
         </template>
       </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="总价">
+        <template slot-scope="scope">
+          <div> {{scope.row.total * scope.row.price}}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" readonly></el-input>-->