sale-client 4.2.28 → 4.2.29

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Sep 01 09:14:45 CST 2025
-gradle.version=8.10
+#Thu Sep 04 15:35:12 CST 2025
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://123.57.3.66:31467/', 'http://127.0.0.1:9026/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -25,18 +25,12 @@ var devConfig = {
     //   },
     //   target: localUrl
     // },
-      '/api/af-revenue/logic/batchModifyAdjustables': {
-        pathRewrite: {
-          '/api/af-revenue/logic': '/singlepage/rs/logic'
-        },
-        target: localUrl
-      },
-      '/api/af-revenue/logic': {
-        pathRewrite: {
-          '/api/af-revenue/logic': '/singlepage/rs/logic'
-        },
-        target: serverRul
-      },
+    //   '/api/af-revenue/logic': {
+    //     pathRewrite: {
+    //       '/api/af-revenue/logic': '/logic'
+    //     },
+    //     target: localUrl
+    //   },
       // '/api/af-revenue/file': {
       //   // pathRewrite: {
       //   //   '/api/af-revenue/file': '/file'
@@ -47,18 +41,18 @@ var devConfig = {
       //
       //   target: 'http://410663id1ia4.vicp.fun'
       // },
-      '/api/af-revenue/sql': {
-        pathRewrite: {
-          '/api/af-revenue/sql': '/singlepage/rs/sql'
-        },
-        target: serverRul
-      },
+      // '/api/af-revenue/sql': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/sql': '/sql'
+      //   },
+      //   target: localUrl
+      // },
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
       '/api/af-revenue': {
         pathRewrite: {
-          '/api/af-revenue': '/singlepage/rs'
+          '/api/af-revenue': '/af-revenue'
         },
         target: "http://localhost:8080"
       },

package/package.json

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

package/src/filiale/dexin/PaymentCode.vue

@@ -0,0 +1,179 @@
+<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>
+    <work-busy :is-busy="busy"></work-busy>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'PaymentCode',
+    props: {
+      // 付款方式
+      payment: {},
+      // 业务类型
+      type: {},
+      // 用户信息
+      row: {},
+      // 付款金额
+      money: {}
+    },
+    data () {
+      return {
+        // 付款码弹框显示
+        paymentCodeShow: false,
+        busy: 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_orgname: this.$login.f.orgs,
+          f_depname:this.$login.f.deps,
+          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[0],
+          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('api/af-revenue/logic/WeiXinPay', data, {resolveMsg: null, rejectMsg: '服务器内部出错,'})
+        res.data.f_payment = this.payment[0]
+        res.data.f_orgname = this.$login.f.orgs
+        res.data.auth_code = this.paymentCode
+        res.data.f_depname = this.$login.f.deps
+        this.paymentCodeReturnData = res = res.data
+        if (res.result_msg == '支付确认成功') {
+          this.paycoderesolve({msg: '支付完成', result: true})
+          this.$closeAlert()
+          this.busy = false
+        } else if (res.result_msg == '支付结果未知') {
+          // 支付结果未知, 根据商户订单号继续查询
+          this.$showAlert(`正在查询用户付款状态,请勿进行任何操作,耐心等待`, 'warning')
+          this.busy = true
+          console.log(window.document.getElementById('bodymain'))
+          let self = this
+          // 启动定时器之前先关闭定时器,防止之前的定时器未关闭
+          if (this.timer) {
+            this.closeTimer()
+          }
+          let times = 1
+          this.timer = setInterval(async () => {
+            times++
+            let res1 = await self.$resetpost('api/af-revenue/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 > 12) {
+              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.transactionId}' where id = '${this.sellinggasId}'`
+          await this.$resetpost('api/af-revenue/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '更新收费记录订单号失败'})
+        }
+      },
+      // 关闭定时器
+      closeTimer () {
+        console.log('关闭定时器')
+        this.busy = false
+        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/dexin/sale.js

@@ -22,4 +22,6 @@ export default function () {
   // 用户基本信息test
   Vue.component('file-user-essential-info', (resolve) => { require(['./UserEssentialInfoTest'], resolve) })
   Vue.component('cards-hand', (resolve) => { require(['./cardsHand'], resolve) })
+  // 扫码支付
+  Vue.component('payment-code', (resolve) => { require(['./PaymentCode.vue'], resolve) })
 }

package/src/filiale/qingjian/FileUserFiles.vue

@@ -87,9 +87,6 @@
                             v-if="$parent.$parent.rows && $parent.$parent.rows.length === 1 && $parent.$parent.rows[0].f_user_state === '销户'">
                       启用
                     </button>
-                    <button @click="$parent.$parent.openBatchModal()" class="button_clear button_spacing"
-                            style="float: right">批量修改调压箱
-                    </button>
                     <div
                             :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                             @click="$parent.$parent.hidden()"
@@ -305,7 +302,7 @@
                 </div>
               </div>
             </criteria>
-            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list' optional>
+            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
               <template partial='head'>
                 <tr>
                   <th>
@@ -478,20 +475,6 @@
         <button class="button_search button_spacing" type="button" @click="close2()">取消</button>
       </footer>
     </modal>
-    <modal :show.sync="showModifyAdjustables" width="500px" title="批量修改调压箱"  large backdrop="false">
-      <article slot="modal-body" class="modal-body" style="height: 70px">
-        <label class="font_normal_body">调&ensp;压&ensp;箱</label>
-        <v-select :options='adjustablesNew' :search='true'
-                  :value.sync="f_adjustable_id"
-                  close-on-select
-                  placeholder='调压箱'
-                  v-model='f_adjustable_id'></v-select>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button class="button_search button_spacing" :disabled="!f_adjustable_id || f_adjustable_id.length < 1 " type="button" @click="batchModifyAdjustables()">确认</button>
-        <button class="button_search button_spacing" type="button" @click="closeBatchAdjustables()">取消</button>
-      </footer>
-    </modal>
     <!--<user-flow-sheet :show="printflag" :bill-config='configs' :bill-data='billData' :data='newdata' v-on:toggle="close" @printok="printok" v-ref:printbill></user-flow-sheet>-->
 
     <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
@@ -587,8 +570,7 @@ let loadParamGem = async function (self) {
         xiaohushow: false,
         inputtores: this.$appdata.getParam('抄表员'),
         adjustables: [],
-        adjustablesNew: [],
-        f_adjustable_id: '',
+
         // 导入组件
         show: false,
 
@@ -620,7 +602,6 @@ let loadParamGem = async function (self) {
         showselectaddress: false,
         isedit: false,
         clientWidth: document.body.clientWidth,
-        showModifyAdjustables: false,
         batchMeterShow: false,
         billData: {
           url: 'api/af-revenue/report/userignition',
@@ -654,35 +635,6 @@ let loadParamGem = async function (self) {
       }
   },
     methods: {
-      openBatchModal () {
-        let rowdata = this.$refs.paged.$refs.grid.getRowData()
-        if (rowdata.length <= 0) {
-          this.$showMessage('请至少选择一个表具!')
-          return
-        }
-        this.showModifyAdjustables = true
-      },
-      async batchModifyAdjustables() {
-        let rowdata = this.$refs.paged.$refs.grid.getRowData()
-        let userfilesIds = rowdata.map(item => item.f_userfiles_id);
-        console.log('已选择的数据', userfilesIds)
-        console.log('已选择的调压箱', this.f_adjustable_id)
-        let model = {
-          f_adjustable_id: this.f_adjustable_id,
-          f_userfiles_ids: userfilesIds
-        }
-        await this.$resetpost('api/af-revenue/logic/batchModifyAdjustables', model, {
-          resolveMsg: null,
-          rejectMsg: '批量修改调压箱失败'
-        }).then((res) => {
-          if (res && res.data) {
-            this.$showMessage(`本次批量修改:  ${res.data}户`);
-          }
-          this.closeBatchAdjustables()
-          this.selfSearch()
-        })
-
-      },
       getAuthority () {
         if (this.$login.r.find(value => value == '销户导入')) {
           this.bacthPin = '销户导入'
@@ -808,9 +760,6 @@ let loadParamGem = async function (self) {
       closexiaohu () {
         this.xiaohushow = false
       },
-      closeBatchAdjustables () {
-        this.showModifyAdjustables = false
-      },
       xiaohu () {
         this.xiaohushow = true
       },
@@ -872,7 +821,6 @@ let loadParamGem = async function (self) {
         this.model.rows.unshift(data)
       },
       selfSearch (args) {
-        this.$refs.paged.$refs.grid.selectInit()
         args.condition = `${args.condition} ` + this.orgcondition
         this.criteriaShow = false
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
@@ -926,7 +874,6 @@ let loadParamGem = async function (self) {
           arr.push(temp)
         })
         this.adjustables = [{label: '全部', value: ''}, ...arr]
-        this.adjustablesNew = arr
           // 初始化气表品牌
         let brandArr = []
         this.$GetSaleParam.getGasbrand().forEach((item) => {

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/qingjian/sale'
+import FilialeSale from './filiale/yuncheng/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.npmignore

@@ -1,12 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/
-examples/
-gradle/
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-lib/**/lib

package/src/.npmignore

@@ -1 +0,0 @@
-