Browse Source

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 3 weeks ago
parent
commit
ff8fbc51a1

+ 1 - 1
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue View File

282
       console.log("total_five_price----",total_five_price)
282
       console.log("total_five_price----",total_five_price)
283
     
283
     
284
       var total =  total_one_price + total_two_price - total_three_price - total_four_price + total_five_price
284
       var total =  total_one_price + total_two_price - total_three_price - total_four_price + total_five_price
285
-      if(total >0){
285
+      if(total >1){
286
         return total.toFixed(2)
286
         return total.toFixed(2)
287
       }else{
287
       }else{
288
         return ""
288
         return ""

+ 1 - 1
src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue View File

1544
 
1544
 
1545
       var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price)
1545
       var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price)
1546
        
1546
        
1547
-      if(total >0){
1547
+      if(total >1){
1548
         return total.toFixed(2)
1548
         return total.toFixed(2)
1549
       }else{
1549
       }else{
1550
         return ""
1550
         return ""