sale-client 4.2.145 → 4.2.147

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Jun 12 13:59:43 CST 2025
-gradle.version=5.2.1
+#Mon Dec 22 09:49:15 GMT+08:00 2025
+gradle.version=8.8

package/package.json

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

package/src/filiale/meihekou/MeterOperatemain.vue

@@ -280,6 +280,11 @@ var data
     methods: {
       initoperator () {
         this.foperator = []
+        // If a department is selected, fetch operators for that department from server
+        if (this.model && this.model.f_depid) {
+          this.fetchOperatorsByDep(this.model.f_depid)
+          return
+        }
         console.log('this.$login', this.$login, this.oldmodel, this.$GetSaleParam.inputtors)
         let arr = this.$GetSaleParam.inputtors.filter((res) => {
           if (res.rolestr != null && res.rolestr !== '') {
@@ -290,6 +295,50 @@ var data
           this.foperator.push({label: res.name, value: res.id})
         })
       },
+      // Fetch operators by department id from server, fallback to local inputtors
+      fetchOperatorsByDep (depid) {
+        if (!depid) return
+        let http = new HttpResetClass()
+        http.load('POST', 'api/af-revenue/sql/saleSingleTable',
+          { data: {tablename: 't_user', condition: `parentid = '${depid}' or f_department_id = '${depid}'`}},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+            if (res.data && res.data.length > 0) {
+              this.foperator = []
+              res.data.forEach((row) => {
+                this.foperator.push({ label: row.name, value: row.id })
+              })
+              // keep current operator if present, else clear
+              if (this.model && this.model.f_operatorid) {
+                const exists = this.foperator.some(op => op.value === this.model.f_operatorid)
+                if (!exists) {
+                  this.model.f_operatorid = ''
+                  this.model.f_operator = ''
+                }
+              }
+            } else {
+              // fallback to local inputtors
+              this.foperator = []
+              if (this.$GetSaleParam && this.$GetSaleParam.inputtors) {
+                this.$GetSaleParam.inputtors.forEach((res) => {
+                  if (res.rolestr && res.rolestr.indexOf('营业员') > -1
+                    && (res.parentid === depid || res.f_department_id === depid)) {
+                    this.foperator.push({ label: res.name, value: res.id })
+                  }
+                })
+              }
+            }
+          }).catch(() => {
+            this.foperator = []
+            if (this.$GetSaleParam && this.$GetSaleParam.inputtors) {
+              this.$GetSaleParam.inputtors.forEach((res) => {
+                if (res.rolestr && res.rolestr.indexOf('营业员') > -1
+                  && (res.parentid === depid || res.f_department_id === depid)) {
+                  this.foperator.push({ label: res.name, value: res.id })
+                }
+              })
+            }
+          })
+      },
       initdep () {
         this.fdep = []
         // 确保 inputtors 已加载
@@ -363,6 +412,8 @@ var data
                 this.model.f_depid = ''
                 this.$showAlert('部门信息未找到', 'warning', 2000)
               }
+              // fetch operators for selected department
+              this.fetchOperatorsByDep(id)
             })
       },
       onDepSelect (resIds, labels) {
@@ -374,7 +425,12 @@ var data
           this.model.f_depid = ''
           this.model.f_depname = ''
         }
-        // 保持向后兼容：若需要继续使用原 selectdep 逻辑，可补充调用
+        // fetch operators for the newly selected department
+        if (this.model.f_depid) {
+          this.fetchOperatorsByDep(this.model.f_depid)
+        } else {
+          this.initoperator()
+        }
       },
       selectoperator () {
         let id = this.model.f_operatorid
@@ -426,8 +482,8 @@ var data
                 f_operatorid: this.$login.f.id,
                 f_orgid: this.$login.f.orgid,
                 f_orgname: this.$login.f.orgs,
-                f_depid: this.$login.f.depids,
-                f_depname: this.$login.f.deps
+                f_depid: this.model.f_depid,
+                f_depname: this.model.f_depname
               }
               this.recordList.push(car)
             }

package/src/filiale/meihekou/handAudit/MeterReadAudit.vue

@@ -22,16 +22,18 @@
               </v-select>
             </div>
             <div class="col-sm-2 form-group">
-              <label class="font_normal_body" title="表单抄表员">抄&ensp;表&ensp;员</label>
-              <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
+              <label class="font_normal_body" title="表单抄表员">审 核&ensp;员</label>
+<!--              <input type="text" style="width:60%" class="input_search" v-model="model.f_audit_person"-->
+<!--                     placeholder='审核员'-->
+<!--                     condition="f_audit_person = '{}'">-->
+              <v-select :value.sync="model.f_audit_person" v-model='model.f_audit_person'
                         style="width:60%"
                         multiple="true"
-                        condition="f_inputtor in {}"
-                        :options='$parent.$parent.inputtores' placeholder='抄表员'
+                        condition="f_audit_person in {}"
+                        :options='$parent.$parent.foperator' placeholder='审核员'
                         close-on-select
                         v-el:cc></v-select>
             </div>
