sale-client 3.7.45 → 3.7.46
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.
- package/build/dev-server.js +126 -126
- package/package.json +1 -1
- package/src/components/charge/business/CardChangeFill.vue +9 -2
- package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/8.10/checksums/checksums.lock +0 -0
- package/.gradle/8.10/dependencies-accessors/gc.properties +0 -0
- package/.gradle/8.10/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.10/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.10/fileChanges/last-build.bin +0 -0
- package/.gradle/8.10/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.10/fileHashes/fileHashes.lock +0 -0
- package/.gradle/8.10/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
package/build/dev-server.js
CHANGED
|
@@ -1,126 +1,126 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
var checkVersion = require('./versionCheck.js')
|
|
3
|
-
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl, v4Url ] = ['http://
|
|
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
|
-
|
|
23
|
-
'/rs/file': {
|
|
24
|
-
pathRewrite: {
|
|
25
|
-
'^/rs/file/': '/api/af-revenue/file/'
|
|
26
|
-
},
|
|
27
|
-
target: serverRul
|
|
28
|
-
},
|
|
29
|
-
'/api': {
|
|
30
|
-
target: v4Url
|
|
31
|
-
},
|
|
32
|
-
'/sketch': {
|
|
33
|
-
target: serverRul,
|
|
34
|
-
changeOrigin: true
|
|
35
|
-
},
|
|
36
|
-
'/invoice/rs/logic/getInvoice': {
|
|
37
|
-
target: serverRul
|
|
38
|
-
},
|
|
39
|
-
// '/rs/sql/filemanage_getUserfies':{
|
|
40
|
-
// target: 'http://127.0.0.1:8080/'
|
|
41
|
-
// },
|
|
42
|
-
// '/rs/logic/importNetworkValve':{
|
|
43
|
-
// target: 'http://127.0.0.1:8080/'
|
|
44
|
-
// },
|
|
45
|
-
'/webapps': {
|
|
46
|
-
target: serverRul
|
|
47
|
-
},
|
|
48
|
-
'/rs/sql/singleTable': {
|
|
49
|
-
target: localUrl
|
|
50
|
-
},
|
|
51
|
-
'/invoice': {
|
|
52
|
-
// pathRewrite: {
|
|
53
|
-
// '/invoice/rs/logic': '/logic'
|
|
54
|
-
// },
|
|
55
|
-
target: serverRul
|
|
56
|
-
},
|
|
57
|
-
'/rs/batchSettlement': {
|
|
58
|
-
target: localUrl
|
|
59
|
-
},
|
|
60
|
-
|
|
61
|
-
// 查找资源服务数据
|
|
62
|
-
'/rs/search': {
|
|
63
|
-
target: serverRul
|
|
64
|
-
},
|
|
65
|
-
// 查找资源服务数据
|
|
66
|
-
'/rs/logic/getLogin': {
|
|
67
|
-
target: serverRul
|
|
68
|
-
},
|
|
69
|
-
// 查找资源服务数据
|
|
70
|
-
'/rs/logic/getInitData': {
|
|
71
|
-
target: serverRul
|
|
72
|
-
},
|
|
73
|
-
'/rs/logic/getSaleInitData': {
|
|
74
|
-
target: localUrl
|
|
75
|
-
},
|
|
76
|
-
// 用户登录服务地址
|
|
77
|
-
'/rs/user': {
|
|
78
|
-
target: serverRul
|
|
79
|
-
},
|
|
80
|
-
'/rs/path': {
|
|
81
|
-
target: serverRul
|
|
82
|
-
},
|
|
83
|
-
'/rs/data': {
|
|
84
|
-
target: serverRul
|
|
85
|
-
},
|
|
86
|
-
'/rs/license': {
|
|
87
|
-
target: serverRul
|
|
88
|
-
},
|
|
89
|
-
'/rs/db': {
|
|
90
|
-
target: serverRul
|
|
91
|
-
},
|
|
92
|
-
'/excel': {
|
|
93
|
-
target: serverRul
|
|
94
|
-
},
|
|
95
|
-
'/rs/config': {
|
|
96
|
-
target: serverRul
|
|
97
|
-
},
|
|
98
|
-
'/rs/report': {
|
|
99
|
-
target: serverRul
|
|
100
|
-
},
|
|
101
|
-
'/rs/vue': {
|
|
102
|
-
target: serverRul
|
|
103
|
-
},
|
|
104
|
-
'/rs/logic/webHandReverse': {
|
|
105
|
-
target: 'http://localhost:8085'
|
|
106
|
-
},
|
|
107
|
-
'/rs/logic': {
|
|
108
|
-
target: localUrl
|
|
109
|
-
},
|
|
110
|
-
'/rs/entity': {
|
|
111
|
-
target: localUrl
|
|
112
|
-
},
|
|
113
|
-
'/rs/sql': {
|
|
114
|
-
target: localUrl
|
|
115
|
-
},
|
|
116
|
-
'/webmeter': {
|
|
117
|
-
target: serverRul
|
|
118
|
-
},
|
|
119
|
-
'/rs': {
|
|
120
|
-
target: serverRul
|
|
121
|
-
// changeOrigin: true
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
var checkVersion = require('./versionCheck.js')
|
|
3
|
+
checkVersion()
|
|
4
|
+
const [ serverRul, localUrl, v4Url ] = ['http://61.240.138.248:8400/', 'http://61.240.138.248:8400/', 'http://61.240.138.248:8400/']
|
|
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
|
+
|
|
23
|
+
'/rs/file': {
|
|
24
|
+
pathRewrite: {
|
|
25
|
+
'^/rs/file/': '/api/af-revenue/file/'
|
|
26
|
+
},
|
|
27
|
+
target: serverRul
|
|
28
|
+
},
|
|
29
|
+
'/api': {
|
|
30
|
+
target: v4Url
|
|
31
|
+
},
|
|
32
|
+
'/sketch': {
|
|
33
|
+
target: serverRul,
|
|
34
|
+
changeOrigin: true
|
|
35
|
+
},
|
|
36
|
+
'/invoice/rs/logic/getInvoice': {
|
|
37
|
+
target: serverRul
|
|
38
|
+
},
|
|
39
|
+
// '/rs/sql/filemanage_getUserfies':{
|
|
40
|
+
// target: 'http://127.0.0.1:8080/'
|
|
41
|
+
// },
|
|
42
|
+
// '/rs/logic/importNetworkValve':{
|
|
43
|
+
// target: 'http://127.0.0.1:8080/'
|
|
44
|
+
// },
|
|
45
|
+
'/webapps': {
|
|
46
|
+
target: serverRul
|
|
47
|
+
},
|
|
48
|
+
'/rs/sql/singleTable': {
|
|
49
|
+
target: localUrl
|
|
50
|
+
},
|
|
51
|
+
'/invoice': {
|
|
52
|
+
// pathRewrite: {
|
|
53
|
+
// '/invoice/rs/logic': '/logic'
|
|
54
|
+
// },
|
|
55
|
+
target: serverRul
|
|
56
|
+
},
|
|
57
|
+
'/rs/batchSettlement': {
|
|
58
|
+
target: localUrl
|
|
59
|
+
},
|
|
60
|
+
|
|
61
|
+
// 查找资源服务数据
|
|
62
|
+
'/rs/search': {
|
|
63
|
+
target: serverRul
|
|
64
|
+
},
|
|
65
|
+
// 查找资源服务数据
|
|
66
|
+
'/rs/logic/getLogin': {
|
|
67
|
+
target: serverRul
|
|
68
|
+
},
|
|
69
|
+
// 查找资源服务数据
|
|
70
|
+
'/rs/logic/getInitData': {
|
|
71
|
+
target: serverRul
|
|
72
|
+
},
|
|
73
|
+
'/rs/logic/getSaleInitData': {
|
|
74
|
+
target: localUrl
|
|
75
|
+
},
|
|
76
|
+
// 用户登录服务地址
|
|
77
|
+
'/rs/user': {
|
|
78
|
+
target: serverRul
|
|
79
|
+
},
|
|
80
|
+
'/rs/path': {
|
|
81
|
+
target: serverRul
|
|
82
|
+
},
|
|
83
|
+
'/rs/data': {
|
|
84
|
+
target: serverRul
|
|
85
|
+
},
|
|
86
|
+
'/rs/license': {
|
|
87
|
+
target: serverRul
|
|
88
|
+
},
|
|
89
|
+
'/rs/db': {
|
|
90
|
+
target: serverRul
|
|
91
|
+
},
|
|
92
|
+
'/excel': {
|
|
93
|
+
target: serverRul
|
|
94
|
+
},
|
|
95
|
+
'/rs/config': {
|
|
96
|
+
target: serverRul
|
|
97
|
+
},
|
|
98
|
+
'/rs/report': {
|
|
99
|
+
target: serverRul
|
|
100
|
+
},
|
|
101
|
+
'/rs/vue': {
|
|
102
|
+
target: serverRul
|
|
103
|
+
},
|
|
104
|
+
'/rs/logic/webHandReverse': {
|
|
105
|
+
target: 'http://localhost:8085'
|
|
106
|
+
},
|
|
107
|
+
'/rs/logic': {
|
|
108
|
+
target: localUrl
|
|
109
|
+
},
|
|
110
|
+
'/rs/entity': {
|
|
111
|
+
target: localUrl
|
|
112
|
+
},
|
|
113
|
+
'/rs/sql': {
|
|
114
|
+
target: localUrl
|
|
115
|
+
},
|
|
116
|
+
'/webmeter': {
|
|
117
|
+
target: serverRul
|
|
118
|
+
},
|
|
119
|
+
'/rs': {
|
|
120
|
+
target: serverRul
|
|
121
|
+
// changeOrigin: true
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -228,8 +228,8 @@
|
|
|
228
228
|
self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
|
|
229
229
|
}
|
|
230
230
|
self.model.f_meter_type = self.row.f_meter_type
|
|
231
|
-
//
|
|
232
|
-
if ((self.model.
|
|
231
|
+
// 限购检查只检查购气量（不含补气量），限购值限制的是额外购买的气量
|
|
232
|
+
if ((self.model.f_pregasBuy - 0) - (self.maxgas - 0) <= 0) {
|
|
233
233
|
if ((self.model.f_fill_gas - 0) < (self.model.f_pregas - 0)) {
|
|
234
234
|
// 超出【补气气量不符】部分走划价
|
|
235
235
|
let gas = self.model.f_pregas - self.model.f_fill_gas
|
|
@@ -250,6 +250,13 @@
|
|
|
250
250
|
self.model.f_collection = 0
|
|
251
251
|
}
|
|
252
252
|
self.remstrgas()
|
|
253
|
+
} else {
|
|
254
|
+
self.$showAlert(`购气量不能超过限购值${self.maxgas}方`, 'warning', 3000)
|
|
255
|
+
self.model.f_preamount = 0
|
|
256
|
+
self.model.f_totalcost = 0
|
|
257
|
+
self.model.f_collection = 0
|
|
258
|
+
self.model.f_pregasBuy = 0
|
|
259
|
+
self.model.f_pregas = self.model.f_fill_gas
|
|
253
260
|
}
|
|
254
261
|
}
|
|
255
262
|
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
File without changes
|