sale-client 3.6.175 → 3.6.177

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
+const [ serverRul, localUrl ] = ['http://192.168.3.82:8400/#', 'http://192.168.3.82:8400/#']
 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.175",
+  "version": "3.6.177",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/gehua/PriceChangeCompensation/GroupJbCompensation.vue

@@ -190,7 +190,7 @@ let asyncCardMeterCenter = async function (self) {
       data: {
         items: 'sum(f_real_amount) f_real_amount,sum(f_surplus_fee) f_surplus_fee',
         tablename: 't_surplus_detail',
-        condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill}') and f_state='有效' and f_whether_pay = '否' `,
+        condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill.id}') and f_state='有效' and f_whether_pay = '否' `,
         orderitem: 'f_surplus_fee'
       }
     },

package/src/filiale/gehua/PriceChangeCompensation/OweRecordQuery.vue

@@ -157,7 +157,7 @@ export default {
       // 处理按钮样式
       this.styleChange(btn.name)
       this.chargeShow = true
-      this.$refs.route.init(btn.value.routeName, {row: this.row, data: this.model, owe: this.owe, civill: this.f_civill_id})
+      this.$refs.route.init(btn.value.routeName, {row: this.row, data: this.model, owe: this.owe, civill: this.civill})
     },
     styleChange (name) {
       this.operBtns.forEach((res) => {

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/zhongsheng/sale'
+import FilialeSale from './filiale/gehua/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'

package/src/plugins/OffGasAddGasService.js

@@ -62,6 +62,11 @@ let offGasAddGasGen = function * (model, row) {
       meternumber: row.f_meternumber
     }
     params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
+    // 判断是否是累购表
+    if (row.f_support_purchase === '是') {
+      params.ljgql = (row.f_write_totalgas - 0)
+      params.ljgqje = (row.f_write_totalfee - 0)
+    }
     params.kzt = getLastOper.data.ispick === '未过表' && getLastOper.data.lastsell_oper === '发卡售气' ? '0' : '1'
     // 掉气补气传的累计购气金额应该处理掉最有一笔收费记录的金额