sale-client 4.0.76-preview → 4.0.77-preview

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Dec 30 14:38:17 CST 2024
+gradle.version=5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.0.76-preview",
+  "version": "4.0.77-preview",
   "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>
@@ -268,6 +272,8 @@
   </partial-view>
 </template>
 
+import { HttpResetClass } from 'vue-client'
+
 <script>
   /* 用户档案相关信息组件 */
   export default {
@@ -304,6 +310,7 @@
           f_table_state: 0
         },
         model: null,
+        f_arrears_fee: 0,
         showselectncuserfile: false,
         showSelectUserFee: false,
         showSelectUserGas: 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/ronghao/BatchCancellation.vue

@@ -109,7 +109,7 @@ export default {
   },
   props: ['useraccount'],
   async ready () {
-    await this.$getConfig(this, 'UserFiles')
+    await this.$getConfig(this, 'BatchCancellation')
     this.getAuditor()
     this.useraccount.forEach((item) => {
       if (item.f_user_state !== '销户') {

package/src/filiale/ronghao/PaymentCode.vue

@@ -110,25 +110,27 @@
           let times = 1
           this.timer = setInterval(async () => {
             times++
+            res.filiale = this.$login.f.dir
+            res.flag = 'microPayRongHaoJsbc'
             let res1 = await self.$resetpost('weixin2/rs/pay/microPayOrderStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
             this.paymentCodeReturnData = res1.data
             res1 = res1.data
             // 支付成功关闭定时器
-            if (res1.result_msg == '支付确认成功') {
+            if (res1.trade_state == '已支付') {
               self.paycoderesolve({msg: '支付完成', result: true})
               self.closeTimer()
               return
             }
-            if (res1.result_msg == '支付失败') {
+            if (res1.result_msg == '扣款失败') {
               this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
               this.closeTimer()
+              this.paymentCodeShow = false
               return
             }
             if (times > 24) {
               self.$showAlert(`多次查询未成功，请重新扫描用户付款码`, 'danger')
               self.closeTimer()
             }
-
           }, 5000)
         } else {
           this.$showAlert(`${res.result_msg}, 请重新扫描用户付款码`, 'danger')