sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/meihekou/ReissueBill.vue

@@ -195,6 +195,7 @@
    */
   let getBillData = async function (self) {
     let billParam = {reprint: "'补打'"}
+    console.log('补打标识', self)
     // 显示票据
     if (self.data.f_bill_type == '卡表收费' || self.data.f_bill_type == '卡表收费撤销' || self.data.f_bill_type == '发卡售气') {
       let http = new HttpResetClass()
@@ -206,8 +207,9 @@
       let a = await http.load('POST', 'api/af-revenue/logic/commonCal', {data: param}, {resolveMsg: null, rejectMsg: '获取阶梯使用情况出错'})
       let value = a.data
       let jt = a.data.chargeprice.length
+      console.log('value', value)
       if (jt > 1) {
-        value.f_hasuse1 = (value.sumamount >= value.f_stair1ceiling ? value.f_stair1ceiling : value.sumamount).toFixed(4)
+        value.f_hasuse1 = (value.sumamount >= value.f_stair1ceiling ? value.f_stair1ceiling - 0 : value.sumamount - 0).toFixed(4)
         value.f_hasuse2 = (value.sumamount >= value.f_stair2ceiling ? value.f_stair2ceiling - value.f_stair1ceiling : value.sumamount - value.f_stair1ceiling).toFixed(4)
         value.f_hasuse3 = (value.sumamount >= value.f_stair3ceiling ? value.f_stair3ceiling - value.f_stair2ceiling : value.sumamount - value.f_stair2ceiling).toFixed(4)
         if (value.f_hasuse2 < 0) value.f_hasuse2 = 0
@@ -226,6 +228,7 @@
         value.f_stair2price = 0
         value.f_stair3price = 0
       }
+
       billParam = Object.assign(billParam, value)
     }
     self.bill = new DataModel(self.data.billUrl, billParam, 'af-revenue')