sale-client 4.2.174 → 4.2.175

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Jan 05 11:37:36 CST 2026
+gradle.version=5.2.1

package/package.json

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

package/src/components/charge/business/CardMeterCenter.vue

@@ -152,8 +152,8 @@
             </div>
           </div>
 
-          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')">
-            <div class="col-sm-4">
+          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')|| hasDisCount">
+            <div class="col-sm-4" v-if="!hasDisCount">
               <label class="font_normal_body">优惠方式</label>
               <v-select v-model="model.f_privilege_id" @blur.native.capture="privilegeCalculate"
                         placeholder='请选择'
@@ -466,6 +466,7 @@
     }
     let getLimit = await self.$resetpost('api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {
       resolveMsg: null,
+      newly: true,
       rejectMsg: '获取限购值失败！！'
     })
     console.log('获取限购值', getLimit)
@@ -516,6 +517,18 @@
         }
       })
     }
+    // 获取优惠信息
+    if (self.config.newDiscount) {
+      let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+        resolveMsg: null,
+        newly: true,
+        rejectMsg: '获取优惠信息失败！！'
+      })
+      if (getDiscount.data.leftDiscount > 0) {
+        self.disCountInfo = getDiscount.data
+        self.hasDisCount = true
+      }
+    }
   }
   export default {
     title: '卡表收费',
@@ -524,12 +537,15 @@
         mjshow: false,
         serialShow: false,
         randomBusinessId: '',
+        hasDisCount: false,
+        disCountInfo: {},
         resid: [],  // 存放新增的f_files表中id
         config: {
           calculatePreByCollection: false, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
           quickSale: false,
+          newDiscount: false, // 新优惠
           showupload: true, // 显示上传
           hasPrint: true,  // 默认打票
           MinSellGas: 0,
@@ -561,6 +577,7 @@
           f_banktransfer_person: '',
           f_banktransfer_date: '',
           f_privilege_id: 0,
+          f_privilege_gas: 0,
           f_privilege_money: 0,
           f_after_discount: 0,
           getDeduct: 0
@@ -705,8 +722,8 @@
           this.model.getDeduct = 0
           if (this.row.f_project_money && this.row.f_project_money > 0) {
             this.model.getDeduct = (this.$CommonService.getDeduct(this.row, this.model.f_pregas) - 0)
-            this.model.f_totalcost = (this.model.f_totalcost - 0 ) + (this.model.getDeduct- 0 )
-            this.model.f_collection = (this.model.f_collection - 0 ) + (this.model.getDeduct- 0 )
+            this.model.f_totalcost = (this.model.f_totalcost - 0) + (this.model.getDeduct - 0)
+            this.model.f_collection = (this.model.f_collection - 0) + (this.model.getDeduct - 0)
           }
           this.calText(dymoney2.data.chargeprice, this.model.getDeduct)
         } catch (error) {
@@ -899,6 +916,23 @@
           }
           this.privilegeCalculate()
         }
+        if (this.hasDisCount) {
+          this.calDisCount()
+        }
+      },
+      async calDisCount () {
+        // 初始化减免金额
+        this.model.f_privilege_money = 0
+        this.model.f_after_discount = this.model.f_collection
+        let param = this.disCountInfo
+        param.f_collection = this.model.f_collection
+        param.f_pregas = this.model.f_pregas
+        let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+        // 减免金额
+        this.model.f_privilege_money = privilegeData.data.f_privilege_money
+        this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+        // 减免后收款金额
+        this.model.f_after_discount = privilegeData.data.f_collection
       },
       // 优惠计算
       async privilegeCalculate () {

package/src/components/charge/business/NoCardMeterCenter.vue

@@ -128,6 +128,26 @@
               <span v-if="$v.f_collection.dctest" style="color:red ">收款不能小于应收金额</span>
             </div>
           </div>
+          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')|| hasDisCount">
+            <div class="col-sm-4" v-if="!hasDisCount">
+              <label class="font_normal_body">优惠方式</label>
+              <v-select v-model="model.f_privilege_id" @blur.native.capture="privilegeCalculate"
+                        placeholder='请选择'
+                        :value.sync="model.f_privilege_id"
+                        :options='privilegeList' clear-button value-single>
+              </v-select>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">&nbsp;优惠金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_privilege_money"
+                     v-scale="[model.f_privilege_money, row.f_fee_decimal||4]" placeholder="优惠金额" disabled>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">&nbsp;实际收款</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_after_discount"
+                     v-scale="[model.f_after_discount, row.f_fee_decimal||4]" placeholder="优惠后收款" disabled>
+            </div>
+          </div>
           <div class="row" v-if="model.f_payment[0].includes('POS')">
             <div class="col-sm-4">
               <label for="f_voucher_number" class="font_normal_body">凭证号</label>
@@ -159,18 +179,19 @@
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
       </validator>
-      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
+      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
       <upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="无卡收费"></upload>
     </div>
   </div>
 </template>
 <script>
-  /**
+/**
    *综合业务
    *卡表收费组件
-   */
+ */
+  import {HttpResetClass} from 'vue-client'
 
-    // 输入金额，换算气量
+  // 输入金额，换算气量
   let preamountGen = async function (self) {
     let dymoney = 0
     let calFee = (self.model.f_totalcost - 0) + (self.row.f_balance - 0)
@@ -194,8 +215,8 @@
     Object.assign(self.model, self.model, getGas.data)
     self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-    if(self.config.floor){
-      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    if (self.config.floor) {
+      self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
     }
     self.calText(getGas.data.chargeprice)
   }
@@ -215,8 +236,8 @@
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       self.model.f_collection = self.model.f_totalcost
-      if(self.config.floor){
-        self.model.f_collection=Math.ceil(self.model.f_collection)
+      if (self.config.floor) {
+        self.model.f_collection = Math.ceil(self.model.f_collection)
       }
       self.calText(getAmount.data.chargeprice)
     }
@@ -294,7 +315,7 @@
       f_user_id: self.row.f_user_id,
       f_stairprice_id: self.row.f_stairprice_id
     }
-    let getLimit = await self.$resetpost('api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {resolveMsg: null, rejectMsg: '获取限购值失败！！'})
+    let getLimit = await self.$resetpost('api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {resolveMsg: null, newly: true, rejectMsg: '获取限购值失败！！'})
     console.log('获取限购值', getLimit)
     self.hasLimit = getLimit.data.hasLimit
     if (self.hasLimit) {
@@ -314,6 +335,21 @@
         }
       }
     }
+    // 获取优惠信息
+    if (self.config.newDiscount) {
+      let nowrite_param = {
+        f_userfiles_id: self.row.f_userfiles_id
+      }
+      let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+        resolveMsg: null,
+        newly: true,
+        rejectMsg: '获取优惠信息失败！！'
+      })
+      if (getDiscount.data.leftDiscount > 0) {
+        self.disCountInfo = getDiscount.data
+        self.hasDisCount = true
+      }
+    }
   }
   export default {
     title: '无卡收费',
@@ -321,10 +357,13 @@
       return {
         serialShow: false,
         resid: [],  // 存放新增的f_files表中id
+        hasDisCount: false,
+        disCountInfo: {},
         config: {
           calculatePreByCollection: false, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           hasPrint: true,  // 默认打票
+          newDiscount: false,
           hasBillManage: false,  // 默认不启用发票管理
           floor: false,  // 是否取整收费
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -340,6 +379,11 @@
           f_preamount: 0,
           f_totalcost: 0,
           f_curbalance: 0,
+          f_privilege_id: 0,
+          f_privilege_gas: 0,
+          f_privilege_money: 0,
+          f_after_discount: 0,
+          getDeduct: 0,
           f_collection: '',
           f_balance: 0,
           f_print: [],
@@ -363,7 +407,7 @@
         // 下拉框值
         paytype: this.$appdata.getParam('付款方式'),
         printstyle: this.$appdata.getParam('打印格式'),
-        writecard: [{label: '写卡',value:'写卡'},{label: '不写卡',value:'不写卡'}],
+        writecard: [{label: '写卡', value: '写卡'}, {label: '不写卡', value: '不写卡'}],
         mjshow: false
       }
     },
@@ -443,6 +487,86 @@
           }
         })
       },
+      // 根据选择的付款方式 获取优惠列表
+      async getPrivilegeList () {
+        // 初始化下拉选择列表
+        this.privilegeList = [{label: '无优惠', value: '0'}]
+        // 初始为无优惠
+        this.model.f_privilege_id = '0'
+        if (this.model.f_payment && this.model.f_payment.length) {
+          // 查询条件
+          let payments = JSON.stringify(this.model.f_payment)
+          payments = payments.replace('[', '(').replace(']', ')').replace(/"/g, '\'')
+          let HttpReset = new HttpResetClass()
+          let privilege = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+            data: {
+              items: 'id,f_privilege_name,f_privilege_type',
+              tablename: 't_privilege',
+              condition: `f_payment in ${payments} and f_gasproperties = '${this.row.f_gasproperties}' and f_user_type = '${this.row.f_user_type}' and f_perform_date <= GETDATE() and f_end_date >= GETDATE() and f_state = '有效'`,
+              orderitem: 'id'
+            }
+          }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
+          // 查询结果放到下拉列表
+          for (let p of privilege.data) {
+            this.privilegeList.push({label: p.f_privilege_name, value: p.id, type: p.f_privilege_type})
+          }
+          this.privilegeCalculate()
+        }
+        if (this.hasDisCount) {
+          this.calDisCount()
+        }
+      },
+      async calDisCount () {
+        // 初始化减免金额
+        this.model.f_privilege_money = 0
+        this.model.f_after_discount = this.model.f_collection
+        let param = this.disCountInfo
+        param.f_collection = this.model.f_collection
+        param.f_pregas = this.model.f_pregas
+        let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+        // 减免金额
+        this.model.f_privilege_money = privilegeData.data.f_privilege_money
+        this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+        // 减免后收款金额
+        this.model.f_after_discount = privilegeData.data.f_collection
+      },
+      // 优惠计算
+      async privilegeCalculate () {
+        // 初始化减免金额
+        this.model.f_privilege_money = 0
+        this.model.f_after_discount = this.model.f_collection
+        // 判断是否是自定义优惠
+        if (parseInt(this.model.f_privilege_id)) {
+          for (let p of this.privilegeList) {
+            if (p.value == this.model.f_privilege_id && p.type == '自定义') {
+              this.model.f_privilege_money = window.prompt('请输入你想优惠的金额')
+              if (!(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money) || !(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money)) {
+                this.$showMessage('金额输入格式不正确!')
+                this.model.f_privilege_money = 0
+                return
+              }
+              if ((this.model.f_privilege_money - 0) >= this.model.f_collection) {
+                this.$showMessage('减免金额不能大于等于收款金额')
+                this.model.f_privilege_money = 0
+                return
+              }
+            }
+          }
+        }
+        // 优惠方式, 收款 缺一不计算
+        if (this.model.f_payment && this.model.f_payment.length && parseInt(this.model.f_privilege_id) && this.model.f_collection) {
+          let c = {
+            f_privilege_id: this.model.f_privilege_id,
+            f_collection: this.model.f_collection,
+            f_privilege_money: this.model.f_privilege_money
+          }
+          let privilegeData = await this.$resetpost('api/af-revenue/logic/calculatePrivilege', c, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+          // 减免金额
+          this.model.f_privilege_money = privilegeData.data.f_privilege_money
+          // 减免后收款金额
+          this.model.f_after_discount = privilegeData.data.f_collection
+        }
+      },
       clean () {
         this.$info('取消操作')
         this.$dispatch('refresh', this.row)
@@ -496,15 +620,49 @@
       }
     },
     watch: {
+      'model.f_payment.length' (val) {
+        console.log('付款方式多选。。', val)
+        if (val > 1 && !this.model.f_preamount) {
+          this.model.f_payment = ['现金缴费']
+          this.$showAlert('请先计算付款金额', 'warning', 2000)
+        } else {
+          this.paymentModel = []
+
+          this.model.f_payment.forEach((res) => {
+            let temp = {
+              f_payment: res,
+              f_money: 0
+            }
+            this.paymentModel.push(temp)
+          })
+          this.$resetValidation()
+
+          // 获取计算优惠
+          this.getPrivilegeList()
+        }
+      },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else {
           this.mjshow = false
         }
+        // if(this.row.f_collection_type == '按气量'){
+        //   this.pregas();
+        // }else{
+        //   this.preamount();
+        // }
+      },
+      'model.f_collection' (val) {
+        // 获取计算优惠
+        this.getPrivilegeList()
       }
     },
     computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
       'curbalance' () {
         if (this.model.f_preamount) {
           if (this.config.calculatePreByCollection) {

package/src/components/charge/business/ShowCardSellGas.vue

@@ -109,7 +109,7 @@
                            v-ref:givechange></give-change>
             </div>
           </div>
-          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')">
+          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限') || hasDisCount">
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">优惠方式</label>
               <v-select v-model="model.f_privilege_id" @blur.native.capture="privilegeCalculate"
@@ -318,7 +318,7 @@ let preamountGen = async function (self) {
   }
   self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
   self.calText(getGas.data.chargeprice)
-  self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext:null
+  self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext : null
 }
 
 // 输入气量，换算金额
@@ -339,7 +339,7 @@ let pregasGen = async function (self) {
     if (self.config.floor) {
       self.model.f_collection = Math.ceil(self.model.f_collection)
     }
-    self.pricetext = getAmount.data.chargeprice[0].pricetext?getAmount.data.chargeprice[0].pricetext:null
+    self.pricetext = getAmount.data.chargeprice[0].pricetext ? getAmount.data.chargeprice[0].pricetext : null
     self.calText(getAmount.data.chargeprice)
   }
 }
@@ -447,6 +447,7 @@ let asyncShowCardSellGas = async function (self) {
   let http = new HttpResetClass()
   let getLimit = await http.load('POST', 'api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {
     resolveMsg: null,
+    newly: true,
     rejectMsg: '获取限购值失败！！'
   })
   console.log('获取限购值', getLimit)
@@ -472,6 +473,21 @@ let asyncShowCardSellGas = async function (self) {
       }
     }
   }
+  // 获取优惠信息
+  if (self.config.newDiscount) {
+    let nowrite_param = {
+      f_userfiles_id: self.row.f_userfiles_id
+    }
+    let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+      resolveMsg: null,
+      newly: true,
+      rejectMsg: '获取优惠信息失败！！'
+    })
+    if (getDiscount.data.leftDiscount > 0) {
+      self.disCountInfo = getDiscount.data
+      self.hasDisCount = true
+    }
+  }
 }
 
 export default {
@@ -480,12 +496,15 @@ export default {
     return {
       serialShow: false,
       pricetext: null,
+      hasDisCount: false,
+      disCountInfo: {},
       resid: [],
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示
         calculatePreByCollection: false, // 可以更具收款来反向计算预购
         showupload: true,  // 默认不显示上传附件
         hasPrint: false,  // 默认打票
+        newDiscount: false,
         floor: true,  // 是否取整收费
         hasBillManage: false,  // 默认不启用发票管理
         billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -506,6 +525,7 @@ export default {
         f_meter_type: '',
         f_voucher_number: '',
         f_privilege_id: 0,
+        f_privilege_gas: 0,
         f_privilege_money: 0,
         f_after_discount: 0
       },
@@ -842,6 +862,23 @@ export default {
         }
         this.privilegeCalculate()
       }
+      if (this.hasDisCount) {
+        this.calDisCount()
+      }
+    },
+    async calDisCount () {
+      // 初始化减免金额
+      this.model.f_privilege_money = 0
+      this.model.f_after_discount = this.model.f_collection
+      let param = this.disCountInfo
+      param.f_collection = this.model.f_collection
+      param.f_pregas = this.model.f_pregas
+      let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+      // 减免金额
+      this.model.f_privilege_money = privilegeData.data.f_privilege_money
+      this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+      // 减免后收款金额
+      this.model.f_after_discount = privilegeData.data.f_collection
     },
     // 优惠计算
     async privilegeCalculate () {

package/src/plugins/CardService.js

@@ -455,6 +455,7 @@ let CardService = {
   // 无卡收费
   noCardSellGas (model, row) {
     let f_serial_number = ''
+    let f_privilege_gas = 0
     if (model.f_serial_number) {
       f_serial_number = model.f_serial_number
     }
@@ -462,6 +463,9 @@ let CardService = {
     if (model.f_write_card) {
       f_write_card = model.f_write_card
     }
+    if (model.f_privilege_gas) {
+      f_privilege_gas = model.f_privilege_gas
+    }
     let param = {
       f_userinfo_id: row.f_userinfo_id,
       f_serial_number: f_serial_number,
@@ -470,6 +474,10 @@ let CardService = {
       f_pregas: model.f_pregas,
       f_write_money: model.f_write_money,
       f_balance: row.f_balance,
+      // 优惠金额
+      f_privilege_money: model.f_privilege_money,
+      f_privilege_gas: f_privilege_gas,
+      f_after_discount: model.f_after_discount,
       f_preamount: model.f_preamount,
       f_total_gas: (row.f_total_gas - 0) + (model.f_pregas - 0),
       f_write_totalgas: (row.f_write_totalgas - 0) + (model.f_pregas - 0),