sale-client 4.4.1 → 4.4.2
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/.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/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/build/dev-server.js +77 -71
- package/package.json +1 -1
- package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue +1 -1
- package/src/filiale/meihekou/GasPriceUser.vue +503 -503
- package/src/filiale/meihekou/UserPriceChangeManage.vue +709 -709
- package/src/filiale/ronghao/meterinfodetail.vue +482 -482
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/build/dev-server.js
CHANGED
|
@@ -1,71 +1,77 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
var checkVersion = require('./versionCheck.js')
|
|
3
|
-
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl ] = ['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
|
-
// '/api/af-revenue/batchdeduction/all': {
|
|
23
|
-
// pathRewrite: {
|
|
24
|
-
// '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
|
|
25
|
-
// },
|
|
26
|
-
// target: localUrl
|
|
27
|
-
// },
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
// '/api/af-revenue/file': {
|
|
35
|
-
// // pathRewrite: {
|
|
36
|
-
// // '/api/af-revenue/file': '/file'
|
|
37
|
-
// // },
|
|
38
|
-
// target: localUrl
|
|
39
|
-
// },
|
|
40
|
-
// '/weixin2/rs':{
|
|
41
|
-
//
|
|
42
|
-
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
|
-
// },
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
'/rs/pay': {
|
|
51
|
-
target: 'http://localhost:8080'
|
|
52
|
-
},
|
|
53
|
-
// '/api/af-revenue': {
|
|
54
|
-
// pathRewrite: {
|
|
55
|
-
// '/api/af-revenue': '/'
|
|
56
|
-
// },
|
|
57
|
-
// target: "http://localhost:9026"
|
|
58
|
-
// },
|
|
59
|
-
'/api': {
|
|
60
|
-
target: serverRul
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
1
|
+
var path = require('path')
|
|
2
|
+
var checkVersion = require('./versionCheck.js')
|
|
3
|
+
checkVersion()
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://localhost:9026']
|
|
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/af-revenue/batchdeduction/all': {
|
|
23
|
+
// pathRewrite: {
|
|
24
|
+
// '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
|
|
25
|
+
// },
|
|
26
|
+
// target: localUrl
|
|
27
|
+
// },
|
|
28
|
+
'/api/af-revenue/logic': {
|
|
29
|
+
pathRewrite: {
|
|
30
|
+
'/api/af-revenue/logic': '/logic'
|
|
31
|
+
},
|
|
32
|
+
target: localUrl
|
|
33
|
+
},
|
|
34
|
+
// '/api/af-revenue/file': {
|
|
35
|
+
// // pathRewrite: {
|
|
36
|
+
// // '/api/af-revenue/file': '/file'
|
|
37
|
+
// // },
|
|
38
|
+
// target: localUrl
|
|
39
|
+
// },
|
|
40
|
+
// '/weixin2/rs':{
|
|
41
|
+
//
|
|
42
|
+
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
|
+
// },
|
|
44
|
+
'/api/af-revenue/sql': {
|
|
45
|
+
pathRewrite: {
|
|
46
|
+
'/api/af-revenue/sql': '/sql'
|
|
47
|
+
},
|
|
48
|
+
target: localUrl
|
|
49
|
+
},
|
|
50
|
+
'/rs/pay': {
|
|
51
|
+
target: 'http://localhost:8080'
|
|
52
|
+
},
|
|
53
|
+
// '/api/af-revenue': {
|
|
54
|
+
// pathRewrite: {
|
|
55
|
+
// '/api/af-revenue': '/'
|
|
56
|
+
// },
|
|
57
|
+
// target: "http://localhost:9026"
|
|
58
|
+
// },
|
|
59
|
+
'/api': {
|
|
60
|
+
target: serverRul,
|
|
61
|
+
secure: false,
|
|
62
|
+
changeOrigin: true,
|
|
63
|
+
},
|
|
64
|
+
'/resource': {
|
|
65
|
+
target: serverRul,
|
|
66
|
+
secure: false,
|
|
67
|
+
changeOrigin: true
|
|
68
|
+
},
|
|
69
|
+
'/rs': {
|
|
70
|
+
target: serverRul,
|
|
71
|
+
secure: false,
|
|
72
|
+
changeOrigin: true,
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -331,7 +331,7 @@ export default {
|
|
|
331
331
|
this.cancelid = megrow.id
|
|
332
332
|
},
|
|
333
333
|
async confirmcenta () {
|
|
334
|
-
let sql = `update t_instruct set f_cancel_inputtor = ${this.$login.f.name}, f_cancel_inputtor_id = ${this.$login.f.id},f_comments = ${this.cancelreason},f_instruct_state = '取消发送' WHERE id = ${this.cancelid}`
|
|
334
|
+
let sql = `update t_instruct set f_cancel_inputtor = '${this.$login.f.name}', f_cancel_inputtor_id = '${this.$login.f.id}',f_comments = '${this.cancelreason}',f_instruct_state = '取消发送' WHERE id = '${this.cancelid}'`
|
|
335
335
|
await this.$resetpost('api/af-revenue/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
|
|
336
336
|
this.handcental = false
|
|
337
337
|
this.$refs.paged.$refs.criteria.search()
|