sale-client 3.4.155 → 3.4.157
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 +160 -160
- package/package.json +1 -1
- package/src/components/FilesManage/UserGeneralInfoTest.vue +2 -1
- package/src/components/charge/business/ShowCardSellGas.vue +5 -0
- package/src/components/revenue/base/rightview/CardList.vue +5 -1
- package/src/filiale/qianneng/CardList.vue +1 -1
- package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue +15 -6
- package/src/filiale/qianneng/gasLossRecords.vue +59 -5
- package/src/filiale/zhongyi/ChargeRecordQuery.vue +100 -0
- package/src/filiale/zhongyi/MeterinfoTest.vue +921 -921
- package/src/filiale/zhongyi/Userinfo.vue +180 -0
- package/src/filiale/zhongyi/refund/IOTRefund.vue +244 -0
- package/src/filiale/zhongyi/refund/RefundManage.vue +28 -0
- package/src/filiale/zhongyi/refund/machineRefund.vue +200 -0
- package/src/filiale/zhongyi/sale.js +12 -6
- package/src/main.js +1 -1
- package/src/sale.js +5 -5
package/build/dev-server.js
CHANGED
|
@@ -1,160 +1,160 @@
|
|
|
1
|
-
var express = require('express')
|
|
2
|
-
var webpack = require('webpack')
|
|
3
|
-
var config = require('./webpack.dev.conf')
|
|
4
|
-
var proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
-
// var httpProxy = require('http-proxy')
|
|
6
|
-
|
|
7
|
-
var app = express()
|
|
8
|
-
var compiler = webpack(config)
|
|
9
|
-
// var proxy = httpProxy.createProxyServer()
|
|
10
|
-
|
|
11
|
-
// Define HTTP proxies to your custom API backend
|
|
12
|
-
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
-
var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
|
|
14
|
-
// 公司测试服务
|
|
15
|
-
var fuwu = 'http://
|
|
16
|
-
//铜川正式
|
|
17
|
-
// var fuwu = 'http://61.134.55.234:9999/'
|
|
18
|
-
//铜川测试
|
|
19
|
-
// var fuwu = 'http://61.134.55.234:9999/'
|
|
20
|
-
// var fuwu = 'http://60.222.250.39:8300/'
|
|
21
|
-
//韶关
|
|
22
|
-
// var fuwu = 'http://119.146.1.106:8300/'
|
|
23
|
-
// 巩义测试服务
|
|
24
|
-
// var fuwu = 'http://192.168.0.227:8400'
|
|
25
|
-
// 燎原测试服务
|
|
26
|
-
// var fuwu = 'http://121.41.19.238:8400 '
|
|
27
|
-
// var fuwu = 'http://121.41.19.238:9001/'
|
|
28
|
-
|
|
29
|
-
// var fuwu = 'http://139.214.92.34:8301/'
|
|
30
|
-
|
|
31
|
-
var proxyTable = {
|
|
32
|
-
'/rs/logic/saleExport': {
|
|
33
|
-
target: fuwu
|
|
34
|
-
},
|
|
35
|
-
'/rs/logic/saleGetExportProgress': {
|
|
36
|
-
target: fuwu
|
|
37
|
-
},
|
|
38
|
-
'/files': {
|
|
39
|
-
target: fuwu
|
|
40
|
-
},
|
|
41
|
-
// 查找资源服务数据
|
|
42
|
-
'/rs/search': {
|
|
43
|
-
target: fuwu
|
|
44
|
-
},
|
|
45
|
-
// 查找资源服务数据
|
|
46
|
-
'/rs/logic/getLogin': {
|
|
47
|
-
target: fuwu
|
|
48
|
-
},
|
|
49
|
-
// 查找资源服务数据
|
|
50
|
-
'/rs/logic/getInitData': {
|
|
51
|
-
target: fuwu
|
|
52
|
-
},
|
|
53
|
-
'/rs/logic/getSaleInitData': {
|
|
54
|
-
target: fuwu
|
|
55
|
-
},
|
|
56
|
-
'/invoice':{
|
|
57
|
-
target: fuwu
|
|
58
|
-
},
|
|
59
|
-
// 用户登录服务地址
|
|
60
|
-
'/rs/user': {
|
|
61
|
-
target: fuwu
|
|
62
|
-
},
|
|
63
|
-
'/rs/path/getParams': {
|
|
64
|
-
target: fuwu
|
|
65
|
-
},
|
|
66
|
-
'/rs/data': {
|
|
67
|
-
target: fuwu
|
|
68
|
-
},
|
|
69
|
-
'/rs/license': {
|
|
70
|
-
target: fuwu
|
|
71
|
-
},
|
|
72
|
-
'/rs/db': {
|
|
73
|
-
target: fuwu
|
|
74
|
-
},
|
|
75
|
-
'/excel': {
|
|
76
|
-
target: fuwu
|
|
77
|
-
},
|
|
78
|
-
'/rs/config': {
|
|
79
|
-
target: fuwu
|
|
80
|
-
},
|
|
81
|
-
'/rs/sql/getLicenseById': {
|
|
82
|
-
target: fuwu
|
|
83
|
-
},
|
|
84
|
-
'/rs/sql/manage_getarealist': {
|
|
85
|
-
target: fuwu
|
|
86
|
-
},
|
|
87
|
-
'/rs/sql/manage_getstreetlist': {
|
|
88
|
-
target: fuwu
|
|
89
|
-
},
|
|
90
|
-
'/rs/report': {
|
|
91
|
-
target: 'http://121.36.106.17:8400/'
|
|
92
|
-
},
|
|
93
|
-
'/rs/vue': {
|
|
94
|
-
target: fuwu
|
|
95
|
-
},
|
|
96
|
-
'/webmeter': {
|
|
97
|
-
target: 'http://192.168.50.4:8450'
|
|
98
|
-
},
|
|
99
|
-
'/rs': {
|
|
100
|
-
// target: 'http://192.168.30.63:8081/'
|
|
101
|
-
target: 'http://
|
|
102
|
-
// target:fuwu
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
107
|
-
publicPath: config.output.publicPath,
|
|
108
|
-
stats: {
|
|
109
|
-
colors: true,
|
|
110
|
-
chunks: false
|
|
111
|
-
}
|
|
112
|
-
})
|
|
113
|
-
|
|
114
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
115
|
-
// force page reload when html-webpack-plugin template changes
|
|
116
|
-
compiler.plugin('compilation', function (compilation) {
|
|
117
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
118
|
-
hotMiddleware.publish({action: 'reload'})
|
|
119
|
-
cb()
|
|
120
|
-
})
|
|
121
|
-
})
|
|
122
|
-
|
|
123
|
-
// proxy api requests
|
|
124
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
125
|
-
var options = proxyTable[context]
|
|
126
|
-
if (typeof options === 'string') {
|
|
127
|
-
options = {target: options}
|
|
128
|
-
}
|
|
129
|
-
app.use(proxyMiddleware(context, options))
|
|
130
|
-
})
|
|
131
|
-
|
|
132
|
-
// handle fallback for HTML5 history API
|
|
133
|
-
app.use(require('connect-history-api-fallback')())
|
|
134
|
-
// app.use(function (req, res, next) {
|
|
135
|
-
// res.header('Access-Control-Allow-Origin', '*')
|
|
136
|
-
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
137
|
-
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
138
|
-
// res.header('X-Powered-By', '3,2,1')
|
|
139
|
-
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
140
|
-
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
141
|
-
// next()
|
|
142
|
-
// })
|
|
143
|
-
|
|
144
|
-
// serve webpack bundle output
|
|
145
|
-
app.use(devMiddleware)
|
|
146
|
-
|
|
147
|
-
// enable hot-reload and state-preserving
|
|
148
|
-
// compilation error display
|
|
149
|
-
app.use(hotMiddleware)
|
|
150
|
-
|
|
151
|
-
// serve pure static assets
|
|
152
|
-
app.use('/static', express.static('./static'))
|
|
153
|
-
|
|
154
|
-
module.exports = app.listen(8089, function (err) {
|
|
155
|
-
if (err) {
|
|
156
|
-
console.log(err)
|
|
157
|
-
return
|
|
158
|
-
}
|
|
159
|
-
console.log('Listening at http://localhost:8089')
|
|
160
|
-
})
|
|
1
|
+
var express = require('express')
|
|
2
|
+
var webpack = require('webpack')
|
|
3
|
+
var config = require('./webpack.dev.conf')
|
|
4
|
+
var proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
+
// var httpProxy = require('http-proxy')
|
|
6
|
+
|
|
7
|
+
var app = express()
|
|
8
|
+
var compiler = webpack(config)
|
|
9
|
+
// var proxy = httpProxy.createProxyServer()
|
|
10
|
+
|
|
11
|
+
// Define HTTP proxies to your custom API backend
|
|
12
|
+
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
+
var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
|
|
14
|
+
// 公司测试服务
|
|
15
|
+
var fuwu = 'http://121.36.106.17:8400/'
|
|
16
|
+
//铜川正式
|
|
17
|
+
// var fuwu = 'http://61.134.55.234:9999/'
|
|
18
|
+
//铜川测试
|
|
19
|
+
// var fuwu = 'http://61.134.55.234:9999/'
|
|
20
|
+
// var fuwu = 'http://60.222.250.39:8300/'
|
|
21
|
+
//韶关
|
|
22
|
+
// var fuwu = 'http://119.146.1.106:8300/'
|
|
23
|
+
// 巩义测试服务
|
|
24
|
+
// var fuwu = 'http://192.168.0.227:8400'
|
|
25
|
+
// 燎原测试服务
|
|
26
|
+
// var fuwu = 'http://121.41.19.238:8400 '
|
|
27
|
+
// var fuwu = 'http://121.41.19.238:9001/'
|
|
28
|
+
|
|
29
|
+
// var fuwu = 'http://139.214.92.34:8301/'
|
|
30
|
+
|
|
31
|
+
var proxyTable = {
|
|
32
|
+
'/rs/logic/saleExport': {
|
|
33
|
+
target: fuwu
|
|
34
|
+
},
|
|
35
|
+
'/rs/logic/saleGetExportProgress': {
|
|
36
|
+
target: fuwu
|
|
37
|
+
},
|
|
38
|
+
'/files': {
|
|
39
|
+
target: fuwu
|
|
40
|
+
},
|
|
41
|
+
// 查找资源服务数据
|
|
42
|
+
'/rs/search': {
|
|
43
|
+
target: fuwu
|
|
44
|
+
},
|
|
45
|
+
// 查找资源服务数据
|
|
46
|
+
'/rs/logic/getLogin': {
|
|
47
|
+
target: fuwu
|
|
48
|
+
},
|
|
49
|
+
// 查找资源服务数据
|
|
50
|
+
'/rs/logic/getInitData': {
|
|
51
|
+
target: fuwu
|
|
52
|
+
},
|
|
53
|
+
'/rs/logic/getSaleInitData': {
|
|
54
|
+
target: fuwu
|
|
55
|
+
},
|
|
56
|
+
'/invoice':{
|
|
57
|
+
target: fuwu
|
|
58
|
+
},
|
|
59
|
+
// 用户登录服务地址
|
|
60
|
+
'/rs/user': {
|
|
61
|
+
target: fuwu
|
|
62
|
+
},
|
|
63
|
+
'/rs/path/getParams': {
|
|
64
|
+
target: fuwu
|
|
65
|
+
},
|
|
66
|
+
'/rs/data': {
|
|
67
|
+
target: fuwu
|
|
68
|
+
},
|
|
69
|
+
'/rs/license': {
|
|
70
|
+
target: fuwu
|
|
71
|
+
},
|
|
72
|
+
'/rs/db': {
|
|
73
|
+
target: fuwu
|
|
74
|
+
},
|
|
75
|
+
'/excel': {
|
|
76
|
+
target: fuwu
|
|
77
|
+
},
|
|
78
|
+
'/rs/config': {
|
|
79
|
+
target: fuwu
|
|
80
|
+
},
|
|
81
|
+
'/rs/sql/getLicenseById': {
|
|
82
|
+
target: fuwu
|
|
83
|
+
},
|
|
84
|
+
'/rs/sql/manage_getarealist': {
|
|
85
|
+
target: fuwu
|
|
86
|
+
},
|
|
87
|
+
'/rs/sql/manage_getstreetlist': {
|
|
88
|
+
target: fuwu
|
|
89
|
+
},
|
|
90
|
+
'/rs/report': {
|
|
91
|
+
target: 'http://121.36.106.17:8400/'
|
|
92
|
+
},
|
|
93
|
+
'/rs/vue': {
|
|
94
|
+
target: fuwu
|
|
95
|
+
},
|
|
96
|
+
'/webmeter': {
|
|
97
|
+
target: 'http://192.168.50.4:8450'
|
|
98
|
+
},
|
|
99
|
+
'/rs': {
|
|
100
|
+
// target: 'http://192.168.30.63:8081/'
|
|
101
|
+
target: 'http://121.36.106.17:8400/'
|
|
102
|
+
// target:fuwu
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
107
|
+
publicPath: config.output.publicPath,
|
|
108
|
+
stats: {
|
|
109
|
+
colors: true,
|
|
110
|
+
chunks: false
|
|
111
|
+
}
|
|
112
|
+
})
|
|
113
|
+
|
|
114
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
115
|
+
// force page reload when html-webpack-plugin template changes
|
|
116
|
+
compiler.plugin('compilation', function (compilation) {
|
|
117
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
118
|
+
hotMiddleware.publish({action: 'reload'})
|
|
119
|
+
cb()
|
|
120
|
+
})
|
|
121
|
+
})
|
|
122
|
+
|
|
123
|
+
// proxy api requests
|
|
124
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
125
|
+
var options = proxyTable[context]
|
|
126
|
+
if (typeof options === 'string') {
|
|
127
|
+
options = {target: options}
|
|
128
|
+
}
|
|
129
|
+
app.use(proxyMiddleware(context, options))
|
|
130
|
+
})
|
|
131
|
+
|
|
132
|
+
// handle fallback for HTML5 history API
|
|
133
|
+
app.use(require('connect-history-api-fallback')())
|
|
134
|
+
// app.use(function (req, res, next) {
|
|
135
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
136
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
137
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
138
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
139
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
140
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
141
|
+
// next()
|
|
142
|
+
// })
|
|
143
|
+
|
|
144
|
+
// serve webpack bundle output
|
|
145
|
+
app.use(devMiddleware)
|
|
146
|
+
|
|
147
|
+
// enable hot-reload and state-preserving
|
|
148
|
+
// compilation error display
|
|
149
|
+
app.use(hotMiddleware)
|
|
150
|
+
|
|
151
|
+
// serve pure static assets
|
|
152
|
+
app.use('/static', express.static('./static'))
|
|
153
|
+
|
|
154
|
+
module.exports = app.listen(8089, function (err) {
|
|
155
|
+
if (err) {
|
|
156
|
+
console.log(err)
|
|
157
|
+
return
|
|
158
|
+
}
|
|
159
|
+
console.log('Listening at http://localhost:8089')
|
|
160
|
+
})
|
package/package.json
CHANGED
|
@@ -388,7 +388,7 @@ export default {
|
|
|
388
388
|
this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'
|
|
389
389
|
this.data.baseinfo.base.f_bz_type = this.data.baseinfo.base.f_bz_type ? [this.data.baseinfo.base.f_bz_type] : ''
|
|
390
390
|
|
|
391
|
-
this.data.baseinfo.base.f_paper_type = this.data.baseinfo.base.f_paper_type ? [this.data.baseinfo.base.f_paper_type] : '
|
|
391
|
+
this.data.baseinfo.base.f_paper_type = this.data.baseinfo.base.f_paper_type ? [this.data.baseinfo.base.f_paper_type] : '电子发票'
|
|
392
392
|
this.data.baseinfo.bank.f_bank_name = this.data.baseinfo.bank.f_bank_name ? [this.data.baseinfo.bank.f_bank_name] : '中国银行'
|
|
393
393
|
this.data.baseinfo.base.f_people_num = this.data.baseinfo.base.f_people_num ? this.data.baseinfo.base.f_people_num : (this.peopleNum ? this.peopleNum : 0)
|
|
394
394
|
|
|
@@ -622,6 +622,7 @@ export default {
|
|
|
622
622
|
f_user_type: row.f_user_type,
|
|
623
623
|
f_gasproperties: row.f_gasproperties,
|
|
624
624
|
f_position: row.f_position,
|
|
625
|
+
f_install_date: row.f_install_date,
|
|
625
626
|
f_inputtor: row.f_inputtor,
|
|
626
627
|
f_hand_month: row.f_hand_month
|
|
627
628
|
}
|
|
@@ -362,6 +362,11 @@
|
|
|
362
362
|
// 开始打票
|
|
363
363
|
if (self.config.hasPrint) {
|
|
364
364
|
if (self.model.f_print.indexOf('电子发票') == -1) {
|
|
365
|
+
if(self.$login.r.includes('非民用纸质票据拆分')){
|
|
366
|
+
if(self.row.f_user_type === '非民用'){
|
|
367
|
+
self.billData.url = 'rs/report/fmy_sendCard_bill'
|
|
368
|
+
}
|
|
369
|
+
}
|
|
365
370
|
if (self.config.hasBillManage) {
|
|
366
371
|
// 启用发票管理，获取票据管理中的票号并存储记录 d
|
|
367
372
|
self.row.id = res.data.id
|
|
@@ -411,7 +411,11 @@ and th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
|
|
|
411
411
|
} else if (type === '补卡') {
|
|
412
412
|
name = 'rs/report/replace_sell'
|
|
413
413
|
} else if (type === '发卡售气') {
|
|
414
|
-
|
|
414
|
+
if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
|
|
415
|
+
name = 'rs/report/fmy_sendCard_bill'
|
|
416
|
+
} else {
|
|
417
|
+
name = 'rs/report/sendCard_bill'
|
|
418
|
+
}
|
|
415
419
|
} else if (type === '卡表收费' || type === '卡表赠气' || type === '卡表收费撤销') {
|
|
416
420
|
if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
|
|
417
421
|
name = 'rs/report/fmy_card_bill'
|
|
@@ -307,7 +307,7 @@
|
|
|
307
307
|
return
|
|
308
308
|
}
|
|
309
309
|
let getiswrite = await this.$SqlService.singleTable('t_sellinggas', `id = '${row.id}'`)
|
|
310
|
-
if (getiswrite.data[0].f_write_card === '已写卡' || getiswrite.data[0].f_write_card === '
|
|
310
|
+
if (getiswrite.data[0].f_write_card === '已写卡' || getiswrite.data[0].f_write_card === '写卡失败' || getiswrite.data[0].f_write_card === null || getiswrite.data[0].f_write_card === undefined) {
|
|
311
311
|
this.$showAlert('该笔卡表收费记录已写卡，必须读卡后进行购气撤销！', 'warning', 3000)
|
|
312
312
|
return
|
|
313
313
|
}
|
|
@@ -96,13 +96,15 @@
|
|
|
96
96
|
<label class="font_normal_body" title="表箱号">表箱号</label>
|
|
97
97
|
<input type="text" class="input_search" style="width:60%" v-model="row.f_box_number" placeholder='表箱号'>
|
|
98
98
|
</div>
|
|
99
|
-
<div class="col-sm-4 form-group" >
|
|
99
|
+
<div class="col-sm-4 form-group" :class="[$m.f_defendcard.required ? 'has-error' : '']">
|
|
100
100
|
<label class="font_normal_body" title="防盗卡号1">防盗卡号1</label>
|
|
101
|
-
<input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard" placeholder='防盗卡号1'
|
|
101
|
+
<input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard" placeholder='防盗卡号1'
|
|
102
|
+
v-validate:f_defendcard='{required: true }'>
|
|
102
103
|
</div>
|
|
103
|
-
<div class="col-sm-4 form-group" >
|
|
104
|
+
<div class="col-sm-4 form-group" :class="[$m.f_defendcard_two.required ? 'has-error' : '']">
|
|
104
105
|
<label class="font_normal_body" title="防盗卡号2">防盗卡号2</label>
|
|
105
|
-
<input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard_two" placeholder='防盗卡号2'
|
|
106
|
+
<input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard_two" placeholder='防盗卡号2'
|
|
107
|
+
v-validate:f_defendcard_two='{required: true }'>
|
|
106
108
|
</div>
|
|
107
109
|
</div>
|
|
108
110
|
<div>
|
|
@@ -187,10 +189,13 @@
|
|
|
187
189
|
:options='gasperson' placeholder='通气人'
|
|
188
190
|
close-on-select></v-select> -->
|
|
189
191
|
</div>
|
|
190
|
-
<div class="col-sm-4 form-group" >
|
|
192
|
+
<div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error' : '']" >
|
|
191
193
|
<label for="f_gas_date" class="font_normal_body"> 通气日期</label>
|
|
194
|
+
<input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.f_gas_date.value"
|
|
195
|
+
v-validate:f_gas_date='{required: true }'>
|
|
192
196
|
<datepicker style="width:60%" placeholder="通气日期"
|
|
193
197
|
v-model="row.f_gas_date"
|
|
198
|
+
v-ref:f_gas_date
|
|
194
199
|
:value.sync="row.f_gas_date"
|
|
195
200
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
196
201
|
></datepicker>
|
|
@@ -222,12 +227,16 @@
|
|
|
222
227
|
:options='meterbookoptions' placeholder='抄表册'
|
|
223
228
|
close-on-select></v-select>
|
|
224
229
|
</div>
|
|
225
|
-
|
|
230
|
+
|
|
231
|
+
<div class="col-sm-4 form-group" v-show="true" :class="[$m.f_install_date.required ? 'has-error' : '']">
|
|
226
232
|
<label for="f_install_date" class="font_normal_body"> 安装日期</label>
|
|
233
|
+
<input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.f_install_date.value"
|
|
234
|
+
v-validate:f_install_date='{required: true }'>
|
|
227
235
|
<datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
|
|
228
236
|
v-model="row.f_install_date"
|
|
229
237
|
:value.sync="row.f_install_date"
|
|
230
238
|
class="datepicker"
|
|
239
|
+
v-ref:f_install_date
|
|
231
240
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
232
241
|
:show-reset-button="true">
|
|
233
242
|
</datepicker>
|
|
@@ -93,18 +93,22 @@
|
|
|
93
93
|
<template partial='body'>
|
|
94
94
|
<td style="text-align: center;"><nobr>{{$index + 1}}</nobr></td>
|
|
95
95
|
<td style="text-align: center;"><nobr>
|
|
96
|
-
<button type="button" name="button" class="button_search-
|
|
96
|
+
<button type="button" name="button" class="button_search-3 button_spacing width-60"
|
|
97
97
|
@click.stop="$parent.$parent.$parent.modifyRecord(row)">查看
|
|
98
98
|
</button>
|
|
99
|
-
<button type="button" name="button" class="button_search-
|
|
99
|
+
<button type="button" name="button" class="button_search-3 button_spacing width-60"
|
|
100
100
|
v-if="row.f_state === '有效'&&this.$login.r.includes('气损收费撤销')"
|
|
101
101
|
@click.stop="$parent.$parent.$parent.gaslossCancel(row)">撤销
|
|
102
|
+
</button>
|
|
103
|
+
<button type="button" name="button" class="button_search-3 button_spacing width-60"
|
|
104
|
+
v-if="row.f_state === '有效'&&permission('票据补打权限')"
|
|
105
|
+
@click.stop="$parent.$parent.$parent.reissueBill(row)">票据补打
|
|
102
106
|
</button></nobr>
|
|
103
107
|
</td>
|
|
104
108
|
<td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
|
|
105
109
|
<td style="text-align: center;"><nobr>{{row.f_newbalance}}</nobr></td>
|
|
106
110
|
<td style="text-align: center;"><nobr>{{row.f_newcurbalance}}</nobr></td>
|
|
107
|
-
|
|
111
|
+
<!--<td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>-->
|
|
108
112
|
<td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
|
|
109
113
|
<td style="text-align: center;"><nobr>{{row.f_bill_style}}</nobr></td>
|
|
110
114
|
<td style="text-align: center;"><nobr>{{row.f_serial_id}}</nobr></td>
|
|
@@ -135,12 +139,40 @@
|
|
|
135
139
|
</modal>
|
|
136
140
|
</div>
|
|
137
141
|
</div>
|
|
142
|
+
<reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()" @reissue-success="reissueSucc()" v-if="reissue_show"></reissue-bill>
|
|
138
143
|
</div>
|
|
139
144
|
</template>
|
|
140
145
|
|
|
141
146
|
<script>
|
|
142
147
|
import {HttpResetClass, PagedList} from 'vue-client'
|
|
143
148
|
import Vue from 'vue'
|
|
149
|
+
import co from 'co'
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* 发票补打
|
|
153
|
+
*/
|
|
154
|
+
let reprintGen = function *(self, row) {
|
|
155
|
+
try {
|
|
156
|
+
// console.log("reprintGen---------",row,self)
|
|
157
|
+
row.f_bill_type = '气损收费'
|
|
158
|
+
row.f_bill_style = '普通收据'
|
|
159
|
+
row.f_operator = self.$login.f.name
|
|
160
|
+
row.f_operatorid = self.$login.f.id
|
|
161
|
+
row.f_orgid = self.$login.f.orgid
|
|
162
|
+
row.f_orgname = self.$login.f.orgs
|
|
163
|
+
row.f_depid = self.$login.f.depids
|
|
164
|
+
row.f_depname = self.$login.f.deps
|
|
165
|
+
row.billUrl = 'rs/report/gasloss_bill'
|
|
166
|
+
self.reissue_data = row
|
|
167
|
+
self.reissue_show = true
|
|
168
|
+
} catch (error) {
|
|
169
|
+
if (error.status) {
|
|
170
|
+
self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
|
|
171
|
+
}
|
|
172
|
+
throw error
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
144
176
|
export default {
|
|
145
177
|
'title': '气损收费修改',
|
|
146
178
|
data () {
|
|
@@ -160,11 +192,15 @@
|
|
|
160
192
|
allorgid: [],
|
|
161
193
|
f_orgid: '',
|
|
162
194
|
criteriaShow: false,
|
|
195
|
+
|
|
163
196
|
types: this.$appdata.getParam('气损分类'),
|
|
164
197
|
printstyle: this.$appdata.getParam('打印格式'),
|
|
165
198
|
paytype: this.$appdata.getParam('付款方式'),
|
|
166
199
|
hasfile: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
167
|
-
orgCondtionStr: ''
|
|
200
|
+
orgCondtionStr: '',
|
|
201
|
+
|
|
202
|
+
reissue_show: false,
|
|
203
|
+
reissue_data: null
|
|
168
204
|
}
|
|
169
205
|
},
|
|
170
206
|
async ready () {
|
|
@@ -251,8 +287,26 @@
|
|
|
251
287
|
let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_orgid in ('" + this.f_orgid + "')"
|
|
252
288
|
args.condition = `${args.condition} ${f_orgstr} and f_state='有效'`
|
|
253
289
|
this.model.search(args.condition, args.model)
|
|
290
|
+
},
|
|
291
|
+
async reissueBill(row){
|
|
292
|
+
// console.log("reissueBill---------",row)
|
|
293
|
+
let reprint = reprintGen(this,row)
|
|
294
|
+
return co(reprint)
|
|
295
|
+
},
|
|
296
|
+
reissueOper () {
|
|
297
|
+
this.reissue_data = null
|
|
298
|
+
this.reissue_show = false
|
|
299
|
+
},
|
|
300
|
+
reissueSucc () {
|
|
301
|
+
this.reissue_show = false
|
|
302
|
+
this.$dispatch('refresh')
|
|
303
|
+
},
|
|
304
|
+
permission (name) {
|
|
305
|
+
if (this.$login.r.includes(name)) {
|
|
306
|
+
return true
|
|
307
|
+
}
|
|
308
|
+
return false
|
|
254
309
|
}
|
|
255
|
-
|
|
256
310
|
},
|
|
257
311
|
watch: {
|
|
258
312
|
async 'orgCondtionStr' (val) {
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div style="height:100%">
|
|
3
|
+
<data-grid :model="model" class="table_sy" partial='list' v-ref:grid >
|
|
4
|
+
<template partial='head' >
|
|
5
|
+
<tr>
|
|
6
|
+
<th><nobr>序号</nobr></th>
|
|
7
|
+
|
|
8
|
+
<th><nobr>气量</nobr></th>
|
|
9
|
+
<th><nobr>应交</nobr></th>
|
|
10
|
+
<th><nobr>付款方式</nobr></th>
|
|
11
|
+
<th><nobr>上期结余</nobr></th>
|
|
12
|
+
<th><nobr>收款</nobr></th>
|
|
13
|
+
<th><nobr>本期结余</nobr></th>
|
|
14
|
+
<th><nobr>操作类型</nobr></th>
|
|
15
|
+
<th><nobr>操作时间 </nobr></th>
|
|
16
|
+
<th><nobr>业务单号 </nobr></th>
|
|
17
|
+
<th><nobr>操作员 </nobr></th>
|
|
18
|
+
<th><nobr>备注</nobr></th>
|
|
19
|
+
</tr>
|
|
20
|
+
</template>
|
|
21
|
+
<template partial='body' >
|
|
22
|
+
<tr >
|
|
23
|
+
<td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
|
|
24
|
+
|
|
25
|
+
<td style="text-align:center;white-space:nowrap;">{{row.gas}}</td>
|
|
26
|
+
<td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
|
|
27
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_payment}}</td>
|
|
28
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
|
|
29
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
|
|
30
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_curbalance}}</td>
|
|
31
|
+
<td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
|
|
32
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_operate_date}}</td>
|
|
33
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_serial_number}}</td>
|
|
34
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
|
|
35
|
+
<td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
|
|
36
|
+
</tr>
|
|
37
|
+
</template>
|
|
38
|
+
</data-grid>
|
|
39
|
+
<modal :show.sync="cardCental" v-ref:modal backdrop="false">
|
|
40
|
+
<header slot="modal-header" class="modal-header">
|
|
41
|
+
<h4 class="modal-title">温馨提示</h4>
|
|
42
|
+
</header>
|
|
43
|
+
<article slot="modal-body" class="modal-body">
|
|
44
|
+
<div class="form-group">
|
|
45
|
+
<p> 当日此用户已经进行过一次购气,若卡上无气,请先进行补卡(未过表),之后掉气补气即可</p>
|
|
46
|
+
</div>
|
|
47
|
+
</article>
|
|
48
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
49
|
+
<button type="button" class="btn btn-success" @click='cancel()'>确认
|
|
50
|
+
</button>
|
|
51
|
+
</footer>
|
|
52
|
+
</modal>
|
|
53
|
+
</div>
|
|
54
|
+
</template>
|
|
55
|
+
|
|
56
|
+
<script>
|
|
57
|
+
import {HttpResetClass} from 'vue-client'
|
|
58
|
+
|
|
59
|
+
export default {
|
|
60
|
+
title: '操作查询',
|
|
61
|
+
data () {
|
|
62
|
+
return {
|
|
63
|
+
model: {rows: []},
|
|
64
|
+
cardCental:false
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
props: ['searchdata'],
|
|
68
|
+
ready () {
|
|
69
|
+
this.getsalerecord()
|
|
70
|
+
},
|
|
71
|
+
methods: {
|
|
72
|
+
cancel(){
|
|
73
|
+
this.cardCental = false;
|
|
74
|
+
},
|
|
75
|
+
async getsalerecord () {
|
|
76
|
+
let http = new HttpResetClass()
|
|
77
|
+
// this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
|
|
78
|
+
this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
|
|
79
|
+
let record = await http.load('POST', 'rs/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
|
|
80
|
+
rejectMsg: '流水查询出错！！',
|
|
81
|
+
resolveMsg: null
|
|
82
|
+
})
|
|
83
|
+
this.model.rows = record.data
|
|
84
|
+
if(this.model.rows.length>0 && ( this.model.rows[0].type== '发卡售气' || this.model.rows[0].type== '卡表收费' ) ){
|
|
85
|
+
let checkdata = this.model.rows[0].operate_date.substr(0,10)
|
|
86
|
+
let nowdate = new Date();
|
|
87
|
+
let pdate = nowdate.getFullYear()+'-'+(nowdate.getMonth()<10? '0'+nowdate.getMonth()+1 : nowdate.getMonth()+1) +'-'+(nowdate.getDate()<10? '0'+nowdate.getDate() : nowdate.getDate());
|
|
88
|
+
if(new Date(checkdata).getTime() == new Date(pdate).getTime()){
|
|
89
|
+
this.cardCental = true;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
},
|
|
94
|
+
watch: {
|
|
95
|
+
'searchdata' () {
|
|
96
|
+
this.getsalerecord()
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
</script>
|