sale-client 3.6.287-2 → 3.6.288

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.
Files changed (9) hide show
  1. package/build/dev-server.js +108 -101
  2. package/package.json +3 -3
  3. package/src/components/revenue/Common/LimitGas.vue +3 -2
  4. package/src/filiale/ancheng/NewMeterList.vue +607 -607
  5. package/src/filiale/jingyang/GovernmentSell.vue +354 -345
  6. package/src/filiale/qianneng/sale.js +103 -103
  7. package/src/filiale/shanxian/components/webMeter/meterinfo/NewMeterList.vue +7 -1
  8. package/src/filiale/shexian/ChargeList.vue +1 -16
  9. package/src/main.js +33 -33
package/build/dev-server.js CHANGED
@@ -1,101 +1,108 @@
1
- var path = require('path')
2
- const [ serverRul, localUrl, v4Url ] =
3
- ['http://221.193.244.147:8400/#', 'http://127.0.0.1:8080/', 'http://192.168.50.4:8400/']
4
- var merge = require('webpack-merge')
5
- var baseConfig = require('./webpack.dev.conf')
6
- var devConfig = {
7
- devServer: {
8
- contentBase: path.join(__dirname, 'src'),
9
- hot: true,
10
- publicPath: baseConfig.output.publicPath,
11
- historyApiFallback: true,
12
- host: '127.0.0.1',
13
- port: 8089,
14
- open: false,
15
- stats: {
16
- colors: false, // 配置控制台输出彩色日志
17
- chunks: false, // 不输出构建 chunk 信息
18
- children: false // 不输出子模块构建信息
19
- },
20
- proxy: {
21
- '/api': {
22
- target: v4Url
23
- },
24
- '/invoice/rs/logic/getInvoice': {
25
- target: serverRul
26
- },
27
- '/rs/file': {
28
- target: serverRul
29
- },
30
- '/webapps': {
31
- target: serverRul
32
- },
33
- '/rs/sql/singleTable': {
34
- target: serverRul
35
- },
36
- '/invoice': {
37
- target: serverRul
38
- },
39
- // 查找资源服务数据
40
- '/rs/search': {
41
- target: serverRul
42
- },
43
- // 查找资源服务数据
44
- '/rs/logic/getLogin': {
45
- target: serverRul
46
- },
47
- // 查找资源服务数据
48
- '/rs/logic/getInitData': {
49
- target: serverRul
50
- },
51
- '/rs/logic/getSaleInitData': {
52
- target: serverRul
53
- },
54
- // 用户登录服务地址
55
- '/rs/user': {
56
- target: serverRul
57
- },
58
- '/rs/path': {
59
- target: serverRul
60
- },
61
- '/rs/data': {
62
- target: serverRul
63
- },
64
- '/rs/license': {
65
- target: serverRul
66
- },
67
- '/rs/db': {
68
- target: serverRul
69
- },
70
- '/excel': {
71
- target: serverRul
72
- },
73
- '/rs/config': {
74
- target: serverRul
75
- },
76
- '/rs/report': {
77
- target: serverRul
78
- },
79
- '/rs/vue': {
80
- target: serverRul
81
- },
82
- '/rs/logic/webHandReverse': {
83
- target: 'http://localhost:8085'
84
- },
85
- '/rs/logic': {
86
- target: serverRul
87
- },
88
- '/rs/sql': {
89
- target: serverRul
90
- },
91
- '/webmeter': {
92
- target: serverRul
93
- },
94
- '/rs': {
95
- target: serverRul
96
- // changeOrigin: true
97
- }
98
- }
99
- }
100
- }
101
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ var checkVersion = require('./versionCheck.js')
3
+ checkVersion()
4
+ const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
5
+ var merge = require('webpack-merge')
6
+ var baseConfig = require('./webpack.dev.conf')
7
+ var devConfig = {
8
+ devServer: {
9
+ contentBase: path.join(__dirname, 'src'),
10
+ hot: true,
11
+ publicPath: baseConfig.output.publicPath,
12
+ historyApiFallback: true,
13
+ host: '127.0.0.1',
14
+ port: 8089,
15
+ open: false,
16
+ stats: {
17
+ colors: false, // 配置控制台输出彩色日志
18
+ chunks: false, // 不输出构建 chunk 信息
19
+ children: false // 不输出子模块构建信息
20
+ },
21
+ proxy: {
22
+ '/api': {
23
+ target: v4Url
24
+ },
25
+ '/invoice/rs/logic/getInvoice': {
26
+ target: serverRul
27
+ },
28
+ '/rs/sql/filemanage_getUserfies':{
29
+ target: 'http://127.0.0.1:8080/'
30
+ },
31
+ '/rs/logic/importNetworkValve':{
32
+ target: 'http://127.0.0.1:8080/'
33
+ },
34
+ '/rs/file': {
35
+ target: localUrl
36
+ },
37
+ '/webapps': {
38
+ target: serverRul
39
+ },
40
+ '/rs/sql/singleTable': {
41
+ target: serverRul
42
+ },
43
+ '/invoice': {
44
+ target: serverRul
45
+ },
46
+ // 查找资源服务数据
47
+ '/rs/search': {
48
+ target: serverRul
49
+ },
50
+ // 查找资源服务数据
51
+ '/rs/logic/getLogin': {
52
+ target: serverRul
53
+ },
54
+ // 查找资源服务数据
55
+ '/rs/logic/getInitData': {
56
+ target: serverRul
57
+ },
58
+ '/rs/logic/getSaleInitData': {
59
+ target: serverRul
60
+ },
61
+ // 用户登录服务地址
62
+ '/rs/user': {
63
+ target: serverRul
64
+ },
65
+ '/rs/path': {
66
+ target: serverRul
67
+ },
68
+ '/rs/data': {
69
+ target: serverRul
70
+ },
71
+ '/rs/license': {
72
+ target: serverRul
73
+ },
74
+ '/rs/db': {
75
+ target: serverRul
76
+ },
77
+ '/excel': {
78
+ target: serverRul
79
+ },
80
+ '/rs/config': {
81
+ target: serverRul
82
+ },
83
+ '/rs/report': {
84
+ target: serverRul
85
+ },
86
+ '/rs/vue': {
87
+ target: serverRul
88
+ },
89
+ '/rs/logic/webHandReverse': {
90
+ target: 'http://localhost:8085'
91
+ },
92
+ '/rs/logic': {
93
+ target: localUrl
94
+ },
95
+ '/rs/sql': {
96
+ target: localUrl
97
+ },
98
+ '/webmeter': {
99
+ target: serverRul
100
+ },
101
+ '/rs': {
102
+ target: serverRul
103
+ // changeOrigin: true
104
+ },
105
+ }
106
+ }
107
+ }
108
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.287-02",
3
+ "version": "3.6.288",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -24,7 +24,7 @@
24
24
  "qrcodejs2": "^0.0.2",
25
25
  "vue": "^1.0.17",
26
26
  "webpack-dev-server": "^2.11.5",
27
- "vue-client": "1.24.137",
27
+ "vue-client": "1.24.146",
28
28
  "yarn": "^1.22.10"
29
29
  },
30
30
  "devDependencies": {
@@ -90,7 +90,7 @@
90
90
  "sinon-chai": "^2.8.0",
91
91
  "style": "0.0.3",
92
92
  "style-loader": "^0.20.3",
93
- "system-clients": "3.2.61",
93
+ "system-clients": "3.2.93",
94
94
  "url-loader": "^0.5.7",
95
95
  "vue-clipboard2": "0.3.1",
96
96
  "vue-hot-reload-api": "^1.2.0",
package/src/components/revenue/Common/LimitGas.vue CHANGED
@@ -189,8 +189,8 @@
189
189
  confirm () {
190
190
  this.$dispatch('limit', this.model)
191
191
  this.model = {
192
- f_third_pay: '0',
193
- f_time_type: '按月',
192
+ f_third_pay: this.model.f_third_pay,
193
+ f_time_type: this.model.f_time_type,
194
194
  f_limit_times: '',
195
195
  f_time_value: '',
196
196
  f_limit_type: '气量',
@@ -199,6 +199,7 @@
199
199
  f_limit_amount: 0,
200
200
  f_start_date: this.$login.toStandardDateString()
201
201
  }
202
+ console.log('提交限购数据', this.model)
202
203
  this.show = false
203
204
  },
204
205
  async cancellimit() {