sale-client 4.3.56 → 4.3.58

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Mar 18 10:18:57 CST 2026
+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://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://127.0.0.1:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -25,28 +25,34 @@ var devConfig = {
     //   },
     //   target: localUrl
     // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
-      // '/api/af-revenue/file': {
-      //   // pathRewrite: {
-      //   //   '/api/af-revenue/file': '/file'
-      //   // },
-      //   target: localUrl
-      // },
+      '/api/af-revenue/logic': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: localUrl
+      },
+      '/api/af-revenue/file': {
+        pathRewrite: {
+          '/api/af-revenue/file': '/file'
+        },
+        target: localUrl
+      },
+      '/api/af-revenue/handPlanAudit': {
+        pathRewrite: {
+          '/api/af-revenue/handPlanAudit': '/handPlanAudit'
+        },
+        target: localUrl
+      },
       // '/weixin2/rs':{
       //
       //   target: 'http://410663id1ia4.vicp.fun'
       // },
-      // '/api/af-revenue/sql': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/sql': '/sql'
-      //   },
-      //   target: localUrl
-      // },
+      '/api/af-revenue/sql': {
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
+        target: localUrl
+      },
       '/rs/pay': {
         target: 'http://localhost:8080'
       },

package/package.json

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

package/src/filiale/dexin/cardsHand.vue

@@ -198,6 +198,9 @@
               <th>
                 <nobr>序号</nobr>
               </th>
+              <th>
+                <nobr>抄表单编号</nobr>
+              </th>
               <!--                        <th>户编号</th>-->
               <!--                        <th>基本信息</th>-->
               <th>
@@ -288,6 +291,7 @@
           </template>
           <template partial='body'>
             <td style="text-align: center;">{{ $index + 1 }}</td>
+            <td style="text-align: center;">{{ row.id }}</td>
             <td style="text-align: center;">{{ row.f_userinfo_code }}</td>
             <td style="text-align: center;">
               {{ row.f_user_name }}&nbsp;&nbsp;{{ row.f_gasproperties }}&nbsp;&nbsp;{{

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/dexin/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/src/plugins/ChangeMeterService.js

@@ -141,7 +141,7 @@ let onlyChangeNewMeterGen = function * (model, data) {
         cssqrq: '',                                          // 上次售气日期，格式为YYYYMMDD
         // sxrq: model.f_startdate,                             // 生效日期，价格管理中取
         meterid: model.metermessage.f_meternumber,                          // 表号
-        dqdm: row.f_area_code,                                          // 精益工业地区代码
+        dqdm: data.f_area_code,                                          // 精益工业地区代码
         klx: data.f_coding                         // 购气金额
       }
       params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
@@ -399,12 +399,10 @@ let AddGasGen = function * (model, row) {
       f_comments: model.f_reason,
       f_type: model.f_type[0],
       f_userinfo_id: row.f_userinfo_id,
-      f_user_id: row.f_user_id,
       f_user_name: row.f_user_name,
       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,
@@ -413,7 +411,6 @@ let AddGasGen = function * (model, row) {
       f_depname: Vue.$login.f.deps,
       f_zoneid: Vue.$login.f.zoneid,
       f_zones: Vue.$login.f.zones,
-
       f_user_id: {
         f_user_id: row.f_user_id,
         f_remanent_gas: model.f_theremain_fillgas,
@@ -630,8 +627,8 @@ let ChangeMeterService = {
       f_pregas: model.f_pregas,
       f_totalcost: model.f_totalcost,
       f_add_gas: model.f_add_gas,
-      f_total_gas: model.addtotal[0]==='是'?(row.f_total_gas - 0) + (model.f_pregas - 0):(row.f_total_gas - 0),
-      f_total_fee: model.addtotal[0]==='是'?(row.f_total_fee - 0) + (model.f_preamount - 0):(row.f_total_fee - 0),
+      f_total_gas: model.addtotal[0] === '是' ? (row.f_total_gas - 0) + (model.f_pregas - 0) : (row.f_total_gas - 0),
+      f_total_fee: model.addtotal[0] === '是' ? (row.f_total_fee - 0) + (model.f_preamount - 0) : (row.f_total_fee - 0),
       f_payment: model.f_payment.toString(),
       f_bill_style: model.f_print.toString(),
       f_comments: model.f_comments,
@@ -693,8 +690,10 @@ let ChangeMeterService = {
           f_user_id: row.f_user_id,
           f_userfiles_id: row.f_userfiles_id,
           version: row.version,
-          f_total_gas:model.addtotal[0]==='是'? (model.f_pregas - 0) + (row.f_total_gas - 0):(row.f_total_gas - 0),
-          f_total_fee: model.addtotal[0]==='是'?(model.f_preamount - 0) + (row.f_total_fee - 0):(row.f_total_fee - 0)
+          f_total_gas: model.addtotal[0] === '是' ? (model.f_pregas - 0) + (row.f_total_gas - 0) : (row.f_total_gas - 0),
+          f_total_fee: model.addtotal[0] === '是' ? (model.f_preamount - 0) + (row.f_total_fee - 0) : (row.f_total_fee - 0),
+          f_write_totalgas: model.addtotal[0] === '是' ? (model.f_preamount - 0) + (row.f_write_totalgas - 0) : (row.f_write_totalgas - 0),
+          f_write_totalfee: model.addtotal[0] === '是' ? (model.f_preamount - 0) + (row.f_write_totalfee - 0) : (row.f_write_totalfee - 0)
           // f_meter_base: (model.f_pregas - 0) + (row.f_total_gas - 0),
         }
       }
@@ -709,8 +708,10 @@ let ChangeMeterService = {
           f_user_id: row.f_user_id,
           f_userfiles_id: row.f_userfiles_id,
           version: row.version,
-          f_total_gas: model.addtotal[0]==='是'? (model.f_pregas - 0) + (row.f_total_gas - 0):(row.f_total_gas - 0),
-          f_total_fee: model.addtotal[0]==='是'? (model.f_preamount - 0) + (row.f_total_fee - 0):(row.f_total_fee - 0)
+          f_total_gas: model.addtotal[0] === '是' ? (model.f_pregas - 0) + (row.f_total_gas - 0) : (row.f_total_gas - 0),
+          f_total_fee: model.addtotal[0] === '是' ? (model.f_preamount - 0) + (row.f_total_fee - 0) : (row.f_total_fee - 0),
+          f_write_totalgas: model.addtotal[0] === '是' ? (model.f_preamount - 0) + (row.f_write_totalgas - 0) : (row.f_write_totalgas - 0),
+          f_write_totalfee: model.addtotal[0] === '是' ? (model.f_preamount - 0) + (row.f_write_totalfee - 0) : (row.f_write_totalfee - 0)
           // f_meter_base: (model.f_pregas - 0) + (row.f_total_gas - 0),
         }
       }
@@ -727,8 +728,8 @@ let ChangeMeterService = {
             f_user_id: model.f_user_id,
             f_userfiles_id: row.f_userfiles_id,
             f_meter_base: row.f_meter_base + (model.f_pregas - 0),
-            f_total_gas: model.addtotal[0]==='是'?(row.f_total_gas - 0) + (model.f_pregas - 0):(row.f_total_gas - 0),
-            f_total_fee: model.addtotal[0]==='是'?(row.f_total_fee - 0) + (model.f_preamount - 0):(row.f_total_fee - 0),
+            f_total_gas: model.addtotal[0] === '是' ? (row.f_total_gas - 0) + (model.f_pregas - 0) : (row.f_total_gas - 0),
+            f_total_fee: model.addtotal[0] === '是' ? (row.f_total_fee - 0) + (model.f_preamount - 0) : (row.f_total_fee - 0),
             f_balance_gas: parseFloat(row.f_balance_gas) + parseFloat(model.f_pregas),
             // f_meter_base: parseFloat(model.f_pregas) + parseFloat(row.f_meter_base),
             version: row.version
@@ -745,7 +746,7 @@ let ChangeMeterService = {
             f_userfiles_id: row.f_userfiles_id,
             f_user_id: model.f_user_id,
             f_meter_base: row.f_meter_base + (model.f_pregas - 0),
-            f_total_fee: model.addtotal[0]==='是'?(row.f_total_fee - 0) + (model.f_preamount - 0):(row.f_total_fee - 0),
+            f_total_fee: model.addtotal[0] === '是' ? (row.f_total_fee - 0) + (model.f_preamount - 0) : (row.f_total_fee - 0),
             // f_meter_base: parseFloat(model.f_pregas) + parseFloat(row.f_meter_base),
             version: row.version
           }