-
             <div class="span" style="float:right;">
               <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
               <button class="button_search button_spacing width-60"
@@ -205,11 +207,14 @@
 }
 </style>
 <script>
-import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from "vue";
 
 let readyGen = async function (self) {
   await self.$LoadParams.loadMeterBook(self.f_filialeid)
+  await self.$GetSaleParam.initinputtor()
   self.loadMeterBooks()
+  self.loadAllOperator()
   self.getfield = self.config.excelHeaders
   self.reflash()
 }
@@ -225,6 +230,7 @@ export default {
       },
       orgCondtionStr: '',
       criteriaShow: false,
+      foperator: [{label: '全部', value: ''}],
       show: false,
       pushdata: {openid: '', cause: ''},
       row: null,
@@ -260,6 +266,10 @@ export default {
     loadMeterBooks () {
       this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
     },
+    loadAllOperator () {
+      const orgid = this.$login && this.$login.f && this.$login.f.orgid
+      this.foperator = [...this.foperator, ...this.$GetSaleParam.getSaleMan(orgid)]
+    },
     getRes (obj) {
       this.orgCondtionStr = obj
     },
@@ -390,6 +400,22 @@ export default {
       }
       this.inputtores2 = rs
       return [...rs]
+    },
+    audit_person () {
+      // 获取抄表员
+      console.log('获取抄表员', this.$login.f)
+      let rs = []
+      if (this.$login.f.f_gasman.length > 0) {
+        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+          let temp = {
+            label: this.$login.f.f_gasman[i].name,
+            value: this.$login.f.f_gasman[i].name
+          }
+          rs.push(temp)
+        }
+      }
+      this.inputtores2 = rs
+      return [...rs]
     }
   }
 }

package/src/filiale/meihekou/replacementSingleInfoOperation.vue

