518合并代码

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

@@ -446,7 +446,7 @@ export default {
                 
                }
                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 * this.getPrice(order[i].drug_id)
                    // total_price += order[i].count * this.getPrice(order[i].drug_id)
                    total_price +=order[i].total_price
@@ -641,7 +641,7 @@ export default {
               
             }else{
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
-              if(this.tableData[i].count_unit == this.tableData[i].min_unit){
+              if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
               }
               if(this.tableData[i].count_unit == this.tableData[i].max_unit){