manage-client 4.1.89 → 4.1.90-linshi-yangchun

package/build/dev-server.js

@@ -1,145 +1,145 @@
-const express = require('express')
-const webpack = require('webpack')
-const config = require('./webpack.dev.conf')
-const proxyMiddleware = require('http-proxy-middleware')
-
-const app = express()
-const compiler = webpack(config)
-
-const server = 'http://192.168.50.67:31567/'
-const local = 'http://127.0.0.1:9026/'
-const proxyTable = {
-  '/rs/logic/exportfile': {
-    target: server
-  },
-  '/dataManage': {
-    target: server
-  },
-  '/api/af-revenue/sql/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api/af-revenue/report/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api/af-revenue/logic': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api': {
-    target: server
-  },
-  '/rs/sql/chargeQuery_by_gasproperties': {
-    target: server
-  },
-  '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: server
-  },
-  '/files': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: server
-  },
-  '/rs/logic/getSaleInitData': {
-    target: server
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: server
-  },
-  '/rs/path/getParams': {
-    target: server
-  },
-  '/rs/data': {
-    target: server
-  },
-  '/rs/license': {
-    target: server
-  },
-  '/rs/db': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/rs/config': {
-    target: server
-  },
-  '/rs/sql/getLicenseById': {
-    target: server
-  },
-  '/rs/report': {
-    target: server
-  },
-  '/rs/vue': {
-    target: server
-  },
-  '/rs/file': {
-    target: server
-  },
-  '/rs/sql/singleTable': {
-    target: server
-  },
-  '/rs': {
-    target: server
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-const 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) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-app.use(require('connect-history-api-fallback')())
-
-app.use(devMiddleware)
-
-app.use(hotMiddleware)
-
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+
+const app = express()
+const compiler = webpack(config)
+
+const server = 'http://222.83.114.229:31785/'
+const local = 'http://222.83.114.229:31785/'
+const proxyTable = {
+  '/rs/logic/exportfile': {
+    target: server
+  },
+  '/dataManage': {
+    target: server
+  },
+  '/api/af-revenue/sql/': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
+  },
+  '/api/af-revenue/report/': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
+  },
+  '/api/af-revenue/logic': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
+  },
+  '/api': {
+    target: server
+  },
+  '/rs/sql/chargeQuery_by_gasproperties': {
+    target: server
+  },
+  '/rs/logic/chargeQuery_by_gasproperties_line': {
+    target: server
+  },
+  '/files': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: server
+  },
+  '/rs/logic/getSaleInitData': {
+    target: server
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: server
+  },
+  '/rs/path/getParams': {
+    target: server
+  },
+  '/rs/data': {
+    target: server
+  },
+  '/rs/license': {
+    target: server
+  },
+  '/rs/db': {
+    target: server
+  },
+  '/excel': {
+    target: server
+  },
+  '/rs/config': {
+    target: server
+  },
+  '/rs/sql/getLicenseById': {
+    target: server
+  },
+  '/rs/report': {
+    target: server
+  },
+  '/rs/vue': {
+    target: server
+  },
+  '/rs/file': {
+    target: server
+  },
+  '/rs/sql/singleTable': {
+    target: server
+  },
+  '/rs': {
+    target: server
+  }
+}
+
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+const 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) {
+  let options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+app.use(require('connect-history-api-fallback')())
+
+app.use(devMiddleware)
+
+app.use(hotMiddleware)
+
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.89",
+    "version": "4.1.90-linshi-yangchun",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/sale/businessquery/cardGasStatistics.vue

@@ -205,6 +205,7 @@
                 <th><nobr>用气性质</nobr></th>
                 <th><nobr>期初余量</nobr></th>
                 <th><nobr>期初余额</nobr></th>
+                <th><nobr>期初余额【公式】</nobr></th>
                 <th><nobr>起方</nobr></th>
                 <th><nobr>起方（液晶）</nobr></th>
                 <th><nobr>止方</nobr></th>
@@ -218,6 +219,8 @@
                 <th><nobr>期间充值金额</nobr></th>
                 <th><nobr>期间补气量</nobr></th>
                 <th><nobr>期间补气金额</nobr></th>
+                <th><nobr>期间换表补气量</nobr></th>
+                <th><nobr>期间换表补气金额</nobr></th>
                 <th><nobr>期末余量</nobr></th>
                 <th><nobr>期末余额</nobr></th>
                 <th><nobr>一阶剩余单价</nobr></th>
@@ -259,6 +262,7 @@
 
                 <th style="text-align:center"><nobr>{{row.f_last_gas}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_last_balance}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_last_balance_gongshi}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_last_tablebase}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_last_shengyu_gas}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
@@ -271,6 +275,8 @@
                 <th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_bq_f_pregas}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_bq_preamount}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_hbbq_pregas}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_hbbq_preamount}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_remain_gas}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_remain_curbalance}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_remain_stair1price}}</nobr></th>