Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -441,7 +441,11 @@ export default {
                   total_price += order[i].total_price
                  }
                  if(order[i].count_unit == order[i].max_unit){
-                   order[i].total_price += order[i].count * order[i].price * order[i].min_number
+                   if(order[i].is_sys == 0){
+                     order[i].total_price += order[i].count * order[i].price
+                   }else{
+                     order[i].total_price += order[i].count * order[i].price * order[i].min_number
+                   }
                  }
                 
                }
@@ -453,7 +457,11 @@ export default {
                  }
                 
                 if(order[i].count_unit == order[i].max_unit){
-                   order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
+                   if(order[i].is_sys == 0){
+                     order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) 
+                   }else{
+                     order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
+                   }
                    order[i].price = this.getPrice(order[i].drug_id)
                 }