sale-client 4.3.58 → 4.3.60

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
 
+## **🚀 V4.3.60 -2026-05-26 `@张科科`**
+### `🌟` 功能调整
+---洪雅 综合收费界面  增加合同编号的查询条件
+
+
 ## **🚀 V4.3.56 -2026-05-18 `@张科科`**
 ### `🌟` 功能调整
 ---金煌 物联网表收费  物联收费未开户提示是否开启 这个不要 改成单值表配置控制的

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://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,34 +25,28 @@ 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/handPlanAudit': {
-        pathRewrite: {
-          '/api/af-revenue/handPlanAudit': '/handPlanAudit'
-        },
-        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
+      // },
       // '/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.58",
+  "version": "4.3.60",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/hongYa/HandQueryUser.vue

@@ -139,28 +139,28 @@
           汇总信息
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          用气量合计:&emsp;{{model.sums.f_oughtamount}}
+          用气量合计:&emsp;{{round2(model.sums.f_oughtamount)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          用气金额合计:&emsp;{{model.sums.f_oughtfee}}
+          用气金额合计:&emsp;{{round2(model.sums.f_oughtfee)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          一阶用气量合计:&emsp;{{model.sums.f_stairamount1}}
+          一阶用气量合计:&emsp;{{round2(model.sums.f_stairamount1)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          一阶用气金额合计:&emsp;{{model.sums.f_stair1fee}}
+          一阶用气金额合计:&emsp;{{round2(model.sums.f_stair1fee)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          二阶用气量合计:&emsp;{{model.sums.f_stair2amount}}
+          二阶用气量合计:&emsp;{{round2(model.sums.f_stair2amount)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          二阶用气金额合计:&emsp;{{model.sums.f_stair2fee}}
+          二阶用气金额合计:&emsp;{{round2(model.sums.f_stair2fee)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{round2(model.sums.f_stair3amount)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}
+          三阶用气金额合计:&emsp;{{round2(model.sums.f_stair3fee)}}
         </td>
         <!--<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
           <!--欠费气量合计:&emsp;{{model.sums.f_totalowe_gas}}-->
@@ -261,6 +261,11 @@
       }
     },
     methods: {
+      // 标准四舍五入保留2位小数
+      round2 (val) {
+        let num = parseFloat(val) || 0
+        return Math.round(num * 100) / 100
+      },
       // search() {
       //   this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
       //   this.model.search(this.condition, this.model)

package/src/filiale/hongYa/HistoryHandQueryUser.vue

@@ -125,10 +125,10 @@
           汇总信息
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          用气量合计:&emsp;{{model.sums.f_oughtamount}}
+          用气量合计:&emsp;{{round2(model.sums.f_oughtamount)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          用气金额合计:&emsp;{{model.sums.f_oughtfee}}
+          用气金额合计:&emsp;{{round2(model.sums.f_oughtfee)}}
         </td>
       </tr>
     </table>
@@ -210,6 +210,11 @@ export default {
     }
   },
   methods: {
+    // 标准四舍五入保留2位小数
+    round2 (val) {
+      let num = parseFloat(val) || 0
+      return Math.round(num * 100) / 100
+    },
     getotherfooter () {
       // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
       // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];

package/src/filiale/hongYa/WebHandQueryUser.vue

@@ -137,28 +137,28 @@
           汇总信息
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          用气量合计:&emsp;{{model.sums.f_oughtamount}}
+          用气量合计:&emsp;{{round2(model.sums.f_oughtamount)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          用气金额合计:&emsp;{{model.sums.f_oughtfee}}
+          用气金额合计:&emsp;{{round2(model.sums.f_oughtfee)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          一阶用气量合计:&emsp;{{model.sums.f_stairamount1}}
+          一阶用气量合计:&emsp;{{round2(model.sums.f_stairamount1)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          一阶用气金额合计:&emsp;{{model.sums.f_stair1fee}}
+          一阶用气金额合计:&emsp;{{round2(model.sums.f_stair1fee)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          二阶用气量合计:&emsp;{{model.sums.f_stair2amount}}
+          二阶用气量合计:&emsp;{{round2(model.sums.f_stair2amount)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          二阶用气金额合计:&emsp;{{model.sums.f_stair2fee}}
+          二阶用气金额合计:&emsp;{{round2(model.sums.f_stair2fee)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{round2(model.sums.f_stair3amount)}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}
+          三阶用气金额合计:&emsp;{{round2(model.sums.f_stair3fee)}}
         </td>
       </tr>
     </table>
@@ -258,6 +258,11 @@
       }
     },
     methods: {
+      // 标准四舍五入保留2位小数
+      round2 (val) {
+        let num = parseFloat(val) || 0
+        return Math.round(num * 100) / 100
+      },
       getotherfooter () {
         // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];

package/src/filiale/hongYa/components/charge/ChargeList.vue

@@ -132,7 +132,12 @@
                           condition="i.f_whether_zbf = '{}'"
                           close-on-select style="width: 60%"></v-select>
               </div>
-
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">合同编号</label>
+                <input type="text" class="input_search" style="width:60%"
+                       v-model="model.f_contract_id" placeholder='合同编号'
+                       condition="i.f_contract_id = '{}'">
+              </div>
             </div>
           </div>
           <div class="form-group col-sm-6" style="float:right;white-space: nowrap;width: auto">

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/dexin/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'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Mar 18 10:18:57 CST 2026
-gradle.version=5.2.1