manage-client 4.1.122 → 4.1.124
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 +79 -50
- package/package.json +1 -1
- package/src/components/SellReport/StairSellingDetail.vue +170 -0
- package/src/components/SellReport/hongya/HyCheckoutDay.vue +4 -4
- package/src/components/SellReport/hongya/HyCollectBill.vue +4 -4
- package/src/components/SellReport/hongya/HyContrastBill.vue +6 -6
- package/src/components/SellReport/hongya/HyMeterBill.vue +4 -4
- package/src/components/SellReport/hongya/HyMeterInput.vue +4 -4
- package/src/components/SellReport/hongya/HySellingBill.vue +4 -4
- package/src/components/SellReport/hongya/HyYushouBill.vue +4 -4
- package/src/components/sale/businessquery/ChargeSplitQuery.vue +50 -4
- package/src/filiale/liaoyuan/exportConfig.js +1 -1
- package/src/reportManage.js +3 -0
- package/src/filiale/jinbin/exportConfig.js +0 -1110
- package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +0 -1372
- package/src/filiale/jinbin/sale.js +0 -7
package/build/dev-server.js
CHANGED
|
@@ -6,102 +6,131 @@ const proxyMiddleware = require('http-proxy-middleware')
|
|
|
6
6
|
const app = express()
|
|
7
7
|
const compiler = webpack(config)
|
|
8
8
|
|
|
9
|
-
const server = 'http://192.168.50.67:31567
|
|
9
|
+
const server = 'http://192.168.50.67:31567'
|
|
10
10
|
const local = 'http://127.0.0.1:9026/'
|
|
11
11
|
const proxyTable = {
|
|
12
|
-
'/rs/logic/exportfile': {
|
|
13
|
-
target: server
|
|
14
|
-
},
|
|
15
12
|
'/dataManage': {
|
|
16
|
-
target: server
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
},
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
'
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
},
|
|
13
|
+
target: server,
|
|
14
|
+
changeOrigin: true,
|
|
15
|
+
secure: false
|
|
16
|
+
},
|
|
17
|
+
// '/api/af-revenue/logic': {
|
|
18
|
+
// pathRewrite: {
|
|
19
|
+
// '^/api/af-revenue/logic': '/logic'
|
|
20
|
+
// },
|
|
21
|
+
// target: local,
|
|
22
|
+
// changeOrigin: true,
|
|
23
|
+
// secure: false
|
|
24
|
+
// },
|
|
25
|
+
// '/api/af-revenue/sql': {
|
|
26
|
+
// pathRewrite: {
|
|
27
|
+
// '^/api/af-revenue/sql': '/singlepage/api/af-revenue/sql'
|
|
28
|
+
// },
|
|
29
|
+
// target: server,
|
|
30
|
+
// changeOrigin: true,
|
|
31
|
+
// secure: false
|
|
32
|
+
// },
|
|
33
|
+
// ... existing code ...
|
|
36
34
|
'/api': {
|
|
37
|
-
target: server
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
target: server
|
|
41
|
-
},
|
|
42
|
-
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
43
|
-
target: server
|
|
35
|
+
target: server,
|
|
36
|
+
changeOrigin: true,
|
|
37
|
+
secure: false
|
|
44
38
|
},
|
|
45
39
|
'/files': {
|
|
46
|
-
target: server
|
|
40
|
+
target: server,
|
|
41
|
+
changeOrigin: true,
|
|
42
|
+
secure: false
|
|
47
43
|
},
|
|
48
44
|
// 查找资源服务数据
|
|
49
45
|
'/rs/search': {
|
|
50
|
-
target: server
|
|
46
|
+
target: server,
|
|
47
|
+
changeOrigin: true,
|
|
48
|
+
secure: false
|
|
51
49
|
},
|
|
52
50
|
// 查找资源服务数据
|
|
53
51
|
'/rs/logic/getLogin': {
|
|
54
|
-
target: server
|
|
52
|
+
target: server,
|
|
53
|
+
changeOrigin: true,
|
|
54
|
+
secure: false
|
|
55
55
|
},
|
|
56
56
|
// 查找资源服务数据
|
|
57
57
|
'/rs/logic/getInitData': {
|
|
58
|
-
target: server
|
|
58
|
+
target: server,
|
|
59
|
+
changeOrigin: true,
|
|
60
|
+
secure: false
|
|
59
61
|
},
|
|
60
62
|
'/rs/logic/getSaleInitData': {
|
|
61
|
-
target: server
|
|
63
|
+
target: server,
|
|
64
|
+
changeOrigin: true,
|
|
65
|
+
secure: false
|
|
62
66
|
},
|
|
63
67
|
// 用户登录服务地址
|
|
64
68
|
'/rs/user': {
|
|
65
|
-
target: server
|
|
69
|
+
target: server,
|
|
70
|
+
changeOrigin: true,
|
|
71
|
+
secure: false
|
|
66
72
|
},
|
|
67
73
|
'/rs/path/getParams': {
|
|
68
|
-
target: server
|
|
74
|
+
target: server,
|
|
75
|
+
changeOrigin: true,
|
|
76
|
+
secure: false
|
|
69
77
|
},
|
|
70
78
|
'/rs/data': {
|
|
71
|
-
target: server
|
|
79
|
+
target: server,
|
|
80
|
+
changeOrigin: true,
|
|
81
|
+
secure: false
|
|
72
82
|
},
|
|
73
83
|
'/rs/license': {
|
|
74
|
-
target: server
|
|
84
|
+
target: server,
|
|
85
|
+
changeOrigin: true,
|
|
86
|
+
secure: false
|
|
75
87
|
},
|
|
76
88
|
'/rs/db': {
|
|
77
|
-
target: server
|
|
89
|
+
target: server,
|
|
90
|
+
changeOrigin: true,
|
|
91
|
+
secure: false
|
|
78
92
|
},
|
|
79
93
|
'/excel': {
|
|
80
|
-
target: server
|
|
94
|
+
target: server,
|
|
95
|
+
changeOrigin: true,
|
|
96
|
+
secure: false
|
|
81
97
|
},
|
|
82
98
|
'/rs/config': {
|
|
83
|
-
target: server
|
|
99
|
+
target: server,
|
|
100
|
+
changeOrigin: true,
|
|
101
|
+
secure: false
|
|
84
102
|
},
|
|
85
103
|
'/rs/sql/getLicenseById': {
|
|
86
|
-
target: server
|
|
104
|
+
target: server,
|
|
105
|
+
changeOrigin: true,
|
|
106
|
+
secure: false
|
|
87
107
|
},
|
|
88
108
|
'/rs/report': {
|
|
89
|
-
target: server
|
|
109
|
+
target: server,
|
|
110
|
+
changeOrigin: true,
|
|
111
|
+
secure: false
|
|
90
112
|
},
|
|
91
113
|
'/rs/vue': {
|
|
92
|
-
target: server
|
|
114
|
+
target: server,
|
|
115
|
+
changeOrigin: true,
|
|
116
|
+
secure: false
|
|
93
117
|
},
|
|
94
118
|
'/rs/file': {
|
|
95
|
-
target: server
|
|
119
|
+
target: server,
|
|
120
|
+
changeOrigin: true,
|
|
121
|
+
secure: false
|
|
96
122
|
},
|
|
97
123
|
'/rs/sql/singleTable': {
|
|
98
|
-
target: server
|
|
124
|
+
target: server,
|
|
125
|
+
changeOrigin: true,
|
|
126
|
+
secure: false
|
|
99
127
|
},
|
|
100
128
|
'/rs': {
|
|
101
|
-
target: server
|
|
129
|
+
target: server,
|
|
130
|
+
changeOrigin: true,
|
|
131
|
+
secure: false
|
|
102
132
|
}
|
|
103
133
|
}
|
|
104
|
-
|
|
105
134
|
const devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
106
135
|
publicPath: config.output.publicPath,
|
|
107
136
|
stats: {
|
package/package.json
CHANGED
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 100%">
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-2 form-group" >
|
|
8
|
+
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
9
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
10
|
+
v-model="model.startDate"
|
|
11
|
+
:value.sync="model.startDate"
|
|
12
|
+
:disabled-days-of-Week="[]"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
|
+
:show-reset-button="reset">
|
|
15
|
+
</datepicker>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="col-sm-2 form-group" >
|
|
18
|
+
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
19
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
20
|
+
v-model="model.endDate"
|
|
21
|
+
:value.sync="model.endDate"
|
|
22
|
+
:disabled-days-of-Week="[]"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
|
+
:show-reset-button="reset">
|
|
25
|
+
</datepicker>
|
|
26
|
+
</div>
|
|
27
|
+
<res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="span" style = "float:right;">
|
|
30
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
31
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
32
|
+
<report-excel id='gasprice'></report-excel>
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
</criteria>
|
|
36
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
37
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
38
|
+
<thead>
|
|
39
|
+
<tr>
|
|
40
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
41
|
+
<h3 style="text-align: center">卡表收费阶梯汇总报表</h3>
|
|
42
|
+
</th>
|
|
43
|
+
</tr>
|
|
44
|
+
<tr>
|
|
45
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
46
|
+
开始时间：{{model.model.startDate}}
|
|
47
|
+
结束时间：{{ model.model.endDate }} <br/>
|
|
48
|
+
打印时间：{{$parent.printTime}}
|
|
49
|
+
</th>
|
|
50
|
+
</tr>
|
|
51
|
+
<tr>
|
|
52
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
53
|
+
<div>
|
|
54
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
55
|
+
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
56
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
|
|
57
|
+
</div>
|
|
58
|
+
</th>
|
|
59
|
+
</tr>
|
|
60
|
+
</thead>
|
|
61
|
+
<tr>
|
|
62
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
63
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
64
|
+
</td>
|
|
65
|
+
</tr>
|
|
66
|
+
</table>
|
|
67
|
+
{{{ $parent.reportStr}}}
|
|
68
|
+
</div>
|
|
69
|
+
</criteria-paged>
|
|
70
|
+
</div>
|
|
71
|
+
</template>
|
|
72
|
+
|
|
73
|
+
<script>
|
|
74
|
+
import { DataModel } from 'vue-client'
|
|
75
|
+
|
|
76
|
+
export default {
|
|
77
|
+
title: '机表阶梯收费明细报表',
|
|
78
|
+
props: ['data'],
|
|
79
|
+
data () {
|
|
80
|
+
return {
|
|
81
|
+
printTime: this.$login.toStandardTimeString(),
|
|
82
|
+
depresid: [],
|
|
83
|
+
userresid: [],
|
|
84
|
+
f_orgid: this.$login.f.orgid,
|
|
85
|
+
f_depid: this.$login.f.depids,
|
|
86
|
+
// f_operatorid: this.$login.f.id,
|
|
87
|
+
operatorid: [],
|
|
88
|
+
depid: [],
|
|
89
|
+
orgname: '',
|
|
90
|
+
depname: '',
|
|
91
|
+
criteriaShow: false,
|
|
92
|
+
operatorname: '',
|
|
93
|
+
orgCondtionStr: '1=1',
|
|
94
|
+
model: new DataModel('api/af-revenue/report/stairSellingDetail', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
95
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
96
|
+
reportStr: null,
|
|
97
|
+
resshow: ['company', 'department', 'operator'],
|
|
98
|
+
spans: 0,
|
|
99
|
+
initres: {
|
|
100
|
+
org: [this.$login.f.orgid],
|
|
101
|
+
dep: [],
|
|
102
|
+
user: []
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
},
|
|
106
|
+
ready () {
|
|
107
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
108
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
109
|
+
console.log(this.$login.f)
|
|
110
|
+
},
|
|
111
|
+
methods: {
|
|
112
|
+
searchData () {
|
|
113
|
+
this.$refs.paged.$refs.criteria.search()
|
|
114
|
+
},
|
|
115
|
+
selfSearch (args) {
|
|
116
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
117
|
+
let orgcondition = '1=1'
|
|
118
|
+
let orgstr = this.orgCondtionStr
|
|
119
|
+
orgcondition = orgcondition + orgstr
|
|
120
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
121
|
+
this.$refs.paged.search(args)
|
|
122
|
+
},
|
|
123
|
+
|
|
124
|
+
hidden() {
|
|
125
|
+
this.criteriaShow = !this.criteriaShow
|
|
126
|
+
},
|
|
127
|
+
getRes (condition, obj) {
|
|
128
|
+
this.orgCondtionStr = condition
|
|
129
|
+
this.orgname = obj.orgnames[0]
|
|
130
|
+
this.depname = obj.depnames[0]
|
|
131
|
+
console.log(obj, '========')
|
|
132
|
+
this.operatorname = obj.operatornames[0]
|
|
133
|
+
},
|
|
134
|
+
getdep (obj, val) {
|
|
135
|
+
this.depname = val[0]
|
|
136
|
+
this.userresid = obj
|
|
137
|
+
this.f_depid = obj
|
|
138
|
+
},
|
|
139
|
+
getuser ( obj, val) {
|
|
140
|
+
this.operatorname = val[0]
|
|
141
|
+
this.f_operatorid = obj
|
|
142
|
+
}
|
|
143
|
+
},
|
|
144
|
+
watch: {
|
|
145
|
+
'model.data' (val) {
|
|
146
|
+
let len = 0
|
|
147
|
+
let a = val.split('</tr>')
|
|
148
|
+
for (let i = 0; i < a.length; i++) {
|
|
149
|
+
if (a[i].split('</td>').length - 1 > len) {
|
|
150
|
+
len = a[i].split('</td>').length - 1
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
this.spans = len
|
|
154
|
+
}
|
|
155
|
+
},
|
|
156
|
+
computed: {
|
|
157
|
+
charge_state() {
|
|
158
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
|
|
159
|
+
},
|
|
160
|
+
user_type () {
|
|
161
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
</script>
|
|
166
|
+
<style scoped>
|
|
167
|
+
.noborder{
|
|
168
|
+
border: none;
|
|
169
|
+
}
|
|
170
|
+
</style>
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model="model.startDate"
|
|
11
11
|
:value.sync="model.startDate"
|
|
12
12
|
:disabled-days-of-Week="[]"
|
|
13
|
-
:format="'yyyy-MM-dd'"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
14
|
:show-reset-button="reset">
|
|
15
15
|
</datepicker>
|
|
16
16
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
v-model="model.endDate"
|
|
21
21
|
:value.sync="model.endDate"
|
|
22
22
|
:disabled-days-of-Week="[]"
|
|
23
|
-
:format="'yyyy-MM-dd'"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
@@ -127,8 +127,8 @@ export default {
|
|
|
127
127
|
}
|
|
128
128
|
},
|
|
129
129
|
ready () {
|
|
130
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
131
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
130
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
131
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
132
132
|
},
|
|
133
133
|
methods: {
|
|
134
134
|
searchData () {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model="model.startDate"
|
|
11
11
|
:value.sync="model.startDate"
|
|
12
12
|
:disabled-days-of-Week="[]"
|
|
13
|
-
:format="'yyyy-MM-dd'"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
14
|
:show-reset-button="reset">
|
|
15
15
|
</datepicker>
|
|
16
16
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
v-model="model.endDate"
|
|
21
21
|
:value.sync="model.endDate"
|
|
22
22
|
:disabled-days-of-Week="[]"
|
|
23
|
-
:format="'yyyy-MM-dd'"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
@@ -124,8 +124,8 @@ export default {
|
|
|
124
124
|
}
|
|
125
125
|
},
|
|
126
126
|
ready () {
|
|
127
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
128
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
127
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
128
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
129
129
|
},
|
|
130
130
|
methods: {
|
|
131
131
|
searchData () {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model="model.startDate"
|
|
11
11
|
:value.sync="model.startDate"
|
|
12
12
|
:disabled-days-of-Week="[]"
|
|
13
|
-
:format="'yyyy-MM-dd'"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
14
|
:show-reset-button="reset">
|
|
15
15
|
</datepicker>
|
|
16
16
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
v-model="model.endDate"
|
|
21
21
|
:value.sync="model.endDate"
|
|
22
22
|
:disabled-days-of-Week="[]"
|
|
23
|
-
:format="'yyyy-MM-dd'"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
v-model="model.startDate1"
|
|
31
31
|
:value.sync="model.startDate1"
|
|
32
32
|
:disabled-days-of-Week="[]"
|
|
33
|
-
:format="'yyyy-MM-dd'"
|
|
33
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
34
34
|
:show-reset-button="reset">
|
|
35
35
|
</datepicker>
|
|
36
36
|
</div>
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
v-model="model.endDate1"
|
|
41
41
|
:value.sync="model.endDate1"
|
|
42
42
|
:disabled-days-of-Week="[]"
|
|
43
|
-
:format="'yyyy-MM-dd'"
|
|
43
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
44
44
|
:show-reset-button="reset">
|
|
45
45
|
</datepicker>
|
|
46
46
|
</div>
|
|
@@ -151,8 +151,8 @@ export default {
|
|
|
151
151
|
}
|
|
152
152
|
},
|
|
153
153
|
ready () {
|
|
154
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
155
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
154
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
155
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
156
156
|
},
|
|
157
157
|
methods: {
|
|
158
158
|
searchData () {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model="model.startDate"
|
|
11
11
|
:value.sync="model.startDate"
|
|
12
12
|
:disabled-days-of-Week="[]"
|
|
13
|
-
:format="'yyyy-MM-dd'"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
14
|
:show-reset-button="reset">
|
|
15
15
|
</datepicker>
|
|
16
16
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
v-model="model.endDate"
|
|
21
21
|
:value.sync="model.endDate"
|
|
22
22
|
:disabled-days-of-Week="[]"
|
|
23
|
-
:format="'yyyy-MM-dd'"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
@@ -130,8 +130,8 @@ export default {
|
|
|
130
130
|
}
|
|
131
131
|
},
|
|
132
132
|
async ready () {
|
|
133
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
134
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
133
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
134
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
135
135
|
await this.initdata()
|
|
136
136
|
},
|
|
137
137
|
methods: {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model="model.startDate"
|
|
11
11
|
:value.sync="model.startDate"
|
|
12
12
|
:disabled-days-of-Week="[]"
|
|
13
|
-
:format="'yyyy-MM-dd'"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
14
|
:show-reset-button="reset">
|
|
15
15
|
</datepicker>
|
|
16
16
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
v-model="model.endDate"
|
|
21
21
|
:value.sync="model.endDate"
|
|
22
22
|
:disabled-days-of-Week="[]"
|
|
23
|
-
:format="'yyyy-MM-dd'"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
@@ -124,8 +124,8 @@ export default {
|
|
|
124
124
|
}
|
|
125
125
|
},
|
|
126
126
|
ready () {
|
|
127
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
128
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
127
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
128
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
129
129
|
},
|
|
130
130
|
methods: {
|
|
131
131
|
searchData () {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model="model.startDate"
|
|
11
11
|
:value.sync="model.startDate"
|
|
12
12
|
:disabled-days-of-Week="[]"
|
|
13
|
-
:format="'yyyy-MM-dd'"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
14
|
:show-reset-button="reset">
|
|
15
15
|
</datepicker>
|
|
16
16
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
v-model="model.endDate"
|
|
21
21
|
:value.sync="model.endDate"
|
|
22
22
|
:disabled-days-of-Week="[]"
|
|
23
|
-
:format="'yyyy-MM-dd'"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
@@ -124,8 +124,8 @@ export default {
|
|
|
124
124
|
}
|
|
125
125
|
},
|
|
126
126
|
ready () {
|
|
127
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
128
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
127
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
128
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
129
129
|
},
|
|
130
130
|
methods: {
|
|
131
131
|
searchData () {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
v-model="model.startDate"
|
|
11
11
|
:value.sync="model.startDate"
|
|
12
12
|
:disabled-days-of-Week="[]"
|
|
13
|
-
:format="'yyyy-MM-dd'"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
14
|
:show-reset-button="reset">
|
|
15
15
|
</datepicker>
|
|
16
16
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
v-model="model.endDate"
|
|
21
21
|
:value.sync="model.endDate"
|
|
22
22
|
:disabled-days-of-Week="[]"
|
|
23
|
-
:format="'yyyy-MM-dd'"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
@@ -119,8 +119,8 @@ export default {
|
|
|
119
119
|
}
|
|
120
120
|
},
|
|
121
121
|
ready () {
|
|
122
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
123
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
122
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
123
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
124
124
|
},
|
|
125
125
|
methods: {
|
|
126
126
|
searchData () {
|
|
@@ -42,10 +42,10 @@
|
|
|
42
42
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
43
43
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
44
44
|
|
|
45
|
-
<export-excel :data="$parent.$parent.getCondition"
|
|
45
|
+
<export-excel :data="$parent.$parent.getCondition"
|
|
46
46
|
:field="$parent.$parent.getfield" :header="$parent.$parent.other"
|
|
47
47
|
:defaultselect="$parent.$parent.defaultexport"
|
|
48
|
-
sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="
|
|
48
|
+
sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="chargeSplitQuery" template-name='收费详情查询导出'
|
|
49
49
|
:choose-col="true">
|
|
50
50
|
</export-excel>
|
|
51
51
|
|
|
@@ -1157,10 +1157,56 @@
|
|
|
1157
1157
|
}
|
|
1158
1158
|
},
|
|
1159
1159
|
getfield() {
|
|
1160
|
-
return
|
|
1160
|
+
return {
|
|
1161
|
+
'id': '收费编号',
|
|
1162
|
+
'f_userinfo_code': '客户编号',
|
|
1163
|
+
'f_olduserinfo_code': '档案编号',
|
|
1164
|
+
'f_user_name': '客户名称',
|
|
1165
|
+
'f_idnumber': '身份证号',
|
|
1166
|
+
'f_user_phone': '客户电话',
|
|
1167
|
+
'f_address': '客户地址',
|
|
1168
|
+
'f_zones': '片区',
|
|
1169
|
+
'f_user_type': '客户类型',
|
|
1170
|
+
'f_gasproperties': '用气性质',
|
|
1171
|
+
'f_meternumber': '表号',
|
|
1172
|
+
'f_meter_brand': '气表品牌',
|
|
1173
|
+
'f_times': '购气次数',
|
|
1174
|
+
'f_price_name': '气价名称',
|
|
1175
|
+
'f_last_tablebase': '上期底数',
|
|
1176
|
+
'f_tablebase': '本期底数',
|
|
1177
|
+
'f_pregas': '气量',
|
|
1178
|
+
'fee': '金额',
|
|
1179
|
+
'f_preamount': '燃气费',
|
|
1180
|
+
'f_collection': '收款',
|
|
1181
|
+
'f_privilege_money': '优惠金额',
|
|
1182
|
+
'f_balance': '上期结余',
|
|
1183
|
+
'f_curbalance': '本期结余',
|
|
1184
|
+
'f_type': '收费类型',
|
|
1185
|
+
'f_payment': '付款方式',
|
|
1186
|
+
'f_bank_type': '支付渠道',
|
|
1187
|
+
'f_state': '状态',
|
|
1188
|
+
'f_operate_date': '收费日期',
|
|
1189
|
+
'f_serial_id': '流水号',
|
|
1190
|
+
'f_delaypay': '违约金',
|
|
1191
|
+
'f_comments': '备注',
|
|
1192
|
+
'f_operator': '操作员',
|
|
1193
|
+
'f_depname': '部门',
|
|
1194
|
+
'f_orgname': '公司',
|
|
1195
|
+
'f_yucun': '预存金额',
|
|
1196
|
+
'f_card_id': '卡号',
|
|
1197
|
+
'f_inputtor': '抄表员',
|
|
1198
|
+
'f_residential_area': '小区',
|
|
1199
|
+
'f_serial_number': '业务单号'
|
|
1200
|
+
}
|
|
1161
1201
|
},
|
|
1162
1202
|
defaultexport() {
|
|
1163
|
-
return
|
|
1203
|
+
return {
|
|
1204
|
+
'f_userinfo_code': '客户编号',
|
|
1205
|
+
'f_user_name': '客户名称',
|
|
1206
|
+
'f_pregas': '气量',
|
|
1207
|
+
'f_payment': '付款方式',
|
|
1208
|
+
'f_collection': '收款'
|
|
1209
|
+
}
|
|
1164
1210
|
},
|
|
1165
1211
|
pricetypes() {
|
|
1166
1212
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
@@ -59,7 +59,7 @@ export default{
|
|
|
59
59
|
},
|
|
60
60
|
chargeConfig: {
|
|
61
61
|
'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区',
|
|
62
|
-
'f_book_slice_area': '表册片区', 'f_user_type': '客户类型',
|
|
62
|
+
'f_book_slice_area': '表册片区', 'f_user_type': '客户类型','f_serial_id': '流水号',
|
|
63
63
|
'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数',
|
|
64
64
|
'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
|
|
65
65
|
'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期',
|