518合并代码

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -248,7 +248,7 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number).toFixed(2)}}</span>
+              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
               <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number).toFixed(2)}}</span>
             </template>
           </el-table-column>
@@ -1256,8 +1256,11 @@ export default {
      formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
      },
-      getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number){
+      getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number,is_sys){
         console.log("drugfalowlist22332233232",this.drugFlowList)
+        console.log("max_unit23223232323",max_unit)
+        console.log("count_unit2323333",count_unit)
+        console.log("is_sys232232323",is_sys)
         var total = 0
         var all_price = 0
         for(let i=0;i<this.drugFlowList.length;i++){
@@ -1265,7 +1268,7 @@ export default {
               total += this.drugFlowList[i].count
           }
         }
-        if(max_unit == count_unit){
+        if(max_unit == count_unit && is_sys!=0 && is_sys!=12){
           total = total * min_number
         }
         all_price = total * price