@@ -201,6 +201,11 @@
     methods: {
       initoperator(){
         this.foperator=[]
+        // If a department is selected, fetch operators from server for that department
+        if (this.model && this.model.f_depid) {
+          this.fetchOperatorsByDep(this.model.f_depid)
+          return
+        }
         console.log("this.$login-------------------------",this.$login,this.oldmodel,this.model)
         let arr = this.$GetSaleParam.inputtors.filter((res) => {
           if (res.rolestr != null && res.rolestr != '') {
@@ -218,6 +223,51 @@
           }
         }
       },
+      // Fetch operators from server by department id, fallback to local inputtors
+      fetchOperatorsByDep (depid) {
+        if (!depid) return
+        let http = new HttpResetClass()
+        http.load('POST', 'api/af-revenue/sql/saleSingleTable',
+          {data:{tablename: 't_user',
+              condition: `parentid = '${depid}' or f_department_id = '${depid}'`}},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+          if (res.data && res.data.length > 0) {
+            this.foperator = []
+            res.data.forEach((row) => {
+              this.foperator.push({label: row.name, value: row.id})
+            })
+            // ensure current operator id presence
+            if (this.model && this.model.f_operatorid) {
+              const exists = this.foperator.some(op => op.value === this.model.f_operatorid)
+              if (!exists) {
+                this.model.f_operatorid = ''
+                this.model.f_operator = ''
+              }
+            }
+          } else {
+            // fallback to local
+            this.foperator = []
+            if (this.$GetSaleParam && this.$GetSaleParam.inputtors) {
+              this.$GetSaleParam.inputtors.forEach((res) => {
+                if (res.rolestr && res.rolestr.indexOf('营业员') > -1
+                  && (res.parentid === depid || res.f_department_id === depid)) {
+                  this.foperator.push({label: res.name, value: res.id})
+                }
+              })
+            }
+          }
+        }).catch(() => {
+          this.foperator = []
+          if (this.$GetSaleParam && this.$GetSaleParam.inputtors) {
+            this.$GetSaleParam.inputtors.forEach((res) => {
+              if (res.rolestr && res.rolestr.indexOf('营业员') > -1
+                && (res.parentid === depid || res.f_department_id === depid)) {
+                this.foperator.push({label: res.name, value: res.id})
+              }
+            })
+          }
+        })
+      },
       initdep () {
         this.fdep = []
         if (!this.$GetSaleParam || !this.$GetSaleParam.inputtors) {

package/src/filiale/ronghao/PaymentCode.vue

@@ -36,7 +36,7 @@
     },
     data () {
       return {
-        ip:null,
+        ip: null,
         // 付款码弹框显示
         paymentCodeShow: false,
         // 付款码值
@@ -76,7 +76,6 @@
           this.$els.paycode.focus()
         })
       },
-      // 付款码支付流程
       async ConfirmCode () {
         // 付款码支付之前取本机mac号对应的柜台号进行下单
         let equipment = await this.$resetpost('api/af-system/sql/equipmentQuery',
@@ -121,56 +120,74 @@
         res.f_payment = Array.isArray(this.payment) ? this.payment[0] : this.payment
         res.f_orgname = this.$login.f.orgs
         if (res.result_msg == '支付确认成功') {
+          if (!this.paymentCodeReturnData) this.paymentCodeReturnData = {f_out_trade_no: ''}
           this.paycoderesolve({msg: '支付完成', result: true})
           this.$closeAlert()
         } else if (res.result_msg == '支付确认未知' || res.result_msg == '支付结果未知') {
           // 支付结果未知, 根据商户订单号继续查询
           this.$showAlert(`正在查询用户付款状态,请勿进行任何操作,耐心等待,如长时间未响应可手动取消`, 'warning')
-          let self = this
+          const self = this
           // 启动定时器之前先关闭定时器,防止之前的定时器未关闭
-          if (this.timer) {
-            this.closeTimer()
+          if (self.timer) {
+            self.closeTimer()
           }
           let times = 1
-          this.timer = setInterval(async () => {
-            times++
-            if (this.$login.f.dir !== 'tianchang') {
-              res.filiale = this.$login.f.dir
-              res.flag = 'microPayRongHaoJsbc'
-            }
-            let res1 = await self.$resetpost(this.$login.f.dir === 'tianchang' ? 'api/af-revenue/logic/WeiXinPayStatus' : 'weixin2/rs/pay/microPayOrderStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
-            console.log('self.paymentCodeReturnData', self.paymentCodeReturnData)
-            self.paymentCodeReturnData = res1.data
-            res1 = res1.data
-            // 支付成功关闭定时器
-            if (this.$login.f.dir === 'tianchang') {
-              if (res1.result_msg == '支付确认成功') {
-                self.paymentCodeReturnData.f_out_trade_no = res1.transactionId
-                self.paycoderesolve({msg: '支付完成', result: true})
-                self.closeTimer()
-                return
-              }
-              if (res1.result_msg == '支付失败') {
-                self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
-                self.closeTimer()
-                return
+          self.timer = setInterval(async () => {
+            try {
+              times++
+              if (self.$login.f.dir !== 'tianchang') {
+                res.filiale = self.$login.f.dir
+                res.flag = 'microPayRongHaoJsbc'
               }
-            } else {
-              if (res1.trade_state == '已支付') {
-                self.paycoderesolve({msg: '支付完成', result: true})
-                self.closeTimer()
-                return
+              let res1 = await self.$resetpost(self.$login.f.dir === 'tianchang' ? 'api/af-revenue/logic/WeiXinPayStatus' : 'weixin2/rs/pay/microPayOrderStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
+              console.log('self.paymentCodeReturnData', self.paymentCodeReturnData)
+              const res1Data = res1.data || {}
+              self.paymentCodeReturnData = res1Data
+              res1 = res1Data
+              // 支付成功关闭定时器
+              if (self.$login.f.dir === 'tianchang') {
+                if (res1.result_msg == '支付确认成功') {
+                  // 新增：确保对象存在+多层兜底赋值
+                  if (!self.paymentCodeReturnData) self.paymentCodeReturnData = {f_out_trade_no: ''}
+                  self.paymentCodeReturnData.f_out_trade_no = res1.transactionId
+                  if (!self.paymentCodeReturnData.f_out_trade_no) {
+                    self.$showAlert(`流水号校验失败，请重新扫描付款码完成付款。如上一笔订单已完成扣款操作，系统将在5分钟内自动发起退款`, 'danger', 500)
+                    self.closeTimer()
+                    self.paymentCodeShow = false
+                    return
+                  }
+                  self.paycoderesolve({msg: '支付完成', result: true})
+                  self.closeTimer()
+                  return
+                }
+                if (res1.result_msg == '支付失败') {
+                  self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
+                  self.closeTimer()
+                  return
+                }
+              } else {
+                if (res1.trade_state == '已支付') {
+                  self.paycoderesolve({msg: '支付完成', result: true})
+                  self.closeTimer()
+                  return
+                }
+                if (res1.result_msg == '扣款失败') {
+                  self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
+                  self.closeTimer()
+                  self.paymentCodeShow = false
+                  return
+                }
               }
-              if (res1.result_msg == '扣款失败') {
-                self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
+              if (times > 24) {
+                self.$showAlert(`多次查询未成功，请重新扫描用户付款码`, 'danger')
                 self.closeTimer()
-                self.paymentCodeShow = false
-                return
               }
-            }
-            if (times > 24) {
-              self.$showAlert(`多次查询未成功，请重新扫描用户付款码`, 'danger')
+            } catch (e) {
+              // 新增：异常捕获，关闭定时器并提示
+              console.error('定时器执行异常', e)
+              self.$showAlert(`支付查询异常，请重新操作`, 'danger')
               self.closeTimer()
+              self.paymentCodeShow = false
             }
           }, 9000)
         } else {
@@ -189,9 +206,10 @@
       },
       // 关闭定时器
       closeTimer () {
-        console.log('关闭定时器')
-        clearInterval(this.timer)
-        this.timer = null
+        if (this.timer) {
+          clearInterval(this.timer)
+          this.timer = null
+        }
       },
       closeCode () {
         this.$showMessage('取消后无法继续收款,确定取消吗?', ['confirm', 'cancel']).then((res) => {