10.14

fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue

@@ -14,7 +14,7 @@
                   <el-popover
                     placement="bottom"
                     trigger="hover">
-                    <div> 储值卡：￥1000.00</div>
+                    <div> 储值卡：￥{{ chooseVipUser.cardBalance || 0 }}</div>
                     <div> 储值卡：￥1000.00</div>
                     <div> 储值卡：￥1000.00</div>
                     <div> 储值卡：￥1000.00</div>
@@ -693,12 +693,12 @@ export default {
     }
   },
   watch: {
-    //监听会员 是否获取
+    //监听结算金额 是否获取
-    chooseVipUser: {
+    realAmount: {
       handler(newVal) {
-        console.log("会员发生变化", newVal);
+        console.log("结算金额", newVal);
-         //  判断对象 是否含有 name 属性
+         //  判断是否有结算金额
-        if (this.chooseVipUser.hasOwnProperty("name")){
+        if (this.realAmount > 0){
            this.isClickable = true
          }else {
            this.isClickable = false
@@ -1068,21 +1068,23 @@ export default {
       let oilOrderR = [
         {
           oilName : this.oilGunClearing.name,
-          amount :  this.oilGunClearing.amount,
+          amount :  this.oilGunClearing.amount + '',
         }
       ]
 
       let goodsOrderR = []
-      this.goodsOrder.forEach(order=>{
+      if (this.goodsOrder && this.goodsOrder.length>0) {
-        let o = {
+        this.goodsOrder.forEach(order => {
-          oilName : order.name,
+          let o = {
-          unit : order.num+order.unit,
+            oilName: order.name,
-          // amount : order.memberPrice.toString()
+            unit: order.num + order.unit,
-          amount : order.retailPrice.toString()
+            // amount : order.memberPrice.toString()
+            amount: order.retailPrice.toString()
 
-        }
+          }
-        goodsOrderR.push(o)
+          goodsOrderR.push(o)
-      })
+        })
+      }
       // 支付方式
       const payTypeMap = {
         'CASH': '现金',
@@ -1099,7 +1101,7 @@ export default {
         oilOrder:oilOrderR,
         goodsOrder:goodsOrderR,
         payType:payTypeText,
-        unitName:this.form1.unitName, // 挂账单位
+        unitName:"", // 挂账单位
 
         // consumeAmount:this.consumeAmount,
         creditAmount: (this.oilAmount+(+this.goodsAmount)).toFixed(2),//挂账金额
@@ -1108,14 +1110,15 @@ export default {
         // 储值卡付款
         consumeAmount:this.consumeAmount,
         // 屯油卡付款
-        consumeRefuelMoney:this.consumeRefuelMoney.toFixed(2),
+        consumeRefuelMoney:this.consumeRefuelMoney ? this.consumeRefuelMoney.toFixed(2) : 0,
         // 实付款
         actualPay : ((+this.oilActualPay)+(+this.goodsActualPay)).toFixed(2),
         // 找零
-        seekZero:this.seekZero.toFixed(2),
+        seekZero:this.seekZero ? this.seekZero.toFixed(2) : 0,
       }
+      if (this.form1 && this.form1.unitName) f.unitName = this.form1.unitName
       printOilOrderReport(f).then(res=>{
-
+        console.log(res,1121)
       })
     },
     //表单重置
@@ -1329,7 +1332,7 @@ export default {
 
             _this.isPaySuccess = true;
             isPaySuccess = true
-            _this.isPay = true;
+            _this.isPay = false;
             _this.loading = false;
             _this.oilOrderReport()
             _this.resetting1()
@@ -1340,7 +1343,7 @@ export default {
           if (response.data.goodsOrder.status == "paid") {
             _this.isPaySuccess = true;
             isPaySuccess = true
-            _this.isPay = true;
+            _this.isPay = false;
             _this.loading = false;
             _this.oilOrderReport()
             _this.resetting1()
@@ -1354,7 +1357,7 @@ export default {
           this.dialogVisiblej = false;
           return;
         }
-        if (response.data.error == "请先配置支付通道") {
+        if (response.data.error && response.data.error != 1) {
           this.$modal.msgError(response.data.error)
           this.loading = false;
           // this.dialogVisiblej = false;