sale-client 3.6.123 → 3.6.124

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
+const [serverRul, localUrl ] = ['http://121.40.52.133:9001/', 'http://121.40.52.133:9001/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/liaoyuan/PriceChangeCompensation/IotCompensation.vue

@@ -218,6 +218,15 @@
     ready () {
       asyncCardMeterCenter(this)
     },
+    computed:{
+      'curbalance' () {
+        if (this.model.f_collection) {
+          return ((this.row.f_balance- 0) + ((this.model.f_surplus_fee - 0) - (this.model.f_collection - 0))).toFixed(2)
+        } else {
+          return this.row.f_balance
+        }
+      },
+    },
     watch: {
       'model.f_payment.length' (val) {
         console.log('付款方式多选。。', val)
@@ -259,6 +268,8 @@
         this.model.f_stairprice_id = this.row.f_stairprice_id
         this.model.f_gasproperties = this.row.f_gasproperties
         this.model.f_address = this.row.f_address
+        this.model.f_collection2 = (this.model.f_surplus_fee - 0) - (this.model.f_collection - 0)
+        this.model.f_curbalance2 = this.curbalance
         this.model.f_collection = (this.model.f_compensation_type == '调价补费' ? this.model.f_collection : (0 - this.model.f_collection))
         this.model.f_times = this.row.f_times
         this.model.f_type = this.model.f_compensation_type

package/src/main.js

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
 // import wenxi from './filiale/rizhao/sale'
-import FilialeSale from './filiale/qianneng/sale'
+import FilialeSale from './filiale/liaoyuan/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'