518合并代码

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

@@ -435,7 +435,7 @@ export default {
                total_price += order[i].count * order[i].last_price
              }else{
                if(order[i].price > 0){
-                 if(order[i].count_unit == order[i].min_unit){
+                 if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
                   total_price += order[i].total_price
                  }