manage-client 3.2.276 → 3.2.278
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/package.json
CHANGED
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 100%">
|
|
3
|
+
<div class="form-group" >
|
|
4
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
5
|
+
<div class="row">
|
|
6
|
+
<div class="col-sm-3 form-group" >
|
|
7
|
+
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
8
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
9
|
+
v-model="model.startDate"
|
|
10
|
+
:value.sync="model.startDate"
|
|
11
|
+
:disabled-days-of-Week="[]"
|
|
12
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
13
|
+
:show-reset-button="reset">
|
|
14
|
+
</datepicker>
|
|
15
|
+
</div>
|
|
16
|
+
<div class="col-sm-3 form-group" >
|
|
17
|
+
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
18
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
19
|
+
v-model="model.endDate"
|
|
20
|
+
:value.sync="model.endDate"
|
|
21
|
+
:disabled-days-of-Week="[]"
|
|
22
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
23
|
+
:show-reset-button="reset">
|
|
24
|
+
</datepicker>
|
|
25
|
+
</div>
|
|
26
|
+
<div class="col-sm-3 form-group" >
|
|
27
|
+
<label class="font_normal_body" for="org">公  司:</label>
|
|
28
|
+
<right-tree id="org" @re-res="getRes"></right-tree>
|
|
29
|
+
</div>
|
|
30
|
+
<div class="col-sm-3 form-group">
|
|
31
|
+
<label class="font_normal_body" for="dep" >部  门:</label>
|
|
32
|
+
<res-select id="dep" restype='department'
|
|
33
|
+
@res-select="getdep"
|
|
34
|
+
:parentresid="depresid"
|
|
35
|
+
:initresid='queryData.depid' >
|
|
36
|
+
</res-select>
|
|
37
|
+
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-3 form-group">
|
|
40
|
+
<label class="font_normal_body" for="oper">人  员:</label>
|
|
41
|
+
<res-select id="oper" restype='user'
|
|
42
|
+
is-mul="false"
|
|
43
|
+
@res-select="getuser"
|
|
44
|
+
:parentresid="userresid"
|
|
45
|
+
:initresid='queryData.operatorid'>
|
|
46
|
+
</res-select>
|
|
47
|
+
</div>
|
|
48
|
+
<div class="col-sm-2 form-group" style="float:right;">
|
|
49
|
+
<button class="button_search" @click="searchData()">查询</button>
|
|
50
|
+
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':criteriaShow,
|
|
51
|
+
'button_shrink_bottom':!criteriaShow}" @click="hidden()"></div>
|
|
52
|
+
</div>
|
|
53
|
+
</div>
|
|
54
|
+
</div>
|
|
55
|
+
<div style="width:100%;height: 100%;margin-top: 2%" class="div-iframe">
|
|
56
|
+
<iframe class="iframe_style" style="width:100%;height:100% ;border: medium none;" :src="url" v-if="isShow"></iframe>
|
|
57
|
+
</div>
|
|
58
|
+
</div>
|
|
59
|
+
</div>
|
|
60
|
+
</template>
|
|
61
|
+
|
|
62
|
+
<script>
|
|
63
|
+
export default {
|
|
64
|
+
title: '客户类型分项汇总表',
|
|
65
|
+
data () {
|
|
66
|
+
return {
|
|
67
|
+
orgCondtionStr: '1=1',
|
|
68
|
+
model: {
|
|
69
|
+
startDate: '',
|
|
70
|
+
endDate: ''
|
|
71
|
+
},
|
|
72
|
+
isShow: false,
|
|
73
|
+
url: '',
|
|
74
|
+
urlPrefix: 'http://59.48.150.94:8488/report/jmreport/shareView/815841832143192064',
|
|
75
|
+
queryData: {
|
|
76
|
+
f_orgid: [],
|
|
77
|
+
f_depid: [],
|
|
78
|
+
f_operatorid: []
|
|
79
|
+
},
|
|
80
|
+
orgname: '',
|
|
81
|
+
depresid: [],
|
|
82
|
+
userresid: [],
|
|
83
|
+
depname: '',
|
|
84
|
+
operatorname: '',
|
|
85
|
+
operatorid: [],
|
|
86
|
+
depid: [],
|
|
87
|
+
criteriaShow: false
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
ready () {
|
|
91
|
+
this.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
92
|
+
this.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
93
|
+
this.searchData()
|
|
94
|
+
},
|
|
95
|
+
methods: {
|
|
96
|
+
searchData () {
|
|
97
|
+
let queryData = ''
|
|
98
|
+
queryData = this.orgCondtionStr
|
|
99
|
+
for (let key in this.queryData) {
|
|
100
|
+
if (this.queryData[key] !== null && this.queryData[key] !== '' && this.queryData[key] !== undefined && this.queryData[key].length > 0) {
|
|
101
|
+
if (Array.isArray(this.queryData[key])) {
|
|
102
|
+
let stringValue = ''
|
|
103
|
+
for (var i = 0; i < this.queryData[key].length; i++) {
|
|
104
|
+
if (i === this.queryData[key].length - 1) {
|
|
105
|
+
stringValue = stringValue + "'" + this.queryData[key][i] + "'"
|
|
106
|
+
} else {
|
|
107
|
+
stringValue = stringValue + "'" + this.queryData[key][i] + "',"
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
queryData = queryData + ' and t.' + key + ' in (' + stringValue + ')'
|
|
111
|
+
} else {
|
|
112
|
+
queryData = queryData + ' and t.' + key + ' = ' + "'" + this.queryData[key] + "'"
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
console.log(queryData)
|
|
117
|
+
// 重置url
|
|
118
|
+
this.url = ''
|
|
119
|
+
// encodeURIComponent是将该参数中的特殊符号进行编码，后端会进行解码
|
|
120
|
+
this.url = this.urlPrefix + '?condition=' + encodeURIComponent(queryData) +
|
|
121
|
+
'&startDate=' + encodeURIComponent(this.model.startDate) +
|
|
122
|
+
'&endDate=' + encodeURIComponent(this.model.endDate)
|
|
123
|
+
console.log('报表===' + queryData)
|
|
124
|
+
console.log('报表===>' + this.url)
|
|
125
|
+
this.isShow = true
|
|
126
|
+
},
|
|
127
|
+
load () {
|
|
128
|
+
this.isShow = true
|
|
129
|
+
},
|
|
130
|
+
getRes (obj) {
|
|
131
|
+
this.orgname = obj.res[0]
|
|
132
|
+
this.depresid = obj.resids
|
|
133
|
+
this.userresid = obj.resids
|
|
134
|
+
this.queryData.f_orgid = obj.resids
|
|
135
|
+
},
|
|
136
|
+
getdep (obj, val) {
|
|
137
|
+
this.depname = val[0]
|
|
138
|
+
this.userresid = obj
|
|
139
|
+
this.queryData.f_depid = obj
|
|
140
|
+
},
|
|
141
|
+
getuser (obj, val) {
|
|
142
|
+
this.operatorname = val[0]
|
|
143
|
+
this.queryData.f_operatorid = obj
|
|
144
|
+
},
|
|
145
|
+
hidden () {
|
|
146
|
+
this.criteriaShow = !this.criteriaShow
|
|
147
|
+
}
|
|
148
|
+
},
|
|
149
|
+
computed: {
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
</script>
|
|
153
|
+
<style scoped>
|
|
154
|
+
.noborder{
|
|
155
|
+
border: none;
|
|
156
|
+
}
|
|
157
|
+
.span{
|
|
158
|
+
height: 0;
|
|
159
|
+
}
|
|
160
|
+
.iframe_style{
|
|
161
|
+
border: medium none;
|
|
162
|
+
}
|
|
163
|
+
</style>
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="unit" class="flex-row" >
|
|
3
|
+
<div class="basic-main" :style="{width:width}">
|
|
4
|
+
<day-report-list @getdata="getdata" @close="close" @show="show" :style="style" v-ref:list ></day-report-list>
|
|
5
|
+
</div>
|
|
6
|
+
<div class="binary-right" v-if="summaryshow">
|
|
7
|
+
<ul class="nav nav-tabs">
|
|
8
|
+
<li class="active"><a href="#">数据汇总</a></li>
|
|
9
|
+
</ul>
|
|
10
|
+
<day-report-summary :sumsmodel="sumsmodel" v-ref:gas></day-report-summary>
|
|
11
|
+
</div>
|
|
12
|
+
</div>
|
|
13
|
+
</template>
|
|
14
|
+
|
|
15
|
+
<script>
|
|
16
|
+
|
|
17
|
+
export default {
|
|
18
|
+
title:'缴费明细报表',
|
|
19
|
+
name: "DayReport",
|
|
20
|
+
data () {
|
|
21
|
+
return {
|
|
22
|
+
width:'100%',
|
|
23
|
+
summaryshow:false,
|
|
24
|
+
style:'col-sm-2'
|
|
25
|
+
}
|
|
26
|
+
},
|
|
27
|
+
ready(){
|
|
28
|
+
},
|
|
29
|
+
methods:{
|
|
30
|
+
getdata(val){
|
|
31
|
+
console.log(val)
|
|
32
|
+
this.sumsmodel = val
|
|
33
|
+
},
|
|
34
|
+
show(){
|
|
35
|
+
this.width = '58%'
|
|
36
|
+
this.summaryshow = true
|
|
37
|
+
this.style='col-sm-3'
|
|
38
|
+
},
|
|
39
|
+
close(){
|
|
40
|
+
this.width = '100%'
|
|
41
|
+
this.summaryshow = false
|
|
42
|
+
this.style='col-sm-2'
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
</script>
|
|
47
|
+
|
|
48
|
+
<style>
|
|
49
|
+
</style>
|
|
50
|
+
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
<label class="font_normal_body">操作类型</label>
|
|
41
41
|
<v-select :value.sync="model.f_type" v-model="model.f_type"
|
|
42
42
|
:options='$parent.$parent.operates' placeholder='请选择'
|
|
43
|
-
condition="f_type
|
|
43
|
+
condition="f_type in {}" multiple
|
|
44
44
|
close-on-select></v-select>
|
|
45
45
|
</div>
|
|
46
46
|
<div :class="$parent.$parent.style">
|
|
@@ -51,10 +51,10 @@
|
|
|
51
51
|
close-on-select></v-select>
|
|
52
52
|
</div>
|
|
53
53
|
<div :class="$parent.$parent.style">
|
|
54
|
-
<label class="font_normal_body"
|
|
55
|
-
<v-select :value.sync="model.
|
|
56
|
-
:options='$parent.$parent.
|
|
57
|
-
condition="
|
|
54
|
+
<label class="font_normal_body">缴费渠道</label>
|
|
55
|
+
<v-select :value.sync="model.f_payment" v-model="model.f_payment"
|
|
56
|
+
:options='$parent.$parent.paymentchannels' placeholder='请选择'
|
|
57
|
+
condition="f_payment {} "
|
|
58
58
|
close-on-select></v-select>
|
|
59
59
|
</div>
|
|
60
60
|
<div :class="$parent.$parent.style">
|
|
@@ -113,24 +113,24 @@
|
|
|
113
113
|
<th><data-order field="f_operate_date" name="操作时间"></data-order>
|
|
114
114
|
<!--<nobr>操作时间</nobr>-->
|
|
115
115
|
</th>
|
|
116
|
-
<th
|
|
117
|
-
<data-order field="f_stair1price" name="1单价"></data-order
|
|
118
|
-
</th
|
|
119
|
-
<th
|
|
120
|
-
<data-order field="f_stair1amount" name="1气量"></data-order
|
|
121
|
-
</th
|
|
122
|
-
<th
|
|
123
|
-
<data-order field="f_stair2price" name="2单价"></data-order
|
|
124
|
-
</th
|
|
125
|
-
<th
|
|
126
|
-
<data-order field="f_stair2amount" name="2气量"></data-order
|
|
127
|
-
</th
|
|
128
|
-
<th
|
|
129
|
-
<data-order field="f_stair3price" name="3单价"></data-order
|
|
130
|
-
</th
|
|
131
|
-
<th
|
|
132
|
-
<data-order field="f_stair3amount" name="3气量"></data-order
|
|
133
|
-
</th
|
|
116
|
+
<!-- <th>-->
|
|
117
|
+
<!-- <data-order field="f_stair1price" name="1单价"></data-order>-->
|
|
118
|
+
<!-- </th>-->
|
|
119
|
+
<!-- <th>-->
|
|
120
|
+
<!-- <data-order field="f_stair1amount" name="1气量"></data-order>-->
|
|
121
|
+
<!-- </th>-->
|
|
122
|
+
<!-- <th>-->
|
|
123
|
+
<!-- <data-order field="f_stair2price" name="2单价"></data-order>-->
|
|
124
|
+
<!-- </th>-->
|
|
125
|
+
<!-- <th>-->
|
|
126
|
+
<!-- <data-order field="f_stair2amount" name="2气量"></data-order>-->
|
|
127
|
+
<!-- </th>-->
|
|
128
|
+
<!-- <th>-->
|
|
129
|
+
<!-- <data-order field="f_stair3price" name="3单价"></data-order>-->
|
|
130
|
+
<!-- </th>-->
|
|
131
|
+
<!-- <th>-->
|
|
132
|
+
<!-- <data-order field="f_stair3amount" name="3气量"></data-order>-->
|
|
133
|
+
<!-- </th>-->
|
|
134
134
|
<th>
|
|
135
135
|
<data-order field="f_pregas" name="气量"></data-order>
|
|
136
136
|
</th>
|
|
@@ -175,12 +175,12 @@
|
|
|
175
175
|
<td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
|
|
176
176
|
<td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
|
|
177
177
|
<td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
|
|
178
|
-
<td style="text-align: center;"><nobr>{{row.f_stair1price}}</nobr></td
|
|
179
|
-
<td style="text-align: center;"><nobr>{{row.f_stair1amount}}</nobr></td
|
|
180
|
-
<td style="text-align: center;"><nobr>{{row.f_stair2price}}</nobr></td
|
|
181
|
-
<td style="text-align: center;"><nobr>{{row.f_stair2amount}}</nobr></td
|
|
182
|
-
<td style="text-align: center;"><nobr>{{row.f_stair3price}}</nobr></td
|
|
183
|
-
<td style="text-align: center;"><nobr>{{row.f_stair3amount}}</nobr></td
|
|
178
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_stair1price}}</nobr></td>-->
|
|
179
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_stair1amount}}</nobr></td>-->
|
|
180
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_stair2price}}</nobr></td>-->
|
|
181
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_stair2amount}}</nobr></td>-->
|
|
182
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_stair3price}}</nobr></td>-->
|
|
183
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_stair3amount}}</nobr></td>-->
|
|
184
184
|
<td style="text-align: center;"><nobr>{{row.f_pregas}}</nobr></td>
|
|
185
185
|
<td style="text-align: center;"><nobr>{{row.f_preamount}}</nobr></td>
|
|
186
186
|
<td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
|
|
@@ -211,6 +211,9 @@
|
|
|
211
211
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
212
212
|
实收金额合计: {{sumsmodel.f_collection}}
|
|
213
213
|
</td>
|
|
214
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
215
|
+
交易次数合计: {{totalCount}}
|
|
216
|
+
</td>
|
|
214
217
|
</tr>
|
|
215
218
|
</table>
|
|
216
219
|
</div>
|
|
@@ -230,7 +233,7 @@ let readyGen = async function (self) {
|
|
|
230
233
|
}
|
|
231
234
|
export default {
|
|
232
235
|
components: {DayReportSummary},
|
|
233
|
-
title: '
|
|
236
|
+
title: '缴费明细报表',
|
|
234
237
|
props: {
|
|
235
238
|
style: {
|
|
236
239
|
type: String,
|
|
@@ -287,15 +290,17 @@ export default {
|
|
|
287
290
|
orgname: '',
|
|
288
291
|
depname: '',
|
|
289
292
|
criteriaShow: false,
|
|
290
|
-
operates: [{label: '全部', value: ''}, {label: '发卡售气', value: "发卡售气"},{label: '卡表收费', value: "卡表收费"},{label: '补气', value: "补气"},{label: '补卡', value: "补卡"},{label: '换表', value: "换表"},{label: '冲正', value: "冲正"}],
|
|
291
|
-
|
|
293
|
+
operates: [{label: '全部', value: ''}, {label: '发卡售气', value: "发卡售气"},{label: '卡表收费', value: "卡表收费"},{label: '补气', value: "补气"},{label: '补卡', value: "补卡"},{label: '换表', value: "换表"},{label: '冲正', value: "冲正"},{label: '物联网收费', value: "物联网收费"}],
|
|
294
|
+
paymentchannels: [{label: '全部', value: ''},{label: '营业厅', value: "not in ('支付宝','微信公众号')"},{label: '支付宝', value: " = '支付宝'"},{label: '微信公众号', value: "= '微信公众号'"}],
|
|
295
|
+
// hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
|
|
296
|
+
totalCount: 0
|
|
292
297
|
}
|
|
293
298
|
},
|
|
294
299
|
ready() {
|
|
295
300
|
readyGen(this)
|
|
296
301
|
this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
|
|
297
302
|
this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
|
|
298
|
-
this.$refs.paged.$refs.cri.model.f_type = ['卡表收费']
|
|
303
|
+
this.$refs.paged.$refs.cri.model.f_type = ['卡表收费','物联网收费','发卡售气']
|
|
299
304
|
this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
|
|
300
305
|
this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
|
|
301
306
|
// this.search()
|
|
@@ -310,8 +315,9 @@ export default {
|
|
|
310
315
|
cancel() {
|
|
311
316
|
this.listpage = false
|
|
312
317
|
},
|
|
313
|
-
search() {
|
|
314
|
-
this.$refs.paged.$refs.cri.search()
|
|
318
|
+
async search() {
|
|
319
|
+
await this.$refs.paged.$refs.cri.search()
|
|
320
|
+
this.totalCount = this.$refs.paged.$refs.grid.model.count
|
|
315
321
|
},
|
|
316
322
|
async selfSearch(args) {
|
|
317
323
|
let f_orgstr = this.orgCondtionStr
|
|
@@ -329,7 +335,8 @@ export default {
|
|
|
329
335
|
this.model.params.operatorState = this.$refs.paged.$refs.cri.model.f_type + ''
|
|
330
336
|
|
|
331
337
|
await this.model.search(args.condition, args.model)
|
|
332
|
-
|
|
338
|
+
console.log('。。。。。。' + JSON.stringify(this.$refs.paged.$refs.grid.model))
|
|
339
|
+
this.totalCount = this.$refs.paged.$refs.grid.model.count
|
|
333
340
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
334
341
|
console.log('计算合计。', this.sumsmodel)
|
|
335
342
|
if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
|