manage-client 3.3.38 → 3.3.41
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/handReport/GeneraHandReport.vue +235 -0
- package/src/components/sale/filesquery/UserQuery.vue +21 -2
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +10 -10
- package/src/filiale/haile/exportConfig.js +1 -1
- package/src/filiale/haile/sale/businessquery/ChargeQuery.vue +6 -0
- package/src/reportManage.js +5 -1
package/package.json
CHANGED
|
@@ -0,0 +1,235 @@
|
|
|
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
|
+
<div class="col-sm-2 form-group">
|
|
28
|
+
<label class="font_normal_body" title="分组项一">分组项</label>
|
|
29
|
+
<v-select :value.sync="model.f_public_group1"
|
|
30
|
+
v-model="model.f_public_group1"
|
|
31
|
+
v-ref:groupone
|
|
32
|
+
:options='$parent.$parent.group1' placeholder='请选择'
|
|
33
|
+
close-on-select></v-select>
|
|
34
|
+
</div>
|
|
35
|
+
<div class="col-sm-2 form-group">
|
|
36
|
+
<label class="font_normal_body"> 公司 </label>
|
|
37
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-2 form-group">
|
|
40
|
+
<label class="font_normal_body"> 部门 </label>
|
|
41
|
+
<res-select restype='department'
|
|
42
|
+
@res-select="$parent.$parent.getdep"
|
|
43
|
+
:parentresid ="$parent.$parent.depresid"
|
|
44
|
+
:initresid='$parent.$parent.depid'>
|
|
45
|
+
</res-select>
|
|
46
|
+
|
|
47
|
+
</div>
|
|
48
|
+
<div class="col-sm-2 form-group">
|
|
49
|
+
<label class="font_normal_body"> 人员 </label>
|
|
50
|
+
<res-select restype='user'
|
|
51
|
+
@res-select="$parent.$parent.getuser"
|
|
52
|
+
:parentresid="$parent.$parent.userresid"
|
|
53
|
+
:initresid='$parent.$parent.operatorid'>
|
|
54
|
+
</res-select>
|
|
55
|
+
</div>
|
|
56
|
+
|
|
57
|
+
<div style = "float:right;">
|
|
58
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
59
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
60
|
+
<report-excel id='gasprice'></report-excel>
|
|
61
|
+
</div>
|
|
62
|
+
</div>
|
|
63
|
+
</div>
|
|
64
|
+
</criteria>
|
|
65
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
66
|
+
<table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
|
|
67
|
+
<thead>
|
|
68
|
+
<tr>
|
|
69
|
+
<th colspan='8' style="font-weight: bold; text-align: left;">
|
|
70
|
+
<h3 style="text-align: center">机表抄表分项报表</h3>
|
|
71
|
+
</th>
|
|
72
|
+
</tr>
|
|
73
|
+
<tr>
|
|
74
|
+
<th colspan='8' style="font-weight: normal; text-align: center;">
|
|
75
|
+
开始时间：{{model.model.startDate}}
|
|
76
|
+
结束时间：{{ model.model.endDate }}
|
|
77
|
+
</th>
|
|
78
|
+
</tr>
|
|
79
|
+
<tr>
|
|
80
|
+
<th colspan='8' style="font-weight: normal; text-align: center;">
|
|
81
|
+
打印时间：{{{$parent.printTime}}}
|
|
82
|
+
</th>
|
|
83
|
+
</tr>
|
|
84
|
+
<tr>
|
|
85
|
+
<th colspan='8' style="font-weight: normal; text-align: center;">
|
|
86
|
+
<div>
|
|
87
|
+
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
88
|
+
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
89
|
+
</div>
|
|
90
|
+
</th>
|
|
91
|
+
</tr>
|
|
92
|
+
</thead>
|
|
93
|
+
<tr>
|
|
94
|
+
<td colspan='8' style="font-weight: normal;" id="test">
|
|
95
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
96
|
+
</td>
|
|
97
|
+
</tr>
|
|
98
|
+
<tfoot>
|
|
99
|
+
<tr style="text-align: left">
|
|
100
|
+
<th colspan='3' style="font-weight: normal; text-align: center;">
|
|
101
|
+
收款人：
|
|
102
|
+
</th><th colspan='3' style="font-weight: normal; text-align: center;">
|
|
103
|
+
审核人：
|
|
104
|
+
</th><th colspan='2' style="font-weight: normal; text-align: center;">
|
|
105
|
+
经手人：
|
|
106
|
+
</th>
|
|
107
|
+
</tr>
|
|
108
|
+
</tfoot>
|
|
109
|
+
</table>
|
|
110
|
+
{{{ $parent.reportStr}}}
|
|
111
|
+
</div>
|
|
112
|
+
</criteria-paged>
|
|
113
|
+
</div>
|
|
114
|
+
</template>
|
|
115
|
+
|
|
116
|
+
<script>
|
|
117
|
+
import { DataModel } from 'vue-client'
|
|
118
|
+
import co from 'co'
|
|
119
|
+
export default {
|
|
120
|
+
title: '机表抄表分项报表',
|
|
121
|
+
props: ['data'],
|
|
122
|
+
data () {
|
|
123
|
+
return {
|
|
124
|
+
printTime: this.$login.toStandardTimeString(),
|
|
125
|
+
depresid: [],
|
|
126
|
+
userresid: [],
|
|
127
|
+
initres: {
|
|
128
|
+
org:[this.$login.f.orgid],
|
|
129
|
+
dep:[],
|
|
130
|
+
user:[]
|
|
131
|
+
},
|
|
132
|
+
f_public_group1: '',
|
|
133
|
+
f_orgid: this.$login.f.orgid,
|
|
134
|
+
f_depid: this.$login.f.depids,
|
|
135
|
+
f_operatorid: this.$login.f.id,
|
|
136
|
+
operatorid: [],
|
|
137
|
+
depid: [],
|
|
138
|
+
orgname: '',
|
|
139
|
+
group1Name: '',
|
|
140
|
+
depname: '',
|
|
141
|
+
operatorname: '',
|
|
142
|
+
orgCondtionStr: '1=1',
|
|
143
|
+
model: new DataModel('rs/report/GeneraHandReport',
|
|
144
|
+
{startDate: 'this.model.startDate',
|
|
145
|
+
endDate: 'this.model.endDate',
|
|
146
|
+
f_orgid: 'this.model.f_orgid',
|
|
147
|
+
f_public_group1: 'this.model.f_public_group1[0]',
|
|
148
|
+
group1Name: 'this.model.group1Name'
|
|
149
|
+
}
|
|
150
|
+
),
|
|
151
|
+
reportStr: null,
|
|
152
|
+
show: false,
|
|
153
|
+
spans: ''
|
|
154
|
+
}
|
|
155
|
+
},
|
|
156
|
+
ready () {
|
|
157
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
158
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
159
|
+
// this.$refs.paged.$refs.criteria.search()
|
|
160
|
+
},
|
|
161
|
+
methods: {
|
|
162
|
+
searchData () {
|
|
163
|
+
this.$refs.paged.$refs.criteria.search()
|
|
164
|
+
},
|
|
165
|
+
selfSearch (args) {
|
|
166
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
167
|
+
this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
|
|
168
|
+
let orgcondition = '1 = 1'
|
|
169
|
+
if (this.f_orgid[0]) {
|
|
170
|
+
orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
|
|
171
|
+
}
|
|
172
|
+
if (this.f_depid[0]) {
|
|
173
|
+
orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
|
|
174
|
+
}
|
|
175
|
+
if (this.f_operatorid[0]) {
|
|
176
|
+
orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
|
|
177
|
+
}
|
|
178
|
+
let name1 = args.model.f_public_group1
|
|
179
|
+
if (name1 == null || name1 == '') {
|
|
180
|
+
this.$showMessage('请选择分组项！')
|
|
181
|
+
return
|
|
182
|
+
}
|
|
183
|
+
console.log(args.model.f_public_group1)
|
|
184
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
185
|
+
this.$refs.paged.search(args)
|
|
186
|
+
},
|
|
187
|
+
getRes (obj) {
|
|
188
|
+
this.orgname = obj.res[0]
|
|
189
|
+
this.depresid = obj.resids
|
|
190
|
+
this.f_orgid = obj.resids
|
|
191
|
+
},
|
|
192
|
+
getdep (obj, val) {
|
|
193
|
+
this.depname = val[0]
|
|
194
|
+
this.userresid = obj
|
|
195
|
+
this.f_depid = obj
|
|
196
|
+
},
|
|
197
|
+
getuser ( obj, val) {
|
|
198
|
+
this.operatorname = val[0]
|
|
199
|
+
this.f_operatorid = obj
|
|
200
|
+
}
|
|
201
|
+
},
|
|
202
|
+
watch: {
|
|
203
|
+
'data' (val) {
|
|
204
|
+
if (val.f_files_path) {
|
|
205
|
+
this.getFileContent(val.f_files_path)
|
|
206
|
+
} else {
|
|
207
|
+
this.reportStr = null
|
|
208
|
+
}
|
|
209
|
+
},
|
|
210
|
+
'model.data' (val) {
|
|
211
|
+
let tab = document.getElementById('test').children[0]
|
|
212
|
+
var tds = tab.getElementsByTagName('td')
|
|
213
|
+
var num = 0
|
|
214
|
+
for (let td of tds) {
|
|
215
|
+
let span = td.getAttribute('colspan')
|
|
216
|
+
num = num + ((span ? span : 1) - 0)
|
|
217
|
+
}
|
|
218
|
+
this.spans = num
|
|
219
|
+
}
|
|
220
|
+
},
|
|
221
|
+
computed: {
|
|
222
|
+
group1 () {
|
|
223
|
+
return [{label: '用户类型', value: 'f_user_type'},
|
|
224
|
+
{label: '用气性质', value: 'f_gasproperties'},
|
|
225
|
+
{label: '抄表员', value: 'f_inputtor'},
|
|
226
|
+
{label: '营业网点', value: 'f_depname'}]
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
</script>
|
|
231
|
+
<style scoped>
|
|
232
|
+
.noborder{
|
|
233
|
+
border: none;
|
|
234
|
+
}
|
|
235
|
+
</style>
|
|
@@ -237,7 +237,7 @@
|
|
|
237
237
|
</datepicker>
|
|
238
238
|
</div>
|
|
239
239
|
<div class="col-sm-2 form-group">
|
|
240
|
-
<label for="endGasDate" class="font_normal_body"
|
|
240
|
+
<label for="endGasDate" class="font_normal_body"> 至 </label>
|
|
241
241
|
<datepicker id="endGasDate" placeholder="结束日期" style="width:60%"
|
|
242
242
|
v-model="model.endGasDate"
|
|
243
243
|
:value.sync="model.endGasDate"
|
|
@@ -278,7 +278,26 @@
|
|
|
278
278
|
:options='$parent.$parent.hairpin' placeholder='请选择'
|
|
279
279
|
close-on-select></v-select>
|
|
280
280
|
</div>
|
|
281
|
-
|
|
281
|
+
<div class="col-sm-2 form-group">
|
|
282
|
+
<label for="startDate" class="font_normal_body" title="开户开始日期">开户时间</label>
|
|
283
|
+
<datepicker id="startDate" placeholder="开户开始日期" style="width:60%"
|
|
284
|
+
v-model="model.startOpenDate"
|
|
285
|
+
:value.sync="model.startOpenDate"
|
|
286
|
+
:format="'yyyy-MM-dd'"
|
|
287
|
+
:show-reset-button="true"
|
|
288
|
+
condition="f_open_date >= '{} 00:00:00'">
|
|
289
|
+
</datepicker>
|
|
290
|
+
</div>
|
|
291
|
+
<div class="col-sm-2 form-group">
|
|
292
|
+
<label for="endDate" class="font_normal_body" title="开户结束日期"> 至 </label>
|
|
293
|
+
<datepicker id="endDate" placeholder="开户结束日期" style="width:60%"
|
|
294
|
+
v-model="model.endOpenDate"
|
|
295
|
+
:value.sync="model.endOpenDate"
|
|
296
|
+
:format="'yyyy-MM-dd'"
|
|
297
|
+
:show-reset-button="true"
|
|
298
|
+
condition="f_open_date <= '{} 23:59:59'">
|
|
299
|
+
</datepicker>
|
|
300
|
+
</div>
|
|
282
301
|
</div>
|
|
283
302
|
</div>
|
|
284
303
|
</criteria>
|
|
@@ -78,16 +78,16 @@
|
|
|
78
78
|
<!-- condition="f_user_type ='{}'"-->
|
|
79
79
|
<!-- ></v-select>-->
|
|
80
80
|
<!-- </div>-->
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
81
|
+
<div class="col-sm-2 form-group">
|
|
82
|
+
<label class="font_normal_body">用气性质</label>
|
|
83
|
+
<v-select style="width:60%" :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
84
|
+
placeholder='用气性质'
|
|
85
|
+
value-single="true"
|
|
86
|
+
:options='$parent.$parent.Gasproperties'
|
|
87
|
+
close-on-select
|
|
88
|
+
condition="f_gasproperties = '{}'"
|
|
89
|
+
></v-select>
|
|
90
|
+
</div>
|
|
91
91
|
<div class="col-sm-2 form-group">
|
|
92
92
|
<label class="font_normal_body">表    号</label>
|
|
93
93
|
<input
|
|
@@ -93,7 +93,7 @@ export default{
|
|
|
93
93
|
},
|
|
94
94
|
chargeConfig: {
|
|
95
95
|
'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址','f_idnumber':'身份证号', 'f_zones': '片区', 'f_user_type': '客户类型',
|
|
96
|
-
'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数', 'f_price_name': '气价名称',
|
|
96
|
+
'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_table_state': '表具状态', 'f_times': '购气次数', 'f_price_name': '气价名称',
|
|
97
97
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
|
|
98
98
|
'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
|
|
99
99
|
'f_delaypay': '违约金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
|
|
@@ -380,6 +380,9 @@
|
|
|
380
380
|
<th>
|
|
381
381
|
<nobr>气表品牌</nobr>
|
|
382
382
|
</th>
|
|
383
|
+
<th>
|
|
384
|
+
<nobr>表具状态</nobr>
|
|
385
|
+
</th>
|
|
383
386
|
<th>
|
|
384
387
|
<nobr>卡号</nobr>
|
|
385
388
|
</th>
|
|
@@ -589,6 +592,9 @@
|
|
|
589
592
|
<td style="text-align: center;">
|
|
590
593
|
<nobr>{{row.f_meter_brand}}</nobr>
|
|
591
594
|
</td>
|
|
595
|
+
<td style="text-align: center;">
|
|
596
|
+
<nobr>{{row.f_table_state}}</nobr>
|
|
597
|
+
</td>
|
|
592
598
|
<td style="text-align: center;">
|
|
593
599
|
<nobr>{{row.f_card_id}}</nobr>
|
|
594
600
|
</td>
|
package/src/reportManage.js
CHANGED
|
@@ -698,6 +698,10 @@ export default function () {
|
|
|
698
698
|
})
|
|
699
699
|
// 涉县报表展示组件(燃气营收月报表)
|
|
700
700
|
Vue.component('sx-month-summary', (resolve) => {
|
|
701
|
-
require(['./components/SellReport/shexian/SxMonthSummary
|
|
701
|
+
require(['./components/SellReport/shexian/SxMonthSummary'], resolve)
|
|
702
|
+
})
|
|
703
|
+
// 机表抄表分项报表
|
|
704
|
+
Vue.component('genera-hand-report', (resolve) => {
|
|
705
|
+
require(['./components/handReport/GeneraHandReport'], resolve)
|
|
702
706
|
})
|
|
703
707
|
}
|