manage-client 3.3.91 → 3.3.94
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 +1 -1
- package/src/components/SellReport/FillCardSummary.vue +257 -0
- package/src/components/SellReport/FillGasSummary.vue +266 -0
- package/src/components/SellReport/MonthSellSummary.vue +267 -0
- package/src/components/SellReport/daySellSummary.vue +257 -0
- package/src/components/sale/filesquery/FmyGasDeviceQuery.vue +14 -0
- package/src/components/sale/filesquery/GasDeviceQuery.vue +14 -0
- package/src/filiale/WEINAN/ManageCompanyGasDetail.vue +16 -4
- package/src/filiale/WEINAN/ManageCompanyGasManage.vue +6 -1
- package/src/filiale/WEINAN/ManageCompanyGasSummary.vue +22 -10
- package/src/filiale/WEINAN/ManageSummaryReport.vue +20 -9
- package/src/filiale/haile/exportConfig.js +1 -1
- package/src/filiale/haile/sale/businessquery/ChargeQuery.vue +6 -0
- package/src/filiale/yuansheng/DayReportList.vue +2 -9
- package/src/reportManage.js +17 -0
|
@@ -0,0 +1,267 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 98%">
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
|
+
<p class="bg-info text-center" style="padding: 8px;">收费月统计报表</p>
|
|
6
|
+
<div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
|
|
7
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
8
|
+
<div class="row">
|
|
9
|
+
<div class="col-sm-4" >
|
|
10
|
+
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
11
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
12
|
+
v-model="model.startDate"
|
|
13
|
+
:value.sync="model.startDate"
|
|
14
|
+
:disabled-days-of-Week="[]"
|
|
15
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
+
:show-reset-button="reset">
|
|
17
|
+
</datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-4" >
|
|
20
|
+
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
21
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
22
|
+
v-model="model.endDate"
|
|
23
|
+
:value.sync="model.endDate"
|
|
24
|
+
:disabled-days-of-Week="[]"
|
|
25
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
+
:show-reset-button="reset">
|
|
27
|
+
</datepicker>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-4">
|
|
30
|
+
<label class="font_normal_body"> 公司 </label>
|
|
31
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
32
|
+
</div>
|
|
33
|
+
<div class="col-sm-4">
|
|
34
|
+
<label class="font_normal_body"> 部门 </label>
|
|
35
|
+
<res-select restype='department'
|
|
36
|
+
is-mul="false"
|
|
37
|
+
@res-select="$parent.$parent.getdep"
|
|
38
|
+
:parentresid="$parent.$parent.depresid"
|
|
39
|
+
:initresid='$parent.$parent.depid'>
|
|
40
|
+
</res-select>
|
|
41
|
+
|
|
42
|
+
</div>
|
|
43
|
+
<div class="col-sm-4">
|
|
44
|
+
<label class="font_normal_body"> 人员 </label>
|
|
45
|
+
<res-select restype='user'
|
|
46
|
+
is-mul="false"
|
|
47
|
+
@res-select="$parent.$parent.getuser"
|
|
48
|
+
:parentresid="$parent.$parent.userresid"
|
|
49
|
+
:initresid='$parent.$parent.operatorid'>
|
|
50
|
+
</res-select>
|
|
51
|
+
</div>
|
|
52
|
+
<div class="col-sm-4">
|
|
53
|
+
<label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
|
|
54
|
+
<v-select :value.sync="model.f_meter_type"
|
|
55
|
+
:options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
|
|
56
|
+
condition="f_meter_type = '{}'"
|
|
57
|
+
close-on-select></v-select>
|
|
58
|
+
</div>
|
|
59
|
+
|
|
60
|
+
<div class="col-sm-4">
|
|
61
|
+
<label class="font_normal_body">收费类型</label>
|
|
62
|
+
<v-select :value.sync="model.f_type" multiple
|
|
63
|
+
:options='$parent.$parent.chargetype' placeholder='请选择'
|
|
64
|
+
close-on-select clear-button
|
|
65
|
+
condition="f_type in {}"
|
|
66
|
+
v-model="model.f_type"></v-select>
|
|
67
|
+
</div>
|
|
68
|
+
</div>
|
|
69
|
+
<div class="span" style = "float:right;">
|
|
70
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
71
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
72
|
+
<report-excel id='gasprice'></report-excel>
|
|
73
|
+
</div>
|
|
74
|
+
</div>
|
|
75
|
+
</criteria>
|
|
76
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
77
|
+
<table class='tableprint' style="margin: 0px auto;">
|
|
78
|
+
<thead>
|
|
79
|
+
<tr>
|
|
80
|
+
<th colspan='18' style="font-weight: normal; text-align: left;">
|
|
81
|
+
<h2 style="text-align: center">{{$parent.orgname}}</h2>
|
|
82
|
+
<h3 style="text-align: center">收费月统计报表</h3>
|
|
83
|
+
</th>
|
|
84
|
+
</tr>
|
|
85
|
+
<tr>
|
|
86
|
+
<th colspan='18' style="font-weight: normal; text-align: center;">
|
|
87
|
+
开始时间：{{model.model.startDate}}
|
|
88
|
+
结束时间：{{ model.model.endDate }} <br/>
|
|
89
|
+
打印时间：{{{$parent.printTime}}}
|
|
90
|
+
</th>
|
|
91
|
+
</tr>
|
|
92
|
+
<tr>
|
|
93
|
+
<th colspan='18' style="font-weight: normal; text-align: center;">
|
|
94
|
+
<div>
|
|
95
|
+
<span v-show="$parent.depname.trim()!=''">网点：{{$parent.depname}}</span>
|
|
96
|
+
<span v-show="$parent.operatorname.trim()!=''">操作员：{{$parent.operatorname}}</span>
|
|
97
|
+
</div>
|
|
98
|
+
</th>
|
|
99
|
+
</tr>
|
|
100
|
+
</thead>
|
|
101
|
+
<tr>
|
|
102
|
+
<td colspan='18'>
|
|
103
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
104
|
+
</td>
|
|
105
|
+
</tr>
|
|
106
|
+
<tfoot>
|
|
107
|
+
<tr style="text-align: left">
|
|
108
|
+
<th colspan='6'>财务审核：</th>
|
|
109
|
+
<th colspan='6'>收款审核：</th>
|
|
110
|
+
<th colspan='6'>收款员：</th>
|
|
111
|
+
</tr>
|
|
112
|
+
</tfoot>
|
|
113
|
+
</table>
|
|
114
|
+
{{{ $parent.reportStr}}}
|
|
115
|
+
</div>
|
|
116
|
+
</criteria-paged>
|
|
117
|
+
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
118
|
+
<header slot="modal-header" class="modal-header">
|
|
119
|
+
<h4 class="modal-title">输入文件名称</h4>
|
|
120
|
+
</header>
|
|
121
|
+
<article slot="modal-body" class="modal-body">
|
|
122
|
+
<div class="form-group">
|
|
123
|
+
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
124
|
+
</div>
|
|
125
|
+
</article>
|
|
126
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
127
|
+
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
128
|
+
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
129
|
+
</footer>
|
|
130
|
+
</modal>
|
|
131
|
+
</div>
|
|
132
|
+
</template>
|
|
133
|
+
|
|
134
|
+
<script>
|
|
135
|
+
import { DataModel } from 'vue-client'
|
|
136
|
+
import co from 'co'
|
|
137
|
+
let saveFile = function * (self) {
|
|
138
|
+
// 线验证文件是否重名
|
|
139
|
+
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
140
|
+
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
141
|
+
{resolveMsg: null, rejectMsg: null})
|
|
142
|
+
if (count.data.length > 0) {
|
|
143
|
+
self.$showAlert('无法保存，文件名重名', 'warning', 3000)
|
|
144
|
+
return
|
|
145
|
+
}
|
|
146
|
+
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
147
|
+
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
|
|
148
|
+
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
149
|
+
f_outlets: this.$login.f.depname})
|
|
150
|
+
if (saveBack.data.status === 'succeed') {
|
|
151
|
+
self.show = false
|
|
152
|
+
self.filename = ''
|
|
153
|
+
// 后台保存完成，通知刷新
|
|
154
|
+
self.$dispatch('save-success', self.filename)
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
export default {
|
|
158
|
+
title: '收费月统计报表',
|
|
159
|
+
props: ['data'],
|
|
160
|
+
data () {
|
|
161
|
+
return {
|
|
162
|
+
printTime: this.$login.toStandardTimeString(),
|
|
163
|
+
depresid: [],
|
|
164
|
+
|
|
165
|
+
userresid: [],
|
|
166
|
+
f_orgid: this.$login.f.orgid,
|
|
167
|
+
f_depid: this.$login.f.depids,
|
|
168
|
+
f_operatorid: this.$login.f.id,
|
|
169
|
+
operatorid: [],
|
|
170
|
+
depid: [],
|
|
171
|
+
orgname: '',
|
|
172
|
+
depname: '',
|
|
173
|
+
operatorname: '',
|
|
174
|
+
meterbrands: [],
|
|
175
|
+
orgCondtionStr: '1=1',
|
|
176
|
+
model: new DataModel('rs/report/monthSellSummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
177
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
178
|
+
reportStr: null,
|
|
179
|
+
show: false,
|
|
180
|
+
}
|
|
181
|
+
},
|
|
182
|
+
ready () {
|
|
183
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardYearMonth() + '-01 00:00:00'
|
|
184
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
185
|
+
console.log(this.$login.f)
|
|
186
|
+
},
|
|
187
|
+
methods: {
|
|
188
|
+
searchData () {
|
|
189
|
+
this.$refs.paged.$refs.criteria.search()
|
|
190
|
+
},
|
|
191
|
+
selfSearch (args) {
|
|
192
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
193
|
+
let orgcondition = ` f_orgid in ('${this.f_orgid}')`
|
|
194
|
+
if (this.f_depid[0]) {
|
|
195
|
+
orgcondition += ` and f_depid in ('${this.f_depid}')`
|
|
196
|
+
}
|
|
197
|
+
if(this.f_operatorid[0]) {
|
|
198
|
+
orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
|
|
199
|
+
}
|
|
200
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
201
|
+
this.$refs.paged.search(args)
|
|
202
|
+
},
|
|
203
|
+
getRes (obj) {
|
|
204
|
+
this.orgname = obj.res[0]
|
|
205
|
+
this.depresid = obj.resids
|
|
206
|
+
this.f_orgid = obj.resids
|
|
207
|
+
},
|
|
208
|
+
getdep (obj, val) {
|
|
209
|
+
// this.depname = val[0]
|
|
210
|
+
this.userresid = obj
|
|
211
|
+
this.f_depid = obj
|
|
212
|
+
},
|
|
213
|
+
getuser ( obj, val) {
|
|
214
|
+
this.operatorname = val[0]
|
|
215
|
+
this.f_operatorid = obj
|
|
216
|
+
},
|
|
217
|
+
|
|
218
|
+
// 根据文件路径获取储存的报表内容
|
|
219
|
+
getFileContent (path) {
|
|
220
|
+
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
221
|
+
this.reportStr = res.data.filecontent
|
|
222
|
+
this.model.state = '正确'
|
|
223
|
+
})
|
|
224
|
+
},
|
|
225
|
+
confirm () {
|
|
226
|
+
if (!this.filename || this.filename === '') {
|
|
227
|
+
this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
|
|
228
|
+
}
|
|
229
|
+
let saveGen = saveFile(this)
|
|
230
|
+
co(saveGen)
|
|
231
|
+
},
|
|
232
|
+
close () {
|
|
233
|
+
this.show = false
|
|
234
|
+
},
|
|
235
|
+
// 将报表保存成文件
|
|
236
|
+
confirmReport () {
|
|
237
|
+
this.show = true
|
|
238
|
+
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
239
|
+
},
|
|
240
|
+
},
|
|
241
|
+
watch: {
|
|
242
|
+
'data' (val) {
|
|
243
|
+
if (val.f_files_path) {
|
|
244
|
+
this.getFileContent(val.f_files_path)
|
|
245
|
+
} else {
|
|
246
|
+
this.reportStr = null
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
},
|
|
250
|
+
computed: {
|
|
251
|
+
metertypes () {
|
|
252
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
253
|
+
},
|
|
254
|
+
chargetype () {
|
|
255
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费类型')]
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
</script>
|
|
260
|
+
<style scoped>
|
|
261
|
+
.noborder{
|
|
262
|
+
border: none;
|
|
263
|
+
}
|
|
264
|
+
.fontSize{
|
|
265
|
+
font-size: 13px;
|
|
266
|
+
}
|
|
267
|
+
</style>
|
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 98%">
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
|
+
<p class="bg-info text-center" style="padding: 8px;">收费日统计报表</p>
|
|
6
|
+
<div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
|
|
7
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
8
|
+
<div class="row">
|
|
9
|
+
<div class="col-sm-4" >
|
|
10
|
+
<label class="font_normal_body" for="startDate">统计日期:</label>
|
|
11
|
+
<datepicker id="startDate" placeholder="统计日期" style="width: 60%"
|
|
12
|
+
v-model="model.selectDate"
|
|
13
|
+
:value.sync="model.selectDate"
|
|
14
|
+
:disabled-days-of-Week="[]"
|
|
15
|
+
:format="'yyyy-MM-dd'"
|
|
16
|
+
:show-reset-button="reset">
|
|
17
|
+
</datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-4">
|
|
20
|
+
<label class="font_normal_body"> 公司 </label>
|
|
21
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
22
|
+
</div>
|
|
23
|
+
<div class="col-sm-4">
|
|
24
|
+
<label class="font_normal_body"> 部门 </label>
|
|
25
|
+
<res-select restype='department'
|
|
26
|
+
is-mul="false"
|
|
27
|
+
@res-select="$parent.$parent.getdep"
|
|
28
|
+
:parentresid="$parent.$parent.depresid"
|
|
29
|
+
:initresid='$parent.$parent.depid'>
|
|
30
|
+
</res-select>
|
|
31
|
+
|
|
32
|
+
</div>
|
|
33
|
+
<div class="col-sm-4">
|
|
34
|
+
<label class="font_normal_body"> 人员 </label>
|
|
35
|
+
<res-select restype='user'
|
|
36
|
+
is-mul="false"
|
|
37
|
+
@res-select="$parent.$parent.getuser"
|
|
38
|
+
:parentresid="$parent.$parent.userresid"
|
|
39
|
+
:initresid='$parent.$parent.operatorid'>
|
|
40
|
+
</res-select>
|
|
41
|
+
</div>
|
|
42
|
+
<div class="col-sm-4">
|
|
43
|
+
<label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
|
|
44
|
+
<v-select :value.sync="model.f_meter_type"
|
|
45
|
+
:options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
|
|
46
|
+
condition="f_meter_type = '{}'"
|
|
47
|
+
close-on-select></v-select>
|
|
48
|
+
</div>
|
|
49
|
+
|
|
50
|
+
<div class="col-sm-4">
|
|
51
|
+
<label class="font_normal_body">收费类型</label>
|
|
52
|
+
<v-select :value.sync="model.f_type" multiple
|
|
53
|
+
:options='$parent.$parent.chargetype' placeholder='请选择'
|
|
54
|
+
close-on-select clear-button
|
|
55
|
+
condition="f_type in {}"
|
|
56
|
+
v-model="model.f_type"></v-select>
|
|
57
|
+
</div>
|
|
58
|
+
</div>
|
|
59
|
+
<div class="span" style = "float:right;">
|
|
60
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
61
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
62
|
+
<report-excel id='gasprice'></report-excel>
|
|
63
|
+
</div>
|
|
64
|
+
</div>
|
|
65
|
+
</criteria>
|
|
66
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
67
|
+
<table class='tableprint' style="margin: 0px auto;">
|
|
68
|
+
<thead>
|
|
69
|
+
<tr>
|
|
70
|
+
<th colspan='18' style="font-weight: normal; text-align: left;">
|
|
71
|
+
<h2 style="text-align: center">{{$parent.orgname}}</h2>
|
|
72
|
+
<h3 style="text-align: center">收费日统计报表</h3>
|
|
73
|
+
</th>
|
|
74
|
+
</tr>
|
|
75
|
+
<tr>
|
|
76
|
+
<th colspan='18' style="font-weight: normal; text-align: center;">
|
|
77
|
+
统计日期：{{model.model.selectDate}}<br/>
|
|
78
|
+
打印时间：{{{$parent.printTime}}}
|
|
79
|
+
</th>
|
|
80
|
+
</tr>
|
|
81
|
+
<tr>
|
|
82
|
+
<th colspan='18' style="font-weight: normal; text-align: center;">
|
|
83
|
+
<div>
|
|
84
|
+
<span v-show="$parent.depname.trim()!=''">网点：{{$parent.depname}}</span>
|
|
85
|
+
<span v-show="$parent.operatorname.trim()!=''">操作员：{{$parent.operatorname}}</span>
|
|
86
|
+
</div>
|
|
87
|
+
</th>
|
|
88
|
+
</tr>
|
|
89
|
+
</thead>
|
|
90
|
+
<tr>
|
|
91
|
+
<td colspan='18'>
|
|
92
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
93
|
+
</td>
|
|
94
|
+
</tr>
|
|
95
|
+
<tfoot>
|
|
96
|
+
<th colspan='6'>财务审核：</th>
|
|
97
|
+
<th colspan='6'>收款审核：</th>
|
|
98
|
+
<th colspan='6'>收款员：</th>
|
|
99
|
+
</tfoot>
|
|
100
|
+
</table>
|
|
101
|
+
{{{ $parent.reportStr}}}
|
|
102
|
+
</div>
|
|
103
|
+
</criteria-paged>
|
|
104
|
+
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
105
|
+
<header slot="modal-header" class="modal-header">
|
|
106
|
+
<h4 class="modal-title">输入文件名称</h4>
|
|
107
|
+
</header>
|
|
108
|
+
<article slot="modal-body" class="modal-body">
|
|
109
|
+
<div class="form-group">
|
|
110
|
+
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
111
|
+
</div>
|
|
112
|
+
</article>
|
|
113
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
114
|
+
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
115
|
+
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
116
|
+
</footer>
|
|
117
|
+
</modal>
|
|
118
|
+
</div>
|
|
119
|
+
</template>
|
|
120
|
+
|
|
121
|
+
<script>
|
|
122
|
+
import { DataModel } from 'vue-client'
|
|
123
|
+
import co from 'co'
|
|
124
|
+
let saveFile = function * (self) {
|
|
125
|
+
// 线验证文件是否重名
|
|
126
|
+
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
127
|
+
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
128
|
+
{resolveMsg: null, rejectMsg: null})
|
|
129
|
+
if (count.data.length > 0) {
|
|
130
|
+
self.$showAlert('无法保存，文件名重名', 'warning', 3000)
|
|
131
|
+
return
|
|
132
|
+
}
|
|
133
|
+
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
134
|
+
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
|
|
135
|
+
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
136
|
+
f_outlets: this.$login.f.depname})
|
|
137
|
+
if (saveBack.data.status === 'succeed') {
|
|
138
|
+
self.show = false
|
|
139
|
+
self.filename = ''
|
|
140
|
+
// 后台保存完成，通知刷新
|
|
141
|
+
self.$dispatch('save-success', self.filename)
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
export default {
|
|
145
|
+
title: '收费日统计报表',
|
|
146
|
+
props: ['data'],
|
|
147
|
+
data () {
|
|
148
|
+
return {
|
|
149
|
+
printTime: this.$login.toStandardTimeString(),
|
|
150
|
+
depresid: [],
|
|
151
|
+
|
|
152
|
+
userresid: [],
|
|
153
|
+
f_orgid: this.$login.f.orgid,
|
|
154
|
+
f_depid: this.$login.f.depids,
|
|
155
|
+
f_operatorid: this.$login.f.id,
|
|
156
|
+
operatorid: [],
|
|
157
|
+
depid: [],
|
|
158
|
+
orgname: '',
|
|
159
|
+
depname: '',
|
|
160
|
+
operatorname: '',
|
|
161
|
+
meterbrands: [],
|
|
162
|
+
orgCondtionStr: '1=1',
|
|
163
|
+
model: new DataModel('rs/report/daySellSummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
164
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
165
|
+
reportStr: null,
|
|
166
|
+
show: false,
|
|
167
|
+
}
|
|
168
|
+
},
|
|
169
|
+
ready () {
|
|
170
|
+
this.$refs.paged.$refs.criteria.model.selectDate = this.$login.toStandardDateString()
|
|
171
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
172
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
173
|
+
console.log(this.$login.f)
|
|
174
|
+
},
|
|
175
|
+
methods: {
|
|
176
|
+
searchData () {
|
|
177
|
+
this.$refs.paged.$refs.criteria.search()
|
|
178
|
+
},
|
|
179
|
+
selfSearch (args) {
|
|
180
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
181
|
+
let orgcondition = ` f_orgid in ('${this.f_orgid}')`
|
|
182
|
+
if (this.f_depid[0]) {
|
|
183
|
+
orgcondition += ` and f_depid in ('${this.f_depid}')`
|
|
184
|
+
}
|
|
185
|
+
if(this.f_operatorid[0]) {
|
|
186
|
+
orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
|
|
187
|
+
}
|
|
188
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
189
|
+
this.$refs.paged.$refs.criteria.model.startDate = args.model.selectDate + ' 00:00:00'
|
|
190
|
+
this.$refs.paged.$refs.criteria.model.endDate = args.model.selectDate + ' 23:59:59'
|
|
191
|
+
this.$refs.paged.search(args)
|
|
192
|
+
},
|
|
193
|
+
getRes (obj) {
|
|
194
|
+
this.orgname = obj.res[0]
|
|
195
|
+
this.depresid = obj.resids
|
|
196
|
+
this.f_orgid = obj.resids
|
|
197
|
+
},
|
|
198
|
+
getdep (obj, val) {
|
|
199
|
+
// this.depname = val[0]
|
|
200
|
+
this.userresid = obj
|
|
201
|
+
this.f_depid = obj
|
|
202
|
+
},
|
|
203
|
+
getuser ( obj, val) {
|
|
204
|
+
this.operatorname = val[0]
|
|
205
|
+
this.f_operatorid = obj
|
|
206
|
+
},
|
|
207
|
+
|
|
208
|
+
// 根据文件路径获取储存的报表内容
|
|
209
|
+
getFileContent (path) {
|
|
210
|
+
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
211
|
+
this.reportStr = res.data.filecontent
|
|
212
|
+
this.model.state = '正确'
|
|
213
|
+
})
|
|
214
|
+
},
|
|
215
|
+
confirm () {
|
|
216
|
+
if (!this.filename || this.filename === '') {
|
|
217
|
+
this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
|
|
218
|
+
}
|
|
219
|
+
let saveGen = saveFile(this)
|
|
220
|
+
co(saveGen)
|
|
221
|
+
},
|
|
222
|
+
close () {
|
|
223
|
+
this.show = false
|
|
224
|
+
},
|
|
225
|
+
// 将报表保存成文件
|
|
226
|
+
confirmReport () {
|
|
227
|
+
this.show = true
|
|
228
|
+
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
229
|
+
},
|
|
230
|
+
},
|
|
231
|
+
watch: {
|
|
232
|
+
'data' (val) {
|
|
233
|
+
if (val.f_files_path) {
|
|
234
|
+
this.getFileContent(val.f_files_path)
|
|
235
|
+
} else {
|
|
236
|
+
this.reportStr = null
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
},
|
|
240
|
+
computed: {
|
|
241
|
+
metertypes () {
|
|
242
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
243
|
+
},
|
|
244
|
+
chargetype () {
|
|
245
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费类型')]
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
</script>
|
|
250
|
+
<style scoped>
|
|
251
|
+
.noborder{
|
|
252
|
+
border: none;
|
|
253
|
+
}
|
|
254
|
+
.fontSize{
|
|
255
|
+
font-size: 13px;
|
|
256
|
+
}
|
|
257
|
+
</style>
|
|
@@ -106,6 +106,19 @@
|
|
|
106
106
|
|
|
107
107
|
</v-select>
|
|
108
108
|
</div>
|
|
109
|
+
<div class="col-sm-2 form-group" >
|
|
110
|
+
<label class="font_normal_body">设备类型</label>
|
|
111
|
+
<v-select :value.sync="model.f_devices_type"
|
|
112
|
+
v-model="model.f_devices_type"
|
|
113
|
+
:options='$parent.$parent.deviceTypes' placeholder='请选择'
|
|
114
|
+
condition="f_devices_type = '{}'"
|
|
115
|
+
close-on-select></v-select>
|
|
116
|
+
</div>
|
|
117
|
+
<div class="col-sm-2 form-group" >
|
|
118
|
+
<label class="font_normal_body">设备品牌</label>
|
|
119
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_brand"
|
|
120
|
+
condition="f_brand like '%{}%'" placeholder='设备品牌'>
|
|
121
|
+
</div>
|
|
109
122
|
</div>
|
|
110
123
|
</div>
|
|
111
124
|
</criteria>
|
|
@@ -472,6 +485,7 @@
|
|
|
472
485
|
titles:'',
|
|
473
486
|
other:[],
|
|
474
487
|
footer:[],
|
|
488
|
+
deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
|
|
475
489
|
model: new PagedList('rs/sql/fmyGasDeviceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
|
|
476
490
|
criteriaShow: false,
|
|
477
491
|
orgCondtionStr: '',
|
|
@@ -112,6 +112,19 @@
|
|
|
112
112
|
close-on-select>
|
|
113
113
|
</v-select>
|
|
114
114
|
</div>
|
|
115
|
+
<div class="col-sm-2 form-group" >
|
|
116
|
+
<label class="font_normal_body">设备类型</label>
|
|
117
|
+
<v-select :value.sync="model.f_devices_type"
|
|
118
|
+
v-model="model.f_devices_type"
|
|
119
|
+
:options='$parent.$parent.deviceTypes' placeholder='请选择'
|
|
120
|
+
condition="f_devices_type = '{}'"
|
|
121
|
+
close-on-select></v-select>
|
|
122
|
+
</div>
|
|
123
|
+
<div class="col-sm-2 form-group" >
|
|
124
|
+
<label class="font_normal_body">设备品牌</label>
|
|
125
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_brand"
|
|
126
|
+
condition="f_brand like '%{}%'" placeholder='设备品牌'>
|
|
127
|
+
</div>
|
|
115
128
|
</div>
|
|
116
129
|
</div>
|
|
117
130
|
</criteria>
|
|
@@ -571,6 +584,7 @@
|
|
|
571
584
|
titles:'',
|
|
572
585
|
other:[],
|
|
573
586
|
footer:[],
|
|
587
|
+
deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
|
|
574
588
|
model: new PagedList('rs/sql/myGasDeviceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
|
|
575
589
|
criteriaShow: false,
|
|
576
590
|
orgCondtionStr: '',
|
|
@@ -127,10 +127,8 @@
|
|
|
127
127
|
<!-- </td>-->
|
|
128
128
|
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
129
129
|
<!-- 用气量: {{ sumsmodel.f_oughtamount }}m³-->
|
|
130
|
-
<!--
|
|
131
|
-
<!--
|
|
132
|
-
<!-- 售气量: {{ sumsmodel.f_pregas }}m³-->
|
|
133
|
-
<!-- </td>-->
|
|
130
|
+
<!-- <' and f_user_usetype in (\'居民用气\')'d style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
131
|
+
<!-- ' and f_user_usetype in (\'公福用气\',\'商业用户\',\'工业用户\')' <!-- </td>-->
|
|
134
132
|
<!-- </tr>-->
|
|
135
133
|
<!-- </table>-->
|
|
136
134
|
</div>
|
|
@@ -226,6 +224,20 @@ export default {
|
|
|
226
224
|
args.condition = `${args.condition} and f_corporate_name_id = '${this.data.id}'`
|
|
227
225
|
this.$refs.paged.$refs.cri.model.startDate = this.data.startDate
|
|
228
226
|
this.$refs.paged.$refs.cri.model.endDate = this.data.endDate
|
|
227
|
+
if (this.data.f_user_type == '民用' && !this.data.f_user_usetype) {
|
|
228
|
+
args.condition = args.condition + " and f_user_usetype in ('居民用气')"
|
|
229
|
+
} else if (this.data.f_user_type == '非民用' && !this.data.f_user_usetype) {
|
|
230
|
+
args.condition = args.condition + " and f_user_usetype in ('公福用气','商业用户','工业用户')"
|
|
231
|
+
}
|
|
232
|
+
if (this.data.f_user_usetype) {
|
|
233
|
+
args.condition = args.condition + ` and f_user_usetype in (${this.data.f_user_usetype})`
|
|
234
|
+
}
|
|
235
|
+
if (this.data.f_user_usenature) {
|
|
236
|
+
args.condition = args.condition + ` and f_user_usenature in ('${this.data.f_user_usetype}')`
|
|
237
|
+
}
|
|
238
|
+
if (this.data.f_use_institution) {
|
|
239
|
+
args.condition = args.condition + ` and f_use_institution in ('${this.data.f_user_usetype}')`
|
|
240
|
+
}
|
|
229
241
|
this.condition = args.condition
|
|
230
242
|
console.log('查看条件', this.condition)
|
|
231
243
|
this.model.search(args.condition, args.model)
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
:style="style">
|
|
7
7
|
</manage-company-gas-summary>
|
|
8
8
|
</div>
|
|
9
|
-
<div v-
|
|
9
|
+
<div v-if="showDetail" class="binary-right">
|
|
10
10
|
<div class="flex">
|
|
11
11
|
<manage-company-gas-detail v-if="showDetail" :data="row">
|
|
12
12
|
</manage-company-gas-detail>
|
|
@@ -36,6 +36,10 @@ export default {
|
|
|
36
36
|
this.row = obj.val
|
|
37
37
|
this.row.startDate = this.$refs.gas.$refs.paged.$refs.cri.model.startDate
|
|
38
38
|
this.row.endDate = this.$refs.gas.$refs.paged.$refs.cri.model.endDate
|
|
39
|
+
this.row.f_user_type = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_type
|
|
40
|
+
this.row.f_user_usetype = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usetype
|
|
41
|
+
this.row.f_user_usenature = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usenature
|
|
42
|
+
this.row.f_use_institution = this.$refs.gas.$refs.paged.$refs.cri.model.f_use_institution
|
|
39
43
|
}
|
|
40
44
|
},
|
|
41
45
|
refresh () {
|
|
@@ -45,6 +49,7 @@ export default {
|
|
|
45
49
|
'cancel' () {
|
|
46
50
|
this.style = 'col-sm-2 form-group'
|
|
47
51
|
this.row = null
|
|
52
|
+
this.$refs.gas.$refs.paged.$refs.grid.cleanSelected()
|
|
48
53
|
this.showDetail = false
|
|
49
54
|
}
|
|
50
55
|
}
|