manage-client 3.3.245 → 3.3.247
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/xihu/XHManageSummary.vue +179 -0
- package/src/components/sale/businessquery/AccountQuery/ExpectGasList.vue +2 -2
- package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue +2 -2
- package/src/filiale/qingtongxia/config/exportConfig.js +3 -4
- package/src/reportManage.js +4 -0
package/package.json
CHANGED
|
@@ -0,0 +1,179 @@
|
|
|
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
|
+
打印时间：{{$parent.printTime}}
|
|
50
|
+
<!--收费员：{{// $parent.operatorname}}-->
|
|
51
|
+
</th>
|
|
52
|
+
</tr>
|
|
53
|
+
<tr>
|
|
54
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
55
|
+
<div>
|
|
56
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
57
|
+
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
58
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
|
|
59
|
+
</div>
|
|
60
|
+
</th>
|
|
61
|
+
</tr>
|
|
62
|
+
</thead>
|
|
63
|
+
<tr>
|
|
64
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
65
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
66
|
+
</td>
|
|
67
|
+
</tr>
|
|
68
|
+
<tfoot>
|
|
69
|
+
<!-- <tr style="text-align: left">-->
|
|
70
|
+
<!-- <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>-->
|
|
71
|
+
<!-- <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>-->
|
|
72
|
+
<!-- <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>-->
|
|
73
|
+
<!-- </tr>-->
|
|
74
|
+
</tfoot>
|
|
75
|
+
</table>
|
|
76
|
+
{{{ $parent.reportStr}}}
|
|
77
|
+
</div>
|
|
78
|
+
</criteria-paged>
|
|
79
|
+
</div>
|
|
80
|
+
</template>
|
|
81
|
+
|
|
82
|
+
<script>
|
|
83
|
+
import { DataModel } from 'vue-client'
|
|
84
|
+
import co from 'co'
|
|
85
|
+
export default {
|
|
86
|
+
title: '收费结账报表',
|
|
87
|
+
props: ['data'],
|
|
88
|
+
data () {
|
|
89
|
+
return {
|
|
90
|
+
printTime: this.$login.toStandardTimeString(),
|
|
91
|
+
depresid: [],
|
|
92
|
+
userresid: [],
|
|
93
|
+
f_orgid: this.$login.f.orgid,
|
|
94
|
+
f_depid: this.$login.f.depids,
|
|
95
|
+
// f_operatorid: this.$login.f.id,
|
|
96
|
+
operatorid: [],
|
|
97
|
+
depid: [],
|
|
98
|
+
orgname: '',
|
|
99
|
+
depname: '',
|
|
100
|
+
criteriaShow: false,
|
|
101
|
+
operatorname: '',
|
|
102
|
+
orgCondtionStr: '1=1',
|
|
103
|
+
f_user_type: '',
|
|
104
|
+
f_state: ['有效'],
|
|
105
|
+
model: new DataModel('api/af-revenue/report/xh_sell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
106
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
107
|
+
reportStr: null,
|
|
108
|
+
resshow: ['company', 'department', 'operator'],
|
|
109
|
+
spans: 0,
|
|
110
|
+
initres: {
|
|
111
|
+
org: [this.$login.f.orgid],
|
|
112
|
+
dep: [],
|
|
113
|
+
user: []
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
},
|
|
117
|
+
ready () {
|
|
118
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
119
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
120
|
+
},
|
|
121
|
+
methods: {
|
|
122
|
+
searchData () {
|
|
123
|
+
this.$refs.paged.$refs.criteria.search()
|
|
124
|
+
},
|
|
125
|
+
selfSearch (args) {
|
|
126
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
127
|
+
let orgcondition = '1=1'
|
|
128
|
+
let orgstr = this.orgCondtionStr
|
|
129
|
+
orgcondition = orgcondition + orgstr
|
|
130
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
131
|
+
this.$refs.paged.search(args)
|
|
132
|
+
},
|
|
133
|
+
|
|
134
|
+
hidden () {
|
|
135
|
+
this.criteriaShow = !this.criteriaShow
|
|
136
|
+
},
|
|
137
|
+
getRes (condition, obj) {
|
|
138
|
+
this.orgCondtionStr = condition
|
|
139
|
+
this.orgname = obj.orgnames[0]
|
|
140
|
+
this.depname = obj.depnames[0]
|
|
141
|
+
this.operatorname = obj.operatornames[0]
|
|
142
|
+
},
|
|
143
|
+
getdep (obj, val) {
|
|
144
|
+
this.depname = val[0]
|
|
145
|
+
this.userresid = obj
|
|
146
|
+
this.f_depid = obj
|
|
147
|
+
},
|
|
148
|
+
getuser ( obj, val) {
|
|
149
|
+
this.operatorname = val[0]
|
|
150
|
+
this.f_operatorid = obj
|
|
151
|
+
}
|
|
152
|
+
},
|
|
153
|
+
watch: {
|
|
154
|
+
'model.data' (val) {
|
|
155
|
+
let len=0
|
|
156
|
+
let a=val.split('</tr>')
|
|
157
|
+
for(let i=0;i<a.length;i++){
|
|
158
|
+
if(a[i].split('</td>').length-1>len){
|
|
159
|
+
len=a[i].split('</td>').length-1
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
this.spans = len
|
|
163
|
+
}
|
|
164
|
+
},
|
|
165
|
+
computed: {
|
|
166
|
+
charge_state () {
|
|
167
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
|
|
168
|
+
},
|
|
169
|
+
user_type () {
|
|
170
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
</script>
|
|
175
|
+
<style scoped>
|
|
176
|
+
.noborder{
|
|
177
|
+
border: none;
|
|
178
|
+
}
|
|
179
|
+
</style>
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
:value.sync="model.startDate"
|
|
15
15
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
16
|
:show-reset-button="true"
|
|
17
|
-
condition="
|
|
17
|
+
condition="f_input_date >= '{}'">
|
|
18
18
|
</datepicker>
|
|
19
19
|
</div>
|
|
20
20
|
<div class="col-sm-2 form-group">
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
:value.sync="model.endDate"
|
|
25
25
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
26
|
:show-reset-button="true"
|
|
27
|
-
condition="
|
|
27
|
+
condition="f_input_date <= '{}'">
|
|
28
28
|
</datepicker>
|
|
29
29
|
</div>
|
|
30
30
|
<div class="col-sm-2 form-group ">
|
|
@@ -367,8 +367,8 @@
|
|
|
367
367
|
user:[]
|
|
368
368
|
},
|
|
369
369
|
condition: '1=1',
|
|
370
|
-
org
|
|
371
|
-
orgCondtionStr: ` and
|
|
370
|
+
org:`${[this.$login.f.orgid]}`,
|
|
371
|
+
orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
|
|
372
372
|
}
|
|
373
373
|
},
|
|
374
374
|
ready() {
|
|
@@ -136,10 +136,9 @@ export default{
|
|
|
136
136
|
'f_total_usegas_amount': '累计用气金额', 'f_total_gas': '表累购气量', 'f_total_fee': '表累购金额', 'f_inputtor': '表册抄表员',
|
|
137
137
|
'f_book_inputtor': '档案抄表员',
|
|
138
138
|
'f_install_person': '安装人', 'f_gas_person': '通气人',
|
|
139
|
-
'f_meter_book_num': '抄表册编号', 'f_meter_book_sort': '抄表册顺序',
|
|
140
|
-
'f_balance_amount': '
|
|
141
|
-
'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
|
|
142
|
-
, 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
|
|
139
|
+
'f_meter_book_num': '抄表册编号', 'f_meter_book_sort': '抄表册顺序', 'f_jval': '表剩余金额',
|
|
140
|
+
'f_balance_amount': '系统剩余金额', 'f_times': '写卡次数',
|
|
141
|
+
'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型', 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
|
|
143
142
|
'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_userfiles_address': '用气点名'
|
|
144
143
|
},
|
|
145
144
|
changemeterConfig: {
|
package/src/reportManage.js
CHANGED
|
@@ -774,4 +774,8 @@ export default function () {
|
|
|
774
774
|
Vue.component('gas-group-summary', (resolve) => {
|
|
775
775
|
require(['./components/SellReport/ManageGasGroupSummary'], resolve)
|
|
776
776
|
})
|
|
777
|
+
// 西户收费结账报表
|
|
778
|
+
Vue.component('xh-manage-summary', (resolve) => {
|
|
779
|
+
require(['./components/SellReport/xihu/XHManageSummary.vue'], resolve)
|
|
780
|
+
})
|
|
777
781
|
}
|