sale-client 4.0.33-preview → 4.0.35-preview

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.0.33-preview",
+  "version": "4.0.35-preview",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/base/rightview/CardList.vue

@@ -494,11 +494,11 @@
           name = 'api/af-revenue/report/garbageChargeReport'
         } else if (type === '物联网赠费') {
           name = 'api/af-revenue/report/iotGiftFee'
-        }else if (type === '物联网赠气') {
+        } else if (type === '物联网赠气') {
           name = 'api/af-revenue/report/iotGiftGas'
-        }else if (type === '卡表赠费') {
+        } else if (type === '卡表赠费') {
           name = 'api/af-revenue/report/icGiftFee'
-        }else if (type === '卡表赠费') {
+        } else if (type === '卡表赠气') {
           name = 'api/af-revenue/report/icGiftGas'
         }
         return name

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -76,7 +76,7 @@
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">用户编号:</label>
               <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
-                     condition="f_userinfo_code = '{}'" placeholder='用户编号'>
+                     condition="s.f_userinfo_code = '{}'" placeholder='用户编号'>
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">&emsp;订单号:</label>
@@ -232,7 +232,7 @@
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeid = val[0]
       },
-      // 微信单方账单，系统可缴费
+      // 银行单方账单，系统可缴费
       async charge (row) {
         console.log('单边账补缴：', row)
         row.f_operator = Vue.$login.f.name
@@ -267,13 +267,13 @@
           let gasAmountApproved = 0
 
           if (chargeLength === 1) {
-            gasFee = pricingRes.data.chargeprice[0].f_money
+            gasFee = Number(pricingRes.data.chargeprice[0].f_money)
             gasAmountApproved = pricingRes.data.chargeprice[0].f_gas
           } else if (chargeLength === 2) {
-            gasFee = pricingRes.data.f_stair1fee + pricingRes.data.f_stair2fee
+            gasFee = Number(pricingRes.data.f_stair1fee) + Number(pricingRes.data.f_stair2fee)
             gasAmountApproved = pricingRes.data.oughtamount
           } else if (chargeLength === 3) {
-            gasFee = pricingRes.data.f_stair1fee + pricingRes.data.f_stair2fee + pricingRes.data.f_stair3fee
+            gasFee = Number(pricingRes.data.f_stair1fee) + Number(pricingRes.data.f_stair2fee) + Number(pricingRes.data.f_stair3fee)
             gasAmountApproved = pricingRes.data.oughtamount
           }
           // 缴费

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -141,7 +141,7 @@ export default {
         // f_add_gas: '不计入'
       },
       config: {
-        hasPrint: true
+        hasPrint: false
       },
       billData: {
         url: 'api/af-revenue/report/icGiftGas',

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue

@@ -82,7 +82,7 @@ export default {
         f_comments: ''
       },
       config: {
-        hasPrint: true
+        hasPrint: false
       },
       billData: {
         url: 'api/af-revenue/report/iotGiftGas',

package/src/plugins/CommonService.js

@@ -179,7 +179,7 @@ let CommonService = {
       let sql = `update t_userfiles set
           f_card_password = '${cardRes.data.Kmm}'
                    where f_userfiles_id = '${row.f_userfiles_id}'`
-        await Vue.resetpost('api/af-revenue/rs/logic/runSQL', {sql: sql})
+        await Vue.resetpost('api/af-revenue/logic/runSQL', {sql: sql})
       }
     }
   },