sale-client 4.3.56 → 4.3.57

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed May 13 15:19:48 CST 2026
+gradle.version=5.2.1

package/package.json

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

package/src/filiale/jinhong/machineHand.vue

@@ -702,7 +702,7 @@
               </div>
               <div class="col-sm-4 form-group">
                 <label class="font_normal_body">阶梯二金额</label>
-                <p class="form-control" style="width:60%" disabled>{{ row.f_stair_money2 = stairMoney(row.f_stair_price2, row.f_stair_gas2) }}</p>
+                <p class="form-control" style="width:60%" disabled> {{ row.f_stair_money2 = stairMoney(row.f_stair_price2, row.f_stair_gas2) }}</p>
               </div>
               <div class="col-sm-4 form-group" >
                 <label class="font_normal_body">阶梯三单价</label>
@@ -721,11 +721,11 @@
             </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">总用气量</label>
-              <p class="form-control" style="width:60%" disabled>{{ ((row.f_stair_gas1 - 0)+(row.f_stair_gas2 - 0)+(row.f_stair_gas3 - 0)).toFixed(3) }}</p>
+              <p class="form-control" style="width:60%" disabled>{{ stairTotalGas}}</p>
             </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">总用气金额</label>
-              <p class="form-control" style="width:60%" disabled>{{ ((row.f_stair_money1 - 0)+(row.f_stair_money2 - 0)+(row.f_stair_money3 - 0)).toFixed(3)  }}</p>
+              <p class="form-control" style="width:60%" disabled>{{ stairTotalAmount }}</p>
             </div>
             <p style="color: red">注意: 自定义气量总量必须等于本次抄表用气量, 本次抄表总量: {{row.f_oughtamount}}</p>
           </div>
@@ -964,7 +964,10 @@
     },
     methods: {
       stairMoney (price, gas) {
-        return (price * gas).toFixed(3) - 0
+        // 转换为数字，处理 undefined 和 null
+        const p = Number(price) || 0
+        const g = Number(gas) || 0
+        return (p * g).toFixed(3) - 0
       },
       async customPricingConfirm () {
         let sumGas = (this.row.f_stair_gas1 - 0) + (this.row.f_stair_gas2 - 0) + (this.row.f_stair_gas3 - 0)
@@ -1914,6 +1917,26 @@
       danhutitle () {
         return '单户抄表    当前计划年月：' + this.downModel.downDate
       },
+      // 总用气量
+      stairTotalGas() {
+        if (this.row && this.row.f_price_type === '阶梯气价') {
+          const gas1 = Number(this.row.f_stair_gas1) || 0
+          const gas2 = Number(this.row.f_stair_gas2) || 0
+          const gas3 = Number(this.row.f_stair_gas3) || 0
+          return (gas1 + gas2 + gas3).toFixed(3)
+        }
+        return 0
+      },
+      // 阶梯气价总金额
+      stairTotalAmount() {
+        if (this.row && this.row.f_price_type === '阶梯气价') {
+          const money1 = this.stairMoney(this.row.f_stair_price1, this.row.f_stair_gas1)
+          const money2 = this.stairMoney(this.row.f_stair_price2, this.row.f_stair_gas2)
+          const money3 = this.stairMoney(this.row.f_stair_price3, this.row.f_stair_gas3)
+          return (money1 + money2 + money3).toFixed(3)
+        }
+        return 0
+      },
       getCondition () {
         // return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
         return {

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/jinhuang/sale'
+import FilialeSale from './filiale/jinhong/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'