manage-client 4.1.153 → 4.1.155

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,8 +6,8 @@ const proxyMiddleware = require('http-proxy-middleware')
6
6
  const app = express()
7
7
  const compiler = webpack(config)
8
8
 
9
- const server = 'http://192.168.50.67:31567/'
10
- const local = 'http://127.0.0.1:9026/'
9
+ const server = 'http://116.204.64.92:31467/'
10
+ const local = 'http://116.204.64.92:31467/'
11
11
  const proxyTable = {
12
12
  '/rs/logic/exportfile': {
13
13
  target: server
@@ -16,21 +16,21 @@ const proxyTable = {
16
16
  target: server
17
17
  },
18
18
  '/api/af-revenue/sql/': {
19
- pathRewrite: {
20
- '^/api/af-revenue': '/'
21
- },
19
+ // pathRewrite: {
20
+ // '^/api/af-revenue': '/'
21
+ // },
22
22
  target: local
23
23
  },
24
24
  '/api/af-revenue/report/': {
25
- pathRewrite: {
26
- '^/api/af-revenue': '/'
27
- },
25
+ // pathRewrite: {
26
+ // '^/api/af-revenue': '/'
27
+ // },
28
28
  target: local
29
29
  },
30
30
  '/api/af-revenue/logic': {
31
- pathRewrite: {
32
- '^/api/af-revenue': '/'
33
- },
31
+ // pathRewrite: {
32
+ // '^/api/af-revenue': '/'
33
+ // },
34
34
  target: local
35
35
  },
36
36
  '/api': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.1.153",
3
+ "version": "4.1.155",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -177,6 +177,8 @@
177
177
  this.sumhtml += '卡费合计: ' + `<font color="blue">${this.sumsmodel['cardfee']} </font>`
178
178
  this.sumhtml += '方量合计: ' + `<font color="blue">${this.sumsmodel['f_pregas']} </font>`
179
179
  this.sumhtml += '金额合计: ' + `<font color="blue">${this.sumsmodel['f_preamount']} </font>`
180
+ this.sumhtml += '退费笔数: ' + `<font color="blue">${this.sumsmodel['f_tuifei_count']} </font>`
181
+ this.sumhtml += '退费金额: ' + `<font color="blue">${this.sumsmodel['f_tuifei_money']} </font>`
180
182
  this.sumhtml += '</th></tr>'
181
183
  this.sumhtml3 = `<tr><th colspan=${this.modelval.length}>&emsp;&emsp;&emsp;小&emsp;计:`
182
184
  this.sumhtml3 += '现金合计: ' + `<font color="blue">${this.sumsmodel['xianjin']} </font>`
@@ -526,9 +526,7 @@
526
526
  },
527
527
  clearmsg() {
528
528
  Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
529
- if(key !== 'f_error_level'){
530
529
  this.$refs.paged.$refs.criteria.model[key] = []
531
- }
532
530
  })
533
531
  },
534
532
  close() {
package/src/main.js CHANGED
@@ -6,8 +6,8 @@ import { all } from 'vue-client'
6
6
  import { system } from 'system-clients'
7
7
  import { ldap } from 'ldap-clients'
8
8
  import saleManage from './saleManage'
9
- import ShanXianSaleManage from './filiale/xinjiangdexin/sale'
10
- // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
9
+ import ShanXianSaleManage from './filiale/ningjin/sale'
10
+ import ShanXianwebSaleManage from './filiale/ningjin/webmeterManage'
11
11
  import webmeterManage from './webmeterManage'
12
12
  import reportManage from './reportManage'
13
13
  import newmanage from './newmanage'
@@ -50,6 +50,7 @@ webmeterManage()
50
50
  ManageHome()
51
51
  newmanage()
52
52
  ShanXianSaleManage()
53
+ ShanXianwebSaleManage()
53
54
  reportManage()
54
55
  // ShanXianSaleManage()
55
56
  require('system-clients/src/styles/less/bootstrap.less')