sale-client 3.6.480 → 3.6.481

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Jul 08 09:48:59 CST 2024
+#Wed Jan 22 10:06:39 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/filiale/qianneng/OtherChargeNew.vue

@@ -346,6 +346,7 @@
       }
     },
     methods: {
+
       setTypeprice (val, row) {
         console.log('f_typenumber', this.f_typenumber)
         if (this.f_typenumber !== ' ') {
@@ -398,6 +399,21 @@
         await this.$resetpost('rs/logic/sale_othercharge_logic_nopay', data, {resolveMsg: '生成其他欠费成功', rejectMsg: '生成其他欠费失败'})
         this.$dispatch('success')
       },
+      getBusinessData () {
+        if (this.model.f_print[0] === '电子发票') {
+          if (!this.row.f_taxpayer_id) {
+            this.row.f_taxpayer_id = this.row.f_idnumber
+          }
+          if (!this.row.f_paper_name) {
+            this.row.f_paper_name = this.row.f_user_name
+          }
+          if (!this.row.f_address_phone) {
+            this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+          }
+          this.eticket_msg = true
+        }
+        return this.$LogicService.otherChargeData(this.model, this.row)
+      },
       // 校验发票信息
       checkInvoiceMsg () {
         if (this.model.f_print[0] === '电子发票') {

package/src/filiale/qianneng/PaymentCode.vue

@@ -0,0 +1,167 @@
+<template>
+  <div id='PaymentCode'>
+    <modal :show.sync="paymentCodeShow" backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">请扫描用户付款码</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-horizontal">
+          <div class="form-group">
+            <input type="text" class="form-control" id="paycode" @keyup.enter="ConfirmCode" @blur="paycodefocus"
+                   v-model="paymentCode" placeholder="请扫描用户付款码" v-el:paycode>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='closeCode'>取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'PaymentCode',
+    props: {
+      // 付款方式
+      payment: {},
+      // 业务类型
+      type: {},
+      // 用户信息
+      row: {},
+      // 付款金额
+      money: {}
+    },
+    data () {
+      return {
+        // 付款码弹框显示
+        paymentCodeShow: false,
+        // 付款码值
+        paymentCode: null,
+        // 付款码流程控制
+        paycoderesolve: null,
+        // 付款码返回数据
+        paymentCodeReturnData: {},
+        // 定时器
+        timer: null,
+        // 收费成功id
+        sellinggasId: null,
+        canPayment: this.$appdata.getSingleValue('微信支付付款方式') ? this.$appdata.getSingleValue('微信支付付款方式') : '',
+      }
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+      // 返回结果为true意味着可以通行
+      flowPath () {
+        return new Promise((resolve) => {
+          this.paycoderesolve = resolve
+          // 如果是付款码支付则显示界面扫用户付款码收钱
+          if (this.canPayment.indexOf(this.payment.toString()) !== -1 || this.payment.toString().indexOf('&') !== -1) {
+            this.paymentCodeShow = true
+            this.paycodefocus()
+          } else {
+            this.paycoderesolve({msg: '不是付款码支付', result: true})
+          }
+        })
+      },
+      // 付款码框获得焦点
+      paycodefocus () {
+        this.$nextTick(() => {
+          this.$els.paycode.focus()
+        })
+      },
+      // 付款码支付流程
+      async ConfirmCode () {
+        // 扫完一次码之后失去焦点，避免重复扫码
+        this.paymentCodeShow = false
+        let data = {
+          f_userinfo_id: this.row ? this.row.f_userinfo_id : null,
+          type: this.type ? this.type : '燃气费',
+          f_operatorid: this.$login.f.id,
+          f_operator: this.$login.f.name,
+          f_user_id: this.row ? this.row.f_user_id : null,
+          f_userfiles_id: this.row ? this.row.f_userfiles_id : null,
+          money: this.money,
+          f_payment: this.payment,
+          auth_code: this.paymentCode,
+          filiale: this.$login.f.orgid,
+          body: this.$login.f.orgs
+        }
+        if (this.type === '其他收费') {
+          data.f_details = this.$parent.getBusinessData()
+        }
+        let res = await this.$resetpost('rs/logic/WeiXinPay', data, {resolveMsg: null, rejectMsg: '服务器内部出错,'})
+        this.paymentCodeReturnData = res = res.data
+        if (res.result_msg == '支付确认成功') {
+          this.paycoderesolve({msg: '支付完成', result: true})
+          this.$closeAlert()
+        } else if (res.result_msg == '支付结果未知') {
+          // 支付结果未知, 根据商户订单号继续查询
+          this.$showAlert(`正在查询用户付款状态,请勿进行任何操作,耐心等待,如长时间未响应可手动取消`, 'warning')
+          let self = this
+          // 启动定时器之前先关闭定时器,防止之前的定时器未关闭
+          if (this.timer) {
+            this.closeTimer()
+          }
+          let times = 1
+          this.timer = setInterval(async () => {
+            times++
+            let res1 = await self.$resetpost('rs/logic/WeiXinPayStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
+            this.paymentCodeReturnData = res1.data
+            res1 = res1.data
+            // 支付成功关闭定时器
+            if (res1.result_msg == '支付确认成功') {
+              self.paycoderesolve({msg: '支付完成', result: true})
+              self.closeTimer()
+              return
+            }
+            if (res1.result_msg == '支付失败') {
+              this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
+              this.closeTimer()
+              return
+            }
+            if (times > 24) {
+              self.$showAlert(`多次查询未成功，请重新扫描用户付款码`, 'danger')
+              self.closeTimer()
+            }
+
+          }, 5000)
+        } else {
+          this.$showAlert(`${res.result_msg}, 请重新扫描用户付款码`, 'danger')
+        }
+        // 清空付款码
+        this.paymentCode = ''
+      },
+      // 付款成功更新收费记录订单号
+      async updateSellinggas () {
+        if (this.payment.toString().indexOf('&') !== -1) {
+          let sqldata = `update t_sellinggas set f_serial_id = '${this.paymentCodeReturnData.f_out_trade_no}' where id = '${this.sellinggasId}'`
+          await this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '更新收费记录订单号失败'})
+        }
+      },
+      // 关闭定时器
+      closeTimer () {
+        console.log('关闭定时器')
+        clearInterval(this.timer)
+        this.timer = null
+      },
+      closeCode () {
+        this.$showMessage('取消后无法继续收款,确定取消吗?', ['confirm', 'cancel']).then((res) => {
+          if (res == 'confirm') {
+            this.paymentCodeShow = false
+            this.$closeAlert()
+            this.paycoderesolve({msg: '支付取消', result: false})
+            this.closeTimer()
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/filiale/qianneng/sale.js

@@ -117,4 +117,6 @@ export default function () {
   Vue.component('message-report', (resolve) => { require(['./revenue/sms/MessageReport.vue'], resolve) })
   // 账单推送
   Vue.component('account-message-list', (resolve) => { require(['./revenue/sms/AccountMessageList.vue'], resolve) })
+  // 付款码支付
+  Vue.component('payment-code', (resolve) => { require(['./PaymentCode.vue'], resolve) })
 }

package/src/plugins/LogicService.js

@@ -99,10 +99,10 @@ let LogicService = {
       f_serial_number: model.f_serial_number,
       f_userfiles_id: row.f_userfiles_id,
       f_user_id: row.f_user_id,
-      f_user_name:row.f_user_name,
-      f_address:row.f_address,
-      f_user_type:row.f_user_type,
-      f_gasproperties:row.f_gasproperties,
+      f_user_name: row.f_user_name,
+      f_address: row.f_address,
+      f_user_type: row.f_user_type,
+      f_gasproperties: row.f_gasproperties,
       // f_number: model.f_number,
       // f_unitprice: model.f_unitprice,
       f_collection: model.f_collection,
@@ -132,6 +132,47 @@ let LogicService = {
     }
     return Vue.resetpost('rs/logic/sale_othercharge_logic', data, {resolveMsg: '其他收费成功', rejectMsg: '其他收费失败'})
   },
+  otherChargeData (model, row) {
+    let data = {
+      f_time_date: model.f_time_date,
+      f_serial_id: model.f_serial_id,
+      record_userinfo: row.f_userinfo_id,
+      f_serial_number: model.f_serial_number,
+      f_userfiles_id: row.f_userfiles_id,
+      f_user_id: row.f_user_id,
+      f_user_name: row.f_user_name,
+      f_address: row.f_address,
+      f_user_type: row.f_user_type,
+      f_gasproperties: row.f_gasproperties,
+      // f_number: model.f_number,
+      // f_unitprice: model.f_unitprice,
+      f_collection: model.f_collection,
+      f_comments: model.f_comments,
+      f_payment: model.f_payment[0],
+      f_voucher_number: model.f_voucher_number,
+      f_bill_style: model.f_print[0],
+      // f_brand_spec: model.f_brand_spec[0],
+      f_userinfo_id: row.f_userinfo_id,
+      f_service_person: model.f_service_person[0],
+      f_operat_type: '其他收费',
+      f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行其他收费操作`,
+      f_state: '有效',
+      f_operator: Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_zoneid: Vue.$login.f.zoneid,
+      f_zones: Vue.$login.f.zones,
+      // 其他费用信息
+      t_userfees: model.t_userfees,
+      f_fee_type: model.f_fee_type[0],
+      f_fee_time: model.f_fee_time[0],
+      otherdetail: model.otherdetail
+    }
+    return data
+  },
   otherChargeByPay (model, row) {
     let data = {
       f_serial_id: model.f_serial_id,