manage-client 4.1.121 → 4.1.123
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 +17 -17
- 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/SellReport/jinhong/JhPriceReport.vue +252 -0
- package/src/main.js +3 -3
- package/src/reportManage.js +7 -0
package/build/dev-server.js
CHANGED
|
@@ -6,7 +6,7 @@ const proxyMiddleware = require('http-proxy-middleware')
|
|
|
6
6
|
const app = express()
|
|
7
7
|
const compiler = webpack(config)
|
|
8
8
|
|
|
9
|
-
const server = 'http://
|
|
9
|
+
const server = 'http://192.168.50.67:31567'
|
|
10
10
|
const local = 'http://127.0.0.1:9026/'
|
|
11
11
|
const proxyTable = {
|
|
12
12
|
'/dataManage': {
|
|
@@ -14,22 +14,22 @@ const proxyTable = {
|
|
|
14
14
|
changeOrigin: true,
|
|
15
15
|
secure: false
|
|
16
16
|
},
|
|
17
|
-
'/api/af-revenue/logic': {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
},
|
|
25
|
-
'/api/af-revenue/sql': {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
},
|
|
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
33
|
// ... existing code ...
|
|
34
34
|
'/api': {
|
|
35
35
|
target: server,
|
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 () {
|
|
@@ -0,0 +1,252 @@
|
|
|
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"
|
|
28
|
+
:selectin="true" :initres="$parent.$parent.initres"
|
|
29
|
+
:cascade =true @re-res="$parent.$parent.getRes" v-ref:sel>
|
|
30
|
+
</res-select-group>
|
|
31
|
+
<div class="col-sm-2 form-group">
|
|
32
|
+
<label class="font_normal_body" title="参数：报表1收费类型">收费类型</label>
|
|
33
|
+
<v-select :value.sync="$parent.$parent.f_charge_type"
|
|
34
|
+
v-ref:f_charge_type
|
|
35
|
+
v-model="$parent.$parent.f_charge_type"
|
|
36
|
+
:options='$parent.$parent.chargeTypes'
|
|
37
|
+
placeholder='请选择'
|
|
38
|
+
:multiple="true">
|
|
39
|
+
</v-select>
|
|
40
|
+
</div>
|
|
41
|
+
<div class="col-sm-2 form-group">
|
|
42
|
+
<label class="font_normal_body" title="参数：报表1用气性质">用气性质</label>
|
|
43
|
+
<v-select :value.sync="$parent.$parent.f_gasproperties"
|
|
44
|
+
v-ref:gasproperties
|
|
45
|
+
v-model="$parent.$parent.f_gasproperties"
|
|
46
|
+
:options='$parent.$parent.gasproperties'
|
|
47
|
+
placeholder='请选择'
|
|
48
|
+
:multiple="true">
|
|
49
|
+
</v-select>
|
|
50
|
+
</div>
|
|
51
|
+
<div class="col-sm-2 form-group">
|
|
52
|
+
<label class="font_normal_body" title="参数：付款方式">收费方式</label>
|
|
53
|
+
<v-select :value.sync="$parent.$parent.f_payment"
|
|
54
|
+
v-ref:payment
|
|
55
|
+
v-model="$parent.$parent.f_payment"
|
|
56
|
+
:options='$parent.$parent.payments'
|
|
57
|
+
placeholder='请选择'
|
|
58
|
+
:multiple="true">
|
|
59
|
+
</v-select>
|
|
60
|
+
</div>
|
|
61
|
+
</div>
|
|
62
|
+
<div class="span" style = "float:right;">
|
|
63
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
64
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
65
|
+
<report-excel id='gasprice'></report-excel>
|
|
66
|
+
</div>
|
|
67
|
+
</div>
|
|
68
|
+
</criteria>
|
|
69
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
70
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
71
|
+
<thead>
|
|
72
|
+
<tr>
|
|
73
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
74
|
+
<h3 style="text-align: center">气价分组报表</h3>
|
|
75
|
+
</th>
|
|
76
|
+
</tr>
|
|
77
|
+
<tr>
|
|
78
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
79
|
+
开始时间：{{model.model.startDate}}
|
|
80
|
+
结束时间：{{ model.model.endDate }} <br/>
|
|
81
|
+
<!--打印时间：{{{$parent.printTime}}}-->
|
|
82
|
+
打印时间：{{$parent.printTime}}
|
|
83
|
+
<!--收费员：{{// $parent.operatorname}}-->
|
|
84
|
+
</th>
|
|
85
|
+
</tr>
|
|
86
|
+
<tr>
|
|
87
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
88
|
+
<div>
|
|
89
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
90
|
+
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
91
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
|
|
92
|
+
</div>
|
|
93
|
+
</th>
|
|
94
|
+
</tr>
|
|
95
|
+
</thead>
|
|
96
|
+
<tr>
|
|
97
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
98
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
99
|
+
</td>
|
|
100
|
+
</tr>
|
|
101
|
+
<tfoot>
|
|
102
|
+
<tr style="text-align: left">
|
|
103
|
+
<th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
|
|
104
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
|
|
105
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
|
|
106
|
+
</tr>
|
|
107
|
+
</tfoot>
|
|
108
|
+
</table>
|
|
109
|
+
{{{ $parent.reportStr }}}
|
|
110
|
+
</div>
|
|
111
|
+
</criteria-paged>
|
|
112
|
+
</div>
|
|
113
|
+
</template>
|
|
114
|
+
|
|
115
|
+
<script>
|
|
116
|
+
import { DataModel } from 'vue-client'
|
|
117
|
+
import co from 'co'
|
|
118
|
+
|
|
119
|
+
export default {
|
|
120
|
+
title: '气价分组报表',
|
|
121
|
+
props: ['data'],
|
|
122
|
+
data () {
|
|
123
|
+
return {
|
|
124
|
+
printTime: this.$login.toStandardTimeString(),
|
|
125
|
+
depresid: [],
|
|
126
|
+
userresid: [],
|
|
127
|
+
f_orgid: this.$login.f.orgid,
|
|
128
|
+
f_depid: this.$login.f.depids,
|
|
129
|
+
// f_operatorid: this.$login.f.id,
|
|
130
|
+
operatorid: [],
|
|
131
|
+
depid: [],
|
|
132
|
+
orgname: '',
|
|
133
|
+
depname: '',
|
|
134
|
+
f_charge_type: '',
|
|
135
|
+
f_gasproperties: '',
|
|
136
|
+
f_payment: '',
|
|
137
|
+
criteriaShow: false,
|
|
138
|
+
operatorname: '',
|
|
139
|
+
orgCondtionStr: '1=1',
|
|
140
|
+
model: new DataModel('api/af-revenue/report/jhPriceReport', {
|
|
141
|
+
startDate: 'this.model.startDate',
|
|
142
|
+
endDate: 'this.model.endDate',
|
|
143
|
+
f_orgid: 'this.model.f_orgid',
|
|
144
|
+
f_charge_type: 'this.model.f_charge_type',
|
|
145
|
+
f_gasproperties: 'this.model.f_gasproperties',
|
|
146
|
+
f_payment: 'this.model.f_payment'
|
|
147
|
+
}),
|
|
148
|
+
reportStr: null,
|
|
149
|
+
resshow: ['company', 'department', 'operator'],
|
|
150
|
+
spans: 0,
|
|
151
|
+
initres: {
|
|
152
|
+
org: [this.$login.f.orgid],
|
|
153
|
+
dep: [],
|
|
154
|
+
user: []
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
},
|
|
158
|
+
ready () {
|
|
159
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
160
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
161
|
+
console.log(this.$login.f)
|
|
162
|
+
},
|
|
163
|
+
methods: {
|
|
164
|
+
searchData () {
|
|
165
|
+
this.$refs.paged.$refs.criteria.search()
|
|
166
|
+
},
|
|
167
|
+
appendCondition (data) {
|
|
168
|
+
let stringValue = '('
|
|
169
|
+
for (let i = 0; i < data.length; i++) {
|
|
170
|
+
if (data[i]) {
|
|
171
|
+
if (i === data.length - 1) {
|
|
172
|
+
stringValue = stringValue + "'" + data[i] + "'"
|
|
173
|
+
} else {
|
|
174
|
+
stringValue = stringValue + "'" + data[i] + "',"
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
stringValue = stringValue + ')'
|
|
179
|
+
return stringValue
|
|
180
|
+
},
|
|
181
|
+
selfSearch (args) {
|
|
182
|
+
if (this.f_charge_type.length > 0) {
|
|
183
|
+
this.$refs.paged.$refs.criteria.model.f_charge_type = this.appendCondition(this.f_charge_type)
|
|
184
|
+
} else {
|
|
185
|
+
this.$refs.paged.$refs.criteria.model.f_charge_type = ''
|
|
186
|
+
}
|
|
187
|
+
if (this.f_gasproperties.length > 0) {
|
|
188
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties = this.appendCondition(this.f_gasproperties)
|
|
189
|
+
} else {
|
|
190
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
|
|
191
|
+
}
|
|
192
|
+
if (this.f_payment.length > 0) {
|
|
193
|
+
this.$refs.paged.$refs.criteria.model.f_payment = this.appendCondition(this.f_payment)
|
|
194
|
+
} else {
|
|
195
|
+
this.$refs.paged.$refs.criteria.model.f_payment = ''
|
|
196
|
+
}
|
|
197
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
198
|
+
let orgcondition = '1=1'
|
|
199
|
+
let orgstr = this.orgCondtionStr
|
|
200
|
+
orgcondition = orgcondition + orgstr
|
|
201
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
202
|
+
this.$refs.paged.search(args)
|
|
203
|
+
},
|
|
204
|
+
hidden () {
|
|
205
|
+
this.criteriaShow = !this.criteriaShow
|
|
206
|
+
},
|
|
207
|
+
getRes (condition, obj) {
|
|
208
|
+
this.orgCondtionStr = condition
|
|
209
|
+
this.orgname = obj.orgnames[0]
|
|
210
|
+
this.depname = obj.depnames[0]
|
|
211
|
+
this.operatorname = obj.operatornames[0]
|
|
212
|
+
},
|
|
213
|
+
getdep (obj, val) {
|
|
214
|
+
this.depname = val[0]
|
|
215
|
+
this.userresid = obj
|
|
216
|
+
this.f_depid = obj
|
|
217
|
+
},
|
|
218
|
+
getuser (obj, val) {
|
|
219
|
+
this.operatorname = val[0]
|
|
220
|
+
this.f_operatorid = obj
|
|
221
|
+
}
|
|
222
|
+
},
|
|
223
|
+
watch: {
|
|
224
|
+
'model.data' (val) {
|
|
225
|
+
let len = 0
|
|
226
|
+
let a = val.split('</tr>')
|
|
227
|
+
for (let i = 0; i < a.length; i++) {
|
|
228
|
+
if (a[i].split('</td>').length - 1 > len) {
|
|
229
|
+
len = a[i].split('</td>').length - 1
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
this.spans = len
|
|
233
|
+
}
|
|
234
|
+
},
|
|
235
|
+
computed: {
|
|
236
|
+
payments () {
|
|
237
|
+
return this.$appdata.getParam('付款方式')
|
|
238
|
+
},
|
|
239
|
+
gasproperties () {
|
|
240
|
+
return this.$appdata.getParam('报表1用气性质')
|
|
241
|
+
},
|
|
242
|
+
chargeTypes () {
|
|
243
|
+
return this.$appdata.getParam('报表1收费类型')
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
</script>
|
|
248
|
+
<style scoped>
|
|
249
|
+
.noborder{
|
|
250
|
+
border: none;
|
|
251
|
+
}
|
|
252
|
+
</style>
|
package/src/main.js
CHANGED
|
@@ -6,8 +6,8 @@ import { all } from 'vue-client'
|
|
|
6
6
|
import { system } from 'system-clients'
|
|
7
7
|
import { ldap } from 'ldap-clients'
|
|
8
8
|
import saleManage from './saleManage'
|
|
9
|
-
import ShanXianSaleManage from './filiale/
|
|
10
|
-
import ShanXianwebSaleManage from './filiale/
|
|
9
|
+
import ShanXianSaleManage from './filiale/xinjiangdexin/sale'
|
|
10
|
+
// import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
|
|
11
11
|
import webmeterManage from './webmeterManage'
|
|
12
12
|
import reportManage from './reportManage'
|
|
13
13
|
import newmanage from './newmanage'
|
|
@@ -51,7 +51,7 @@ ManageHome()
|
|
|
51
51
|
newmanage()
|
|
52
52
|
ShanXianSaleManage()
|
|
53
53
|
reportManage()
|
|
54
|
-
|
|
54
|
+
// ShanXianSaleManage()
|
|
55
55
|
require('system-clients/src/styles/less/bootstrap.less')
|
|
56
56
|
require('./components/qinhua/Style/qinhuaStyle.less')
|
|
57
57
|
// require('./bootstrap/less/manageStyle/manageChile.less')
|
package/src/reportManage.js
CHANGED
|
@@ -99,6 +99,9 @@ export default function () {
|
|
|
99
99
|
Vue.component('report-pool', (resolve) => {
|
|
100
100
|
require(['./components/SellReport/ReportPool'], resolve)
|
|
101
101
|
})
|
|
102
|
+
Vue.component('stair-selling-detail', (resolve) => {
|
|
103
|
+
require(['./components/SellReport/StairSellingDetail'], resolve)
|
|
104
|
+
})
|
|
102
105
|
// 报表类型选项
|
|
103
106
|
Vue.component('report-items', (resolve) => {
|
|
104
107
|
require(['./components/SellReport/ReportItems'], resolve)
|
|
@@ -919,6 +922,10 @@ export default function () {
|
|
|
919
922
|
Vue.component('jh-day-report', (resolve) => {
|
|
920
923
|
require(['./components/SellReport/jinhong/JhDayReport'], resolve)
|
|
921
924
|
})
|
|
925
|
+
// 报表展示组件（金鸿-气价分组报表）
|
|
926
|
+
Vue.component('jh-price-report', (resolve) => {
|
|
927
|
+
require(['./components/SellReport/jinhong/JhPriceReport'], resolve)
|
|
928
|
+
})
|
|
922
929
|
// 天长客服中心报账单
|
|
923
930
|
Vue.component('tc-kf-summary', (resolve) => {
|
|
924
931
|
require(['./components/SellReport/ronghao/TCKFSummary'], resolve)
|