sale-client 3.6.25 → 3.6.26
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 +85 -85
- package/package.json +1 -1
- package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue +1 -1
- package/src/components/revenue/Common/EticketPrint.vue +2 -3
- package/src/components/revenue/comprehen/Bill/Eticket/EticketRecordList.vue +1 -6
- package/src/filiale/qianneng/eticket/EticketRecordList.vue +309 -309
- package/src/filiale/xiangyun/machineChargeQuery1.vue +1 -1
- package/src/plugins/CardService.js +2111 -2110
package/build/dev-server.js
CHANGED
|
@@ -1,85 +1,85 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
const [localUrl, serverRul] = ['
|
|
3
|
-
var merge = require('webpack-merge')
|
|
4
|
-
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
-
var devConfig = {
|
|
6
|
-
devServer: {
|
|
7
|
-
contentBase: path.join(__dirname, 'src'),
|
|
8
|
-
hot: true,
|
|
9
|
-
publicPath: baseConfig.output.publicPath,
|
|
10
|
-
historyApiFallback: true,
|
|
11
|
-
host: '127.0.0.1',
|
|
12
|
-
port: 8089,
|
|
13
|
-
open: true,
|
|
14
|
-
stats: {
|
|
15
|
-
colors: false, // 配置控制台输出彩色日志
|
|
16
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
17
|
-
children: false // 不输出子模块构建信息
|
|
18
|
-
},
|
|
19
|
-
proxy: {
|
|
20
|
-
'/rs/file': {
|
|
21
|
-
target: serverRul
|
|
22
|
-
},
|
|
23
|
-
'/invoice': {
|
|
24
|
-
target: serverRul
|
|
25
|
-
},
|
|
26
|
-
// 查找资源服务数据
|
|
27
|
-
'/rs/search': {
|
|
28
|
-
target: serverRul
|
|
29
|
-
},
|
|
30
|
-
// 查找资源服务数据
|
|
31
|
-
'/rs/logic/getLogin': {
|
|
32
|
-
target: serverRul
|
|
33
|
-
},
|
|
34
|
-
// 查找资源服务数据
|
|
35
|
-
'/rs/logic/getInitData': {
|
|
36
|
-
target: serverRul
|
|
37
|
-
},
|
|
38
|
-
'/rs/logic/getSaleInitData': {
|
|
39
|
-
target: serverRul
|
|
40
|
-
},
|
|
41
|
-
// 用户登录服务地址
|
|
42
|
-
'/rs/user': {
|
|
43
|
-
target: serverRul
|
|
44
|
-
},
|
|
45
|
-
'/rs/path': {
|
|
46
|
-
target: serverRul
|
|
47
|
-
},
|
|
48
|
-
'/rs/data': {
|
|
49
|
-
target: serverRul
|
|
50
|
-
},
|
|
51
|
-
'/rs/license': {
|
|
52
|
-
target: serverRul
|
|
53
|
-
},
|
|
54
|
-
'/rs/db': {
|
|
55
|
-
target: serverRul
|
|
56
|
-
},
|
|
57
|
-
'/excel': {
|
|
58
|
-
target: serverRul
|
|
59
|
-
},
|
|
60
|
-
'/rs/config': {
|
|
61
|
-
target: serverRul
|
|
62
|
-
},
|
|
63
|
-
'/rs/report': {
|
|
64
|
-
target: serverRul
|
|
65
|
-
},
|
|
66
|
-
'/rs/vue': {
|
|
67
|
-
target: serverRul
|
|
68
|
-
},
|
|
69
|
-
'/rs/logic': {
|
|
70
|
-
target: localUrl
|
|
71
|
-
},
|
|
72
|
-
'/rs/sql': {
|
|
73
|
-
target: localUrl
|
|
74
|
-
},
|
|
75
|
-
'/webmeter': {
|
|
76
|
-
target: serverRul
|
|
77
|
-
},
|
|
78
|
-
'/rs': {
|
|
79
|
-
target: serverRul
|
|
80
|
-
// changeOrigin: true
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn:8400/']
|
|
3
|
+
var merge = require('webpack-merge')
|
|
4
|
+
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
+
var devConfig = {
|
|
6
|
+
devServer: {
|
|
7
|
+
contentBase: path.join(__dirname, 'src'),
|
|
8
|
+
hot: true,
|
|
9
|
+
publicPath: baseConfig.output.publicPath,
|
|
10
|
+
historyApiFallback: true,
|
|
11
|
+
host: '127.0.0.1',
|
|
12
|
+
port: 8089,
|
|
13
|
+
open: true,
|
|
14
|
+
stats: {
|
|
15
|
+
colors: false, // 配置控制台输出彩色日志
|
|
16
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
17
|
+
children: false // 不输出子模块构建信息
|
|
18
|
+
},
|
|
19
|
+
proxy: {
|
|
20
|
+
'/rs/file': {
|
|
21
|
+
target: serverRul
|
|
22
|
+
},
|
|
23
|
+
'/invoice': {
|
|
24
|
+
target: serverRul
|
|
25
|
+
},
|
|
26
|
+
// 查找资源服务数据
|
|
27
|
+
'/rs/search': {
|
|
28
|
+
target: serverRul
|
|
29
|
+
},
|
|
30
|
+
// 查找资源服务数据
|
|
31
|
+
'/rs/logic/getLogin': {
|
|
32
|
+
target: serverRul
|
|
33
|
+
},
|
|
34
|
+
// 查找资源服务数据
|
|
35
|
+
'/rs/logic/getInitData': {
|
|
36
|
+
target: serverRul
|
|
37
|
+
},
|
|
38
|
+
'/rs/logic/getSaleInitData': {
|
|
39
|
+
target: serverRul
|
|
40
|
+
},
|
|
41
|
+
// 用户登录服务地址
|
|
42
|
+
'/rs/user': {
|
|
43
|
+
target: serverRul
|
|
44
|
+
},
|
|
45
|
+
'/rs/path': {
|
|
46
|
+
target: serverRul
|
|
47
|
+
},
|
|
48
|
+
'/rs/data': {
|
|
49
|
+
target: serverRul
|
|
50
|
+
},
|
|
51
|
+
'/rs/license': {
|
|
52
|
+
target: serverRul
|
|
53
|
+
},
|
|
54
|
+
'/rs/db': {
|
|
55
|
+
target: serverRul
|
|
56
|
+
},
|
|
57
|
+
'/excel': {
|
|
58
|
+
target: serverRul
|
|
59
|
+
},
|
|
60
|
+
'/rs/config': {
|
|
61
|
+
target: serverRul
|
|
62
|
+
},
|
|
63
|
+
'/rs/report': {
|
|
64
|
+
target: serverRul
|
|
65
|
+
},
|
|
66
|
+
'/rs/vue': {
|
|
67
|
+
target: serverRul
|
|
68
|
+
},
|
|
69
|
+
'/rs/logic': {
|
|
70
|
+
target: localUrl
|
|
71
|
+
},
|
|
72
|
+
'/rs/sql': {
|
|
73
|
+
target: localUrl
|
|
74
|
+
},
|
|
75
|
+
'/webmeter': {
|
|
76
|
+
target: serverRul
|
|
77
|
+
},
|
|
78
|
+
'/rs': {
|
|
79
|
+
target: serverRul
|
|
80
|
+
// changeOrigin: true
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -254,7 +254,7 @@ export default {
|
|
|
254
254
|
},
|
|
255
255
|
methods: {
|
|
256
256
|
async instructWriteCard (row) {
|
|
257
|
-
let res = await this.$CardService.instructWriteCard(row)
|
|
257
|
+
let res = await this.$CardService.instructWriteCard(this.row)
|
|
258
258
|
if (res) {
|
|
259
259
|
let sql = `update t_instruct set f_instruct_state = '执行成功' WHERE id = ${row.id}`
|
|
260
260
|
await this.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
|
|
@@ -49,11 +49,10 @@ export default {
|
|
|
49
49
|
},
|
|
50
50
|
/** 冲红
|
|
51
51
|
* */
|
|
52
|
-
async rushRedInvoice (
|
|
52
|
+
async rushRedInvoice (data) {
|
|
53
53
|
try {
|
|
54
54
|
// 否则正常打票
|
|
55
|
-
let
|
|
56
|
-
let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({eticket_id: ticket_id}, {invoice_type: 1}), {
|
|
55
|
+
let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
|
|
57
56
|
resolveMsg: null,
|
|
58
57
|
rejectMsg: '发票冲红失败!!'
|
|
59
58
|
})
|
|
@@ -215,13 +215,8 @@ export default {
|
|
|
215
215
|
this.model.search(args.condition, args.model)
|
|
216
216
|
},
|
|
217
217
|
async confirm () {
|
|
218
|
-
// 修改发票状态
|
|
219
|
-
let res = await this.$resetpost('rs/logic/correctEticket', {id: this.row.id, bz: this.bz}, {
|
|
220
|
-
resolveMsg: null,
|
|
221
|
-
rejectMsg: '保存开票信息失败'
|
|
222
|
-
})
|
|
223
218
|
this.eticket_show = true
|
|
224
|
-
await this.$refs.eticketbill.rushRedInvoice(
|
|
219
|
+
await this.$refs.eticketbill.rushRedInvoice({id: this.row.f_sell_id, eticket_id: this.row.id, bz: this.bz})
|
|
225
220
|
},
|
|
226
221
|
async fp_search (row) {
|
|
227
222
|
this.eticket_show = true
|