Browse Source

518合并代码

XMLWAN 2 years ago
parent
commit
be2ebc4087
1 changed files with 6 additions and 3 deletions
  1. 6 3
      src/xt_pages/stock/drugs/drugStockOutOrder.vue

+ 6 - 3
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -248,7 +248,7 @@
248 248
           </el-table-column> -->
249 249
           <el-table-column label="总价" align="center">
250 250
             <template slot-scope="scope">
251
-              <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>
251
+              <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>
252 252
               <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>
253 253
             </template>
254 254
           </el-table-column>
@@ -1256,8 +1256,11 @@ export default {
1256 1256
      formatJson(filterVal, jsonData) {
1257 1257
       return jsonData.map(v => filterVal.map(j => v[j]));
1258 1258
      },
1259
-      getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number){
1259
+      getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number,is_sys){
1260 1260
         console.log("drugfalowlist22332233232",this.drugFlowList)
1261
+        console.log("max_unit23223232323",max_unit)
1262
+        console.log("count_unit2323333",count_unit)
1263
+        console.log("is_sys232232323",is_sys)
1261 1264
         var total = 0
1262 1265
         var all_price = 0
1263 1266
         for(let i=0;i<this.drugFlowList.length;i++){
@@ -1265,7 +1268,7 @@ export default {
1265 1268
               total += this.drugFlowList[i].count
1266 1269
           }
1267 1270
         }
1268
-        if(max_unit == count_unit){
1271
+        if(max_unit == count_unit && is_sys!=0 && is_sys!=12){
1269 1272
           total = total * min_number
1270 1273
         }
1271 1274
         all_price = total * price