sale-client 3.5.216 → 3.5.217
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 +97 -97
- package/package.json +1 -1
- package/src/components/charge/business/CardMeterCenter.vue +3 -0
- package/src/components/charge/business/ShowCardSellGas.vue +3 -0
- package/src/components/revenue/base/rightview/CardList.vue +10 -2
- package/src/filiale/wenxi/MeterinfoTest.vue +992 -0
- package/src/filiale/wenxi/UserDeviceInfoTest.vue +395 -0
- package/src/filiale/wenxi/UserEssentialInfoTest.vue +337 -0
- package/src/filiale/wenxi/UserMeterInfoTest.vue +156 -0
- package/src/filiale/wenxi/sale.js +4 -0
package/build/dev-server.js
CHANGED
|
@@ -1,97 +1,97 @@
|
|
|
1
|
-
var webpack = require('webpack')
|
|
2
|
-
var config = require('./webpack.dev.conf')
|
|
3
|
-
var path = require('path')
|
|
4
|
-
var webpackDevServer = require('webpack-dev-server')
|
|
5
|
-
var compiler = webpack(config)
|
|
6
|
-
// 自己改了这里不要提交 来回覆盖挺麻烦的
|
|
7
|
-
const [localUrl, serverRul] = ['http://
|
|
8
|
-
const port = 8089
|
|
9
|
-
|
|
10
|
-
// eslint-disable-next-line new-cap
|
|
11
|
-
var server = new webpackDevServer(compiler, {
|
|
12
|
-
contentBase: path.join(__dirname, 'src'),
|
|
13
|
-
hot: true,
|
|
14
|
-
publicPath: config.output.publicPath,
|
|
15
|
-
historyApiFallback: true,
|
|
16
|
-
open: true,
|
|
17
|
-
stats: {
|
|
18
|
-
all: false, // 关闭全部日志
|
|
19
|
-
colors: true, // 配置控制台输出彩色日志
|
|
20
|
-
errors: true, // 输出构建错误日志
|
|
21
|
-
warnings: true, // 输出构建警告日志
|
|
22
|
-
moduleTrace: true, // 显示 module 路径信息
|
|
23
|
-
errorDetails: true, // 显示构建错误的详细信息
|
|
24
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
25
|
-
entrypoints: false, // 不输出入口文件信息
|
|
26
|
-
children: false, // 不输出子模块构建信息
|
|
27
|
-
performance: true // 输出性能提示
|
|
28
|
-
},
|
|
29
|
-
proxy: {
|
|
30
|
-
'/rs/file': {
|
|
31
|
-
target: serverRul
|
|
32
|
-
},
|
|
33
|
-
// 查找资源服务数据
|
|
34
|
-
'/rs/search': {
|
|
35
|
-
target: serverRul
|
|
36
|
-
},
|
|
37
|
-
// 查找资源服务数据
|
|
38
|
-
'/rs/logic/getLogin': {
|
|
39
|
-
target: serverRul
|
|
40
|
-
},
|
|
41
|
-
// 查找资源服务数据
|
|
42
|
-
'/rs/logic/getInitData': {
|
|
43
|
-
target: serverRul
|
|
44
|
-
},
|
|
45
|
-
'/rs/logic/getSaleInitData': {
|
|
46
|
-
target: serverRul
|
|
47
|
-
},
|
|
48
|
-
// 用户登录服务地址
|
|
49
|
-
'/rs/user': {
|
|
50
|
-
target: serverRul
|
|
51
|
-
},
|
|
52
|
-
'/rs/path': {
|
|
53
|
-
target: serverRul
|
|
54
|
-
},
|
|
55
|
-
'/rs/data': {
|
|
56
|
-
target: serverRul
|
|
57
|
-
},
|
|
58
|
-
'/rs/license': {
|
|
59
|
-
target: serverRul
|
|
60
|
-
},
|
|
61
|
-
'/rs/db': {
|
|
62
|
-
target: serverRul
|
|
63
|
-
},
|
|
64
|
-
'/excel': {
|
|
65
|
-
target: serverRul
|
|
66
|
-
},
|
|
67
|
-
'/rs/config': {
|
|
68
|
-
target: serverRul
|
|
69
|
-
},
|
|
70
|
-
'/rs/report': {
|
|
71
|
-
target: serverRul
|
|
72
|
-
},
|
|
73
|
-
'/rs/vue': {
|
|
74
|
-
target: serverRul
|
|
75
|
-
},
|
|
76
|
-
'/rs/logic': {
|
|
77
|
-
target: localUrl
|
|
78
|
-
},
|
|
79
|
-
'/rs/sql': {
|
|
80
|
-
target: localUrl
|
|
81
|
-
},
|
|
82
|
-
'/webmeter': {
|
|
83
|
-
target: serverRul
|
|
84
|
-
},
|
|
85
|
-
'/rs': {
|
|
86
|
-
target: serverRul
|
|
87
|
-
// changeOrigin: true
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
})
|
|
91
|
-
server.listen(port, 'localhost', function (err) {
|
|
92
|
-
if (err) {
|
|
93
|
-
console.log(err)
|
|
94
|
-
return
|
|
95
|
-
}
|
|
96
|
-
console.log('Listening at http://localhost:' + port)
|
|
97
|
-
})
|
|
1
|
+
var webpack = require('webpack')
|
|
2
|
+
var config = require('./webpack.dev.conf')
|
|
3
|
+
var path = require('path')
|
|
4
|
+
var webpackDevServer = require('webpack-dev-server')
|
|
5
|
+
var compiler = webpack(config)
|
|
6
|
+
// 自己改了这里不要提交 来回覆盖挺麻烦的
|
|
7
|
+
const [localUrl, serverRul] = ['http://59.48.150.94:8300/', 'http://59.48.150.94:8300/']
|
|
8
|
+
const port = 8089
|
|
9
|
+
|
|
10
|
+
// eslint-disable-next-line new-cap
|
|
11
|
+
var server = new webpackDevServer(compiler, {
|
|
12
|
+
contentBase: path.join(__dirname, 'src'),
|
|
13
|
+
hot: true,
|
|
14
|
+
publicPath: config.output.publicPath,
|
|
15
|
+
historyApiFallback: true,
|
|
16
|
+
open: true,
|
|
17
|
+
stats: {
|
|
18
|
+
all: false, // 关闭全部日志
|
|
19
|
+
colors: true, // 配置控制台输出彩色日志
|
|
20
|
+
errors: true, // 输出构建错误日志
|
|
21
|
+
warnings: true, // 输出构建警告日志
|
|
22
|
+
moduleTrace: true, // 显示 module 路径信息
|
|
23
|
+
errorDetails: true, // 显示构建错误的详细信息
|
|
24
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
25
|
+
entrypoints: false, // 不输出入口文件信息
|
|
26
|
+
children: false, // 不输出子模块构建信息
|
|
27
|
+
performance: true // 输出性能提示
|
|
28
|
+
},
|
|
29
|
+
proxy: {
|
|
30
|
+
'/rs/file': {
|
|
31
|
+
target: serverRul
|
|
32
|
+
},
|
|
33
|
+
// 查找资源服务数据
|
|
34
|
+
'/rs/search': {
|
|
35
|
+
target: serverRul
|
|
36
|
+
},
|
|
37
|
+
// 查找资源服务数据
|
|
38
|
+
'/rs/logic/getLogin': {
|
|
39
|
+
target: serverRul
|
|
40
|
+
},
|
|
41
|
+
// 查找资源服务数据
|
|
42
|
+
'/rs/logic/getInitData': {
|
|
43
|
+
target: serverRul
|
|
44
|
+
},
|
|
45
|
+
'/rs/logic/getSaleInitData': {
|
|
46
|
+
target: serverRul
|
|
47
|
+
},
|
|
48
|
+
// 用户登录服务地址
|
|
49
|
+
'/rs/user': {
|
|
50
|
+
target: serverRul
|
|
51
|
+
},
|
|
52
|
+
'/rs/path': {
|
|
53
|
+
target: serverRul
|
|
54
|
+
},
|
|
55
|
+
'/rs/data': {
|
|
56
|
+
target: serverRul
|
|
57
|
+
},
|
|
58
|
+
'/rs/license': {
|
|
59
|
+
target: serverRul
|
|
60
|
+
},
|
|
61
|
+
'/rs/db': {
|
|
62
|
+
target: serverRul
|
|
63
|
+
},
|
|
64
|
+
'/excel': {
|
|
65
|
+
target: serverRul
|
|
66
|
+
},
|
|
67
|
+
'/rs/config': {
|
|
68
|
+
target: serverRul
|
|
69
|
+
},
|
|
70
|
+
'/rs/report': {
|
|
71
|
+
target: serverRul
|
|
72
|
+
},
|
|
73
|
+
'/rs/vue': {
|
|
74
|
+
target: serverRul
|
|
75
|
+
},
|
|
76
|
+
'/rs/logic': {
|
|
77
|
+
target: localUrl
|
|
78
|
+
},
|
|
79
|
+
'/rs/sql': {
|
|
80
|
+
target: localUrl
|
|
81
|
+
},
|
|
82
|
+
'/webmeter': {
|
|
83
|
+
target: serverRul
|
|
84
|
+
},
|
|
85
|
+
'/rs': {
|
|
86
|
+
target: serverRul
|
|
87
|
+
// changeOrigin: true
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
})
|
|
91
|
+
server.listen(port, 'localhost', function (err) {
|
|
92
|
+
if (err) {
|
|
93
|
+
console.log(err)
|
|
94
|
+
return
|
|
95
|
+
}
|
|
96
|
+
console.log('Listening at http://localhost:' + port)
|
|
97
|
+
})
|
package/package.json
CHANGED
|
@@ -364,6 +364,9 @@
|
|
|
364
364
|
self.billData.url = 'rs/report/fmy_card_bill'
|
|
365
365
|
}
|
|
366
366
|
}
|
|
367
|
+
if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
|
|
368
|
+
self.billData.url = 'rs/report/fee_card_bill'
|
|
369
|
+
}
|
|
367
370
|
if (self.config.hasBillManage) {
|
|
368
371
|
// 启用发票管理，获取票据管理中的票号并存储记录
|
|
369
372
|
self.row.id = res
|
|
@@ -381,6 +381,9 @@ let initCardGen = async function (self) {
|
|
|
381
381
|
self.billData.url = 'rs/report/fmy_sendCard_bill'
|
|
382
382
|
}
|
|
383
383
|
}
|
|
384
|
+
if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
|
|
385
|
+
self.billData.url = 'rs/report/fee_sendCard_bill'
|
|
386
|
+
}
|
|
384
387
|
if (self.config.hasBillManage) {
|
|
385
388
|
// 启用发票管理，获取票据管理中的票号并存储记录 d
|
|
386
389
|
self.row.id = res.data.id
|
|
@@ -446,13 +446,21 @@
|
|
|
446
446
|
if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
|
|
447
447
|
name = 'rs/report/fmy_sendCard_bill'
|
|
448
448
|
} else {
|
|
449
|
-
|
|
449
|
+
if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
|
|
450
|
+
name = 'rs/report/fee_sendCard_bill'
|
|
451
|
+
} else {
|
|
452
|
+
name = 'rs/report/sendCard_bill'
|
|
453
|
+
}
|
|
450
454
|
}
|
|
451
455
|
} else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
|
|
452
456
|
if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
|
|
453
457
|
name = 'rs/report/fmy_card_bill'
|
|
454
458
|
} else {
|
|
455
|
-
|
|
459
|
+
if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
|
|
460
|
+
name = 'rs/report/fee_card_bill'
|
|
461
|
+
} else {
|
|
462
|
+
name = 'rs/report/card_bill'
|
|
463
|
+
}
|
|
456
464
|
}
|
|
457
465
|
} else if (type === '预存缴费') {
|
|
458
466
|
name = 'rs/report/pre_sell'
|