sale-client 3.5.298 → 3.6.1

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+const [localUrl, serverRul] = ['http://61.240.138.248:8400/#', 'http://61.240.138.248:8400/#']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,6 +20,9 @@ var devConfig = {
       '/rs/file': {
         target: serverRul
       },
+      '/webapp': {
+        target: serverRul
+      },
       '/invoice': {
         target: serverRul
       },

package/package.json

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

package/src/components/charge/business/IOT/IotChangeFill.vue

@@ -340,10 +340,10 @@
       }
     },
     props: ['row'],
-    ready () {
+    async ready () {
       this.showGas = (this.row.f_collection_type === '按气量')
-      this.calRemanentMoney()
-      asyncIOTMeterCenter(this)
+      await asyncIOTMeterCenter(this)
+      await this.calRemanentMoney()
     },
     watch: {
       'model.f_payment.length' (val) {

package/src/filiale/wenxi/GasPriceUser.vue

@@ -225,8 +225,7 @@
   import {HttpResetClass, PagedList} from 'vue-client'
 
   let loadParamGem = async function (self) {
-    await self.$LoadParams.loadParam(self.priceorgid ? self.priceorgid : self.f_filialeid)
-    await self.$MagLoadParams.loadParam()
+    await self.$LoadParams.loadParam(self.f_filialeid)
     self.initParams()
   }
   export default {
@@ -271,7 +270,8 @@
             'f_orgname': '组织机构'
           }
         },
-        blodid: '临时id' + Date.now()
+        blodid: '临时id' + Date.now(),
+        meterbrands: []
       }
     },
     props: ['priceid', 'pricename', 'priceorgid'],
@@ -285,7 +285,7 @@
       initParams () {
         // 初始化气表品牌
         let brandArr = []
-        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
           let temp = {}
           temp.label = item.label
           temp.value = item.value.f_meter_brand

package/src/filiale/xiangyun/machineChargeQuery.vue

@@ -159,7 +159,7 @@ let loadParamGem = async function (self) {
       return {
         usertypes: this.$appdata.getParam('客户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')] : [],
         refunds: [{label: '全部', value: ''}, {label: '是', value: 'is not null'}, {label: '否', value: 'is  null'}],
-        model: new PagedList('rs/sql/machineChargeQuery', 20, {}, {f_refundfee: 0, f_oughtamount: 0, f_preoughtfee: 0}),
+        model: new PagedList('rs/sql/machineChargeQuery', 20, {}, {f_refundfee: 0, f_oughtamount: 0, realamount_fee: 0}),
         // 控制查询条件显示
         searchshow: true,
         criteriaShow: false,
@@ -197,7 +197,7 @@ let loadParamGem = async function (self) {
         sumFields: {
           'f_refundfee': '退费金额',
           'f_oughtamount': '用气量',
-          'f_realamount': '预收金额'
+          'realamount_fee': '预收金额'
         },
         footer: [],
         f_orgid: ''
@@ -256,7 +256,7 @@ let loadParamGem = async function (self) {
         footerData.push('合计')
         let self = this
         for (var field in self.sumsmodel) {
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+          footerData.push(`${exportfield[field] || '预收金额'}合计:${self.sumsmodel[field]}`)
         }
         this.footer.push(footerData)
       }

package/src/filiale/xiangyun/machineChargeQuery1.vue

@@ -134,7 +134,7 @@
         refunds: [{label: '全部', value: ''}, {label: '是', value: 'is not null'}, {label: '否', value: 'is  null'}],
         model: new PagedList('rs/sql/machineChargeQuery', 20, {},
           { f_oughtamount: 0,
-            f_realoughtfee: 0,
+            oughtfee_fee: 0,
             f_stair_gas1: 0,
             f_stair_money1: 0,
             f_stair_gas2: 0,
@@ -185,7 +185,7 @@
         footer: [],
         sumFields: {
           'f_oughtamount': '用气量',
-          'f_oughtfee': '应收金额',
+          'oughtfee_fee': '应收金额',
           'f_stair_gas1': '一阶气量',
           'f_stair_money1': '一阶气费',
           'f_stair_gas2': '二阶气量',
@@ -249,7 +249,7 @@
         footerData.push('合计')
         let self = this
         for (var field in self.sumsmodel) {
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+          footerData.push(`${exportfield[field] || '应收金额'}合计:${self.sumsmodel[field]}`)
         }
         this.footer.push(footerData)
       }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/yuansheng/sale'
+import wenxi from './filiale/xiangyun/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'