sale-client 3.5.120 → 3.5.122

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Apr 02 10:09:16 CST 2021
+gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/build/dev-server.js

@@ -1,193 +1,193 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-// var fuwu = 'http://192.168.50.4:8400'
-var fuwu = 'http://39.99.85.14:8400'
-// var fuwu = 'http://121.36.106.17:8400/'
-// 铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  // '/'
-  // '/rs/logic/stopBasicLivingNew':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getBatchOperaPro':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/sale_getUser':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getOperBtns':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/file/uploadFile':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/sql/getDownPlan':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/logic/saleExport': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/saleGetExportProgress': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/getWarningMsg': {
-  //   target: 'http://localhost:8080/'
-  // },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice': {
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: fuwu
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4:8400'
+// var fuwu = 'http://39.99.85.14:8400'
+// var fuwu = 'http://121.36.106.17:8400/'
+// 铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+// 铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+// 韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  // '/'
+  // '/rs/logic/stopBasicLivingNew':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getBatchOperaPro':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/sql/sale_getUser':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getOperBtns':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/file/uploadFile':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/sql/getDownPlan':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/logic/saleExport': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/saleGetExportProgress': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/getWarningMsg': {
+  //   target: 'http://localhost:8080/'
+  // },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice': {
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://192.168.50.4:8450'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

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

package/src/components/charge/business/ShowCardSellGas.vue

@@ -258,9 +258,10 @@ import {HttpResetClass} from 'vue-client'
 import XML from '../../../plugins/ObjTree'
 
 let preamountGen = async function (self) {
-  // let calFee = (self.model.f_totalcost - 0) + (self.row.f_balance - 0)
-  if (self.row.f_balance == null) self.row.f_balance = 0
-  let calFee = ((self.model.f_preamount - 0) + (self.row.f_balance - 0)).toFixed(2)
+  let calFee = ((self.model.f_preamount - 0)).toFixed(4)
+  if (self.model.f_payment == '赠气') {
+    calFee = (self.model.f_preamount - 0).toFixed(4)
+  }
   // 通过金额进行划价
   let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
   if (getGas.data.gas) {
@@ -279,17 +280,12 @@ let preamountGen = async function (self) {
     } else {
       // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
       let tempnum = Math.floor(getGas.data.gas - 0)
-      if (getGas.data.gas > tempnum) {  // getGas.data.gas-tempnum-0
-        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
-        self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
-      } else {
-        self.dymoney = 0
-      }
+      let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+      self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
       self.model.f_pregas = Math.floor(getGas.data.gas - 0)
     }
   }
   self.model.f_totalcost = ((self.row.f_balance - 0) > (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(2))
-  // self.model.f_preamount = calFee
   self.model.chargeprice = getGas.data.chargeprice
   Object.assign(self.model, self.model, getGas.data)
   self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(2)
@@ -301,26 +297,18 @@ let preamountGen = async function (self) {
   self.calText(getGas.data.chargeprice)
 }
 
+// 输入气量，换算金额
 let pregasGen = async function (self) {
   if (self.row.f_isdecimal === '是') {
     self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
   } else {
     self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
   }
-  self.model.f_meter_type = self.row.f_meter_type
-  // 有账号结余时, 需要把账号结余能买的气加上
-  let lsBalance = self.row.f_balance
-  if ((lsBalance - 0) > 0) {
-    // 通过金额进行划价
-    let getGas = await self.$CommonService.feeCalculate(self.model, lsBalance)
-    self.model.f_pregas = (self.model.f_pregas - 0) + (Math.floor(getGas.data.gas) - 0)
-  }
   if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
+    self.model.f_meter_type = self.row.f_meter_type
     let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
     self.model.f_preamount = getAmount.data.chargenum
-    // 计算气费和其他费用(暂时只有开卡费，之后有其他费在加)
-    let total = (getAmount.data.chargenum - 0) + (self.openFee - 0)
-    self.model.f_totalcost = (lsBalance - 0) > (total - 0) ? 0 : ((total - 0) - (lsBalance - 0)).toFixed(4)
+    self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
     Object.assign(self.model, self.model, getAmount.data)
     self.model.chargeprice = getAmount.data.chargeprice
     self.model.f_collection = self.model.f_totalcost
@@ -856,14 +844,17 @@ export default {
       return this.$login.r ? this.$login.r : []
     },
     'curbalance' () {
+      if (this.model.f_payment === '赠气') {
+        return this.model.f_balance
+      }
       if (this.model.f_preamount) {
-        if (this.row.f_collection_type === '按金额') {
-          return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+        if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
+          return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(4)
         } else {
           return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
         }
       } else {
-        return 0
+        return this.row.f_balance
       }
     },
     'islegal' () {

package/src/components/chargeBatch/BatchCharge.vue

@@ -254,7 +254,14 @@ export default {
         }
       }
       for (let row of this.owe.rows) {
-        param.chargeUser.push({f_userinfo_id: row.f_userinfo_id, f_collection: row.f_oughtfee_all})
+        param.chargeUser.push({
+          f_userinfo_id: row.f_userinfo_id,
+          f_collection: row.f_oughtfee_all,
+          f_oughtfee: row.f_oughtfee,
+          f_oughtamount: row.f_oughtamount,
+          min_handplan_id: row.min_handplan_id,
+          max_handplan_id: row.max_handplan_id
+        })
       }
       if (this.civill) {
         param = Object.assign(this.civill, param)

package/src/components/revenue/comprehen/ComprehenOperation/removeTable.vue

@@ -158,6 +158,34 @@ export default {
           return
         }
         this.saveobj()
+      } else {
+        //物联网表拆表
+        this.$showMessage(`将生成抄表记录，是否确认`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let data = {
+              downDate: this.$login.toStandardTimeString(),
+              startDate: this.$login.toStandardDateString(),
+              endDate: this.$login.toStandardDateString(),
+              condition: `f_userfiles_id = '${this.row.f_userfiles_id}'`,
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_meternumber: this.row.f_meternumber,
+              f_userinfo_id: this.row.f_userinfo_id,
+              f_userfiles_id: this.row.f_userfiles_id,
+              f_meterbase: this.model.f_using_base_old,
+              f_meter_brand: this.row.f_meter_brand,
+              f_price_id: this.row.f_price_id
+            }
+            //划价
+            this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: null,rejectMsg:null }).then((res) => {
+                console.log('划价成功')
+                //保存拆表记录
+                this.saveobj()
+            })
+          } else {
+            //取消
+          }
+        })
       }
     },
     async saveobj () {