sale-client 3.6.474 → 3.6.476

package/package.json

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

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -45,6 +45,10 @@
           <label class = "col-sm-5 " style="color: brown">表端上报余额</label>
           <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
         </div>
+        <div class="row">
+          <label class = "col-sm-5 " >欠费金额</label>
+          <span class = "col-sm-7">{{f_arrears_fee ? f_arrears_fee : 0}}</span>
+        </div>
         <div class="row">
           <label class = "col-sm-5 " >初始表底数</label>
           <span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
@@ -270,7 +274,9 @@
 
 <script>
   /* 用户档案相关信息组件 */
-  export default {
+import {HttpResetClass} from 'vue-client'
+
+export default {
     ready () {
       console.log('看看userinfo里面接收的data数据', this.data)
     },
@@ -303,6 +309,7 @@
           f_jval: 0,
           f_table_state: 0
         },
+        f_arrears_fee: 0,
         model: null,
         showselectncuserfile: false,
         showSelectUserFee: false,
@@ -314,6 +321,29 @@
     },
     props: ['data'],
     methods: {
+      async getArrears () {
+        let http = new HttpResetClass()
+        let arrearsFee = 0
+        let res = await http.load('POST', 'rs/logic/sale_getOwe', {
+          data: {
+            f_userinfo_id: this.data.f_userinfo_id
+          }
+        }, {resolveMsg: null, rejectMsg: '获取欠费出错！！'})
+        if (res.data.length > 0) {
+          const owes = res.data.flatMap(item => item.rows)
+          for (let i = 0; i < owes.length; i++) {
+            arrearsFee = arrearsFee + owes[i].f_oughtfee
+          }
+        }
+        this.list = res.data
+        if (this.data.f_meter_type == '物联网表') {
+          this.f_arrears_fee = (this.data.f_balance_amount - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance_amount - arrearsFee)
+        } else if (this.data.f_meter_type == '机表') {
+          this.f_arrears_fee = (this.data.f_balance - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance - arrearsFee)
+        } else {
+          this.f_arrears_fee = (this.data.f_balance - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance - arrearsFee)
+        }
+      },
       dealmsg (val) {
         this.$dispatch('deal-msg', val)
       },
@@ -375,9 +405,9 @@
     watch: {
       'data' (val) {
         console.log('val========', val)
+        this.getArrears()
       }
-    },
-
+    }
   }
 </script>
 <style lang="less">

package/src/filiale/qianneng/OtherChargeNew.vue

@@ -470,6 +470,10 @@
         this.validateOk = !val.isOk
         this.billData.bill = val.bill
       },
+      roundToDecimalPlace (number, decimalPlaces) {
+        const factor = Math.pow(10, decimalPlaces)
+        return Math.round(number * factor) / factor
+      },
       getcollection () {
         let money = 0
         let flag = true
@@ -479,8 +483,10 @@
             money += ((item.f_unitprice - 0) * (item.f_number - 0)) - 0
           }
         })
+        console.log(money)
         if (money != 0) {
-          this.model.f_collection = money.toFixed(2)
+          this.model.f_collection = this.roundToDecimalPlace(money, 2)
+          console.log(this.model.f_collection)
         }
         if (!flag) this.model.f_collection = ''
       },

package/src/filiale/shangluo/ChangeMeter.vue

@@ -325,7 +325,7 @@ let getPrice = async function (self) {
 
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.model.f_payment = self.config.payment
-  self.model.f_ladder_sync = self.config.ladderSync
+  // self.model.f_ladder_sync = self.config.ladderSync
   self.mulPrint = self.config.printType instanceof Array
   self.model.f_use_type = self.config.billType
   self.model.f_bill_type = self.model.f_print
@@ -412,7 +412,7 @@ export default {
           f_oldmeter_use_reference: 0 // 旧表使用量参考值
         },
         // 旧表底数
-        f_ladder_sync: '',
+        f_ladder_sync: '不同步',
         f_using_base_old: '',
         // 换表补气量
         f_remanent_gas: 0,

package/src/plugins/GetSaleParams.js

@@ -20,7 +20,7 @@ let GetSaleParam = {
   bookcodes:[],
   inputtors: [],
   async initinputtor () {
-    let res = await Vue.resetpost('rs/sql/sale_getAlluserRes', {data: {
+    let res = await Vue.resetpost('rs/sql/sale_getAlluserRes?pageNo=1&pageSize=999999', {data: {
       condition: ' 1=1'
     }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
     console.log('resdata:', res.data)
@@ -38,11 +38,12 @@ let GetSaleParam = {
           return res.rolestr.indexOf('抄表员') > -1 && res.f_orgid == orgid
         }
       })
-
+      console.log(arr)
       arr.forEach((res) => {
         inputtors.push({label: res.name, value: res.name})
       })
     }
+    console.log(inputtors)
     return inputtors
   },
   getGasstyle (key) {