manage-client 3.3.74 → 3.3.76
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 +2 -2
- package/package.json +1 -1
- package/src/components/SellReport/shexian/SxSellSummary.vue +176 -0
- package/src/components/sale/businessquery/AccountQuery/keyUserGasRanking.vue +1 -1
- package/src/components/sale/businessquery/ResidentialCardQuery.vue +1 -1
- package/src/components/sale/businessquery/WebHandplanQuery.vue +12 -50
- package/src/components/sale/config/exportConfig.js +1 -1
- package/src/components/sale/report/aode/DayReportList.vue +31 -0
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +2 -0
- package/src/filiale/WEINAN/ManageCompanyGasSummary.vue +81 -63
- package/src/main.js +3 -3
- package/src/reportManage.js +4 -0
package/build/dev-server.js
CHANGED
|
@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
22
|
+
var bendi = 'http://172.168.1.11:9001/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://172.168.1.11:9001/'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
package/package.json
CHANGED
|
@@ -0,0 +1,176 @@
|
|
|
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
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-2" >
|
|
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" >
|
|
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">
|
|
28
|
+
<label class="font_normal_body"> 公司 </label>
|
|
29
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
30
|
+
</div>
|
|
31
|
+
<div class="col-sm-2">
|
|
32
|
+
<label class="font_normal_body"> 部门 </label>
|
|
33
|
+
<res-select restype='department'
|
|
34
|
+
is-mul="false"
|
|
35
|
+
@res-select="$parent.$parent.getdep"
|
|
36
|
+
:parentresid="$parent.$parent.depresid"
|
|
37
|
+
:initresid='$parent.$parent.depid'>
|
|
38
|
+
</res-select>
|
|
39
|
+
|
|
40
|
+
</div>
|
|
41
|
+
<div class="col-sm-2">
|
|
42
|
+
<label class="font_normal_body"> 人员 </label>
|
|
43
|
+
<res-select restype='user'
|
|
44
|
+
is-mul="false"
|
|
45
|
+
@res-select="$parent.$parent.getuser"
|
|
46
|
+
:parentresid="$parent.$parent.userresid"
|
|
47
|
+
:initresid='$parent.$parent.operatorid'>
|
|
48
|
+
</res-select>
|
|
49
|
+
</div>
|
|
50
|
+
</div>
|
|
51
|
+
<div class="span" style = "float:right;">
|
|
52
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
53
|
+
<report-print id='gasprice' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
54
|
+
<report-excel id='gasprice'></report-excel>
|
|
55
|
+
</div>
|
|
56
|
+
</div>
|
|
57
|
+
</criteria>
|
|
58
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
59
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
60
|
+
<thead>
|
|
61
|
+
<tr>
|
|
62
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
63
|
+
<h3 style="text-align: center">燃气营收月报表</h3>
|
|
64
|
+
</th>
|
|
65
|
+
</tr>
|
|
66
|
+
<tr>
|
|
67
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
68
|
+
开始时间：{{model.model.startDate}}
|
|
69
|
+
结束时间：{{ model.model.endDate }}
|
|
70
|
+
</th>
|
|
71
|
+
</tr>
|
|
72
|
+
<tr>
|
|
73
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
74
|
+
<div>
|
|
75
|
+
|
|
76
|
+
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
77
|
+
<span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
|
|
78
|
+
</div>
|
|
79
|
+
</th>
|
|
80
|
+
</tr>
|
|
81
|
+
</thead>
|
|
82
|
+
<tr>
|
|
83
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
84
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
85
|
+
</td>
|
|
86
|
+
</tr>
|
|
87
|
+
<!-- <tfoot>-->
|
|
88
|
+
<!-- <tr style="text-align: left">-->
|
|
89
|
+
<!-- <th :colspan='Math.floor($parent.spans/2)'>审核人:安芳芳</th>-->
|
|
90
|
+
<!-- <th :colspan='Math.floor($parent.spans/2)'>制表人:{{$parent.operatorname}}</th>-->
|
|
91
|
+
<!-- </tr>-->
|
|
92
|
+
<!-- </tfoot>-->
|
|
93
|
+
</table>
|
|
94
|
+
</div>
|
|
95
|
+
</criteria-paged>
|
|
96
|
+
</div>
|
|
97
|
+
</template>
|
|
98
|
+
|
|
99
|
+
<script>
|
|
100
|
+
import { DataModel } from 'vue-client'
|
|
101
|
+
import co from 'co'
|
|
102
|
+
export default {
|
|
103
|
+
title: '燃气财务报表',
|
|
104
|
+
props: ['data'],
|
|
105
|
+
data () {
|
|
106
|
+
return {
|
|
107
|
+
printTime: this.$login.toStandardTimeString(),
|
|
108
|
+
depresid: [],
|
|
109
|
+
userresid: [],
|
|
110
|
+
f_orgid: this.$login.f.orgid,
|
|
111
|
+
f_depid: this.$login.f.depids,
|
|
112
|
+
f_operatorid: this.$login.f.id,
|
|
113
|
+
operatorid: [],
|
|
114
|
+
depid: [],
|
|
115
|
+
orgname: '',
|
|
116
|
+
depname: '',
|
|
117
|
+
operatorname: '',
|
|
118
|
+
orgCondtionStr: '1=1',
|
|
119
|
+
model: new DataModel('rs/report/sx_sell', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
120
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
121
|
+
reportStr: null,
|
|
122
|
+
spans: 0
|
|
123
|
+
}
|
|
124
|
+
},
|
|
125
|
+
ready () {
|
|
126
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
127
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
128
|
+
},
|
|
129
|
+
methods: {
|
|
130
|
+
searchData () {
|
|
131
|
+
this.$refs.paged.$refs.criteria.search()
|
|
132
|
+
},
|
|
133
|
+
selfSearch (args) {
|
|
134
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
135
|
+
let orgcondition = '1=1'
|
|
136
|
+
if (this.f_orgid && this.f_orgid[0]) {
|
|
137
|
+
orgcondition += ` and f_orgid in ('${this.f_orgid}')`
|
|
138
|
+
}
|
|
139
|
+
if (this.f_depid && this.f_depid[0]) {
|
|
140
|
+
orgcondition += ` and f_depid in ('${this.f_depid}')`
|
|
141
|
+
}
|
|
142
|
+
if(this.f_operatorid && this.f_operatorid[0]) {
|
|
143
|
+
orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
|
|
144
|
+
}
|
|
145
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
146
|
+
this.$refs.paged.search(args)
|
|
147
|
+
},
|
|
148
|
+
getRes (obj) {
|
|
149
|
+
this.orgname = obj.res[0]
|
|
150
|
+
this.depresid = obj.resids
|
|
151
|
+
this.f_orgid = obj.resids
|
|
152
|
+
},
|
|
153
|
+
getdep (obj, val) {
|
|
154
|
+
this.depname = val[0]
|
|
155
|
+
this.userresid = obj
|
|
156
|
+
this.f_depid = obj
|
|
157
|
+
},
|
|
158
|
+
getuser ( obj, val) {
|
|
159
|
+
this.operatorname = val[0]
|
|
160
|
+
this.f_operatorid = obj
|
|
161
|
+
}
|
|
162
|
+
},
|
|
163
|
+
watch: {
|
|
164
|
+
'model.data' (val) {
|
|
165
|
+
this.spans = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
|
|
166
|
+
}
|
|
167
|
+
},
|
|
168
|
+
computed: {
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
</script>
|
|
172
|
+
<style scoped>
|
|
173
|
+
.noborder{
|
|
174
|
+
border: none;
|
|
175
|
+
}
|
|
176
|
+
</style>
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
<export-excel :data="$parent.$parent.getCondition"
|
|
34
34
|
:field="$parent.$parent.getfield"
|
|
35
35
|
sqlurl="rs/logic/exportfile"
|
|
36
|
-
sql-name="
|
|
36
|
+
sql-name="keyUserGasRanking"
|
|
37
37
|
template-name='重点用户用气排行查询'
|
|
38
38
|
:choose-col="true"></export-excel>
|
|
39
39
|
<print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
38
38
|
|
|
39
39
|
<div class="col-sm-2 form-group">
|
|
40
|
-
<label for="startDate" class="font_normal_body"
|
|
40
|
+
<label for="startDate" class="font_normal_body">抄表日期</label>
|
|
41
41
|
<datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
|
|
42
42
|
v-model="model.handStartDate"
|
|
43
43
|
:value.sync="model.handStartDate"
|
|
@@ -72,26 +72,7 @@
|
|
|
72
72
|
condition="f_hand_state = '{}'"
|
|
73
73
|
close-on-select></v-select>
|
|
74
74
|
</div>
|
|
75
|
-
|
|
76
|
-
<label for="startDate" class="font_normal_body">抄表日期</label>
|
|
77
|
-
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
78
|
-
v-model="model.startDate"
|
|
79
|
-
:value.sync="model.startDate"
|
|
80
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
81
|
-
:show-reset-button="true"
|
|
82
|
-
condition="f_input_date >= '{}'">
|
|
83
|
-
</datepicker>
|
|
84
|
-
</div>
|
|
85
|
-
<div class="col-sm-2 form-group">
|
|
86
|
-
<label for="endDate" class="font_normal_body"> 至  </label>
|
|
87
|
-
<datepicker id="endDate" placeholder="结束日期" style="width:60%"
|
|
88
|
-
v-model="model.endDate"
|
|
89
|
-
:value.sync="model.endDate"
|
|
90
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
91
|
-
:show-reset-button="true"
|
|
92
|
-
condition="f_input_date <= '{}'">
|
|
93
|
-
</datepicker>
|
|
94
|
-
</div>
|
|
75
|
+
|
|
95
76
|
|
|
96
77
|
|
|
97
78
|
<div class="col-sm-2 form-group">
|
|
@@ -200,8 +181,6 @@
|
|
|
200
181
|
close-on-select
|
|
201
182
|
condition="f_meter_book_num in {}"></v-select>
|
|
202
183
|
</div>
|
|
203
|
-
|
|
204
|
-
|
|
205
184
|
</div>
|
|
206
185
|
</div>
|
|
207
186
|
</criteria>
|
|
@@ -254,21 +233,14 @@
|
|
|
254
233
|
<th>
|
|
255
234
|
<nobr>本期余额</nobr>
|
|
256
235
|
</th>
|
|
236
|
+
|
|
257
237
|
<th>
|
|
258
|
-
<nobr
|
|
259
|
-
</th>
|
|
260
|
-
<th>
|
|
261
|
-
<nobr>冲正人员</nobr>
|
|
262
|
-
</th>
|
|
263
|
-
<th>
|
|
264
|
-
<nobr>下发日期</nobr>
|
|
238
|
+
<nobr>抄表日期</nobr>
|
|
265
239
|
</th>
|
|
266
240
|
<th>
|
|
267
241
|
<nobr>所属年月</nobr>
|
|
268
242
|
</th>
|
|
269
|
-
|
|
270
|
-
<nobr>录入日期</nobr>
|
|
271
|
-
</th>
|
|
243
|
+
|
|
272
244
|
<th>
|
|
273
245
|
<nobr>客户类型</nobr>
|
|
274
246
|
</th>
|
|
@@ -379,21 +351,14 @@
|
|
|
379
351
|
<td style="text-align: center;">
|
|
380
352
|
<nobr>{{row.f_curbalance}}</nobr>
|
|
381
353
|
</td>
|
|
382
|
-
|
|
383
|
-
<nobr>{{row.f_corrhand_date}}</nobr>
|
|
384
|
-
</td>
|
|
385
|
-
<td style="text-align: center;">
|
|
386
|
-
<nobr>{{row.f_corrhand_operator}}</nobr>
|
|
387
|
-
</td>
|
|
354
|
+
|
|
388
355
|
<td style="text-align: center;">
|
|
389
356
|
<nobr>{{row.f_hand_date}}</nobr>
|
|
390
357
|
</td>
|
|
391
358
|
<td>
|
|
392
359
|
<nobr>{{row.belongmonth}}</nobr>
|
|
393
360
|
</td>
|
|
394
|
-
|
|
395
|
-
<nobr>{{row.f_input_date}}</nobr>
|
|
396
|
-
</td>
|
|
361
|
+
|
|
397
362
|
<td style="text-align: center;">
|
|
398
363
|
<nobr>{{row.f_user_type}}</nobr>
|
|
399
364
|
</td>
|
|
@@ -495,9 +460,8 @@
|
|
|
495
460
|
self.$MagGetSaleParam.initinputtor();
|
|
496
461
|
self.getinputtores();
|
|
497
462
|
self.initmeterbook();
|
|
498
|
-
self.$refs.paged.$refs.cri.model.
|
|
499
|
-
self.$refs.paged.$refs.cri.model.
|
|
500
|
-
|
|
463
|
+
self.$refs.paged.$refs.cri.model.handStartDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
|
|
464
|
+
self.$refs.paged.$refs.cri.model.handEndDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
|
|
501
465
|
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
502
466
|
await self.$MagLoadParams.loadParam()
|
|
503
467
|
await self.initParams()
|
|
@@ -738,10 +702,8 @@
|
|
|
738
702
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
739
703
|
}
|
|
740
704
|
|
|
741
|
-
if (!(
|
|
742
|
-
|
|
743
|
-
)) {
|
|
744
|
-
this.$showMessage('请选择【下发、抄表或审核】其中之一开始时间和结束时间!')
|
|
705
|
+
if (!(this.$refs.paged.$refs.cri.model.handStartDate != '' && this.$refs.paged.$refs.cri.model.handEndDate != '')) {
|
|
706
|
+
this.$showMessage('请选择【抄表时间】开始时间和结束时间!')
|
|
745
707
|
return
|
|
746
708
|
}
|
|
747
709
|
this.area = this.$refs.paged.$refs.cri.model.f_residential_area
|
|
@@ -931,7 +893,7 @@
|
|
|
931
893
|
return {
|
|
932
894
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机',
|
|
933
895
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额','f_meternumber': '表号', 'ym_data': '数据年月',
|
|
934
|
-
'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '
|
|
896
|
+
'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
|
|
935
897
|
'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
|
|
936
898
|
'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
|
|
937
899
|
'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月'
|
|
@@ -549,7 +549,7 @@ export default{
|
|
|
549
549
|
'xitongfei': '系统收款', 'chazhi': '差值'
|
|
550
550
|
},
|
|
551
551
|
handGasConfig: {
|
|
552
|
-
'
|
|
552
|
+
'orgname': '公司名称', 'jan': '一月',
|
|
553
553
|
'feb': '二月', 'mar': '三月', 'apr': '四月',
|
|
554
554
|
'may': '五月', 'jun': '六月', 'jul': '七月', 'jug': '八月',
|
|
555
555
|
'sep': '九月', 'oct': '十月', 'nov': '十一月', 'dec': '十二月', 'sum_oughtamount': '累计气量'
|
|
@@ -167,6 +167,33 @@
|
|
|
167
167
|
</data-grid>
|
|
168
168
|
</criteria-paged>
|
|
169
169
|
</div>
|
|
170
|
+
|
|
171
|
+
<table class="table-hover">
|
|
172
|
+
<tr style="position: relative" class="table-bordered">
|
|
173
|
+
<td
|
|
174
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
175
|
+
汇总信息
|
|
176
|
+
</td>
|
|
177
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
178
|
+
购买量: {{sumsmodel.f_pregas}}方
|
|
179
|
+
</td>
|
|
180
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
181
|
+
实收: {{sumsmodel.f_collection}}元
|
|
182
|
+
</td>
|
|
183
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
184
|
+
应收: {{sumsmodel.f_preamount}}元
|
|
185
|
+
</td>
|
|
186
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
187
|
+
一阶气量合计: {{sumsmodel.f_stair1amount}}方
|
|
188
|
+
</td>
|
|
189
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
190
|
+
二阶气量合计: {{sumsmodel.f_stair2amount}}方
|
|
191
|
+
</td>
|
|
192
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
193
|
+
三阶气量合计: {{sumsmodel.f_stair3amount}}方
|
|
194
|
+
</td>
|
|
195
|
+
</tr>
|
|
196
|
+
</table>
|
|
170
197
|
<div v-if="listpage">
|
|
171
198
|
<user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
|
|
172
199
|
</div>
|
|
@@ -217,6 +244,10 @@
|
|
|
217
244
|
f_count_hb: 0,
|
|
218
245
|
f_pregas_hb: 0,
|
|
219
246
|
f_collection_hb: 0,
|
|
247
|
+
f_preamount: 0,
|
|
248
|
+
f_stair1amount: 0,
|
|
249
|
+
f_stair2amount: 0,
|
|
250
|
+
f_stair3amount: 0,
|
|
220
251
|
f_count_cz: 0,
|
|
221
252
|
f_pregas_cz: 0,
|
|
222
253
|
f_collection_cz: 0,
|
|
@@ -408,6 +408,8 @@
|
|
|
408
408
|
},
|
|
409
409
|
getorg(condition,obj) {
|
|
410
410
|
this.orgcondition = condition.replace('f_orgid','i.f_orgid')
|
|
411
|
+
this.orgcondition = this.orgcondition.replace('f_depid','i.f_depid')
|
|
412
|
+
this.orgcondition = this.orgcondition.replace('f_operatorid','i.f_operatorid')
|
|
411
413
|
this.orgname = obj.orgnames[0]
|
|
412
414
|
},
|
|
413
415
|
initQueryParam () {
|
|
@@ -89,47 +89,47 @@
|
|
|
89
89
|
<!-- condition="f_company_id in {}">-->
|
|
90
90
|
<!-- </v-select>-->
|
|
91
91
|
</div>
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
92
|
+
<div class="col-sm-2 form-group">
|
|
93
|
+
<label class="font_normal_body">用户类型</label>
|
|
94
|
+
<v-select :value.sync="model.f_user_type"
|
|
95
|
+
:options='$parent.$parent.usertypes'
|
|
96
|
+
@change="$parent.$parent.userTypeChange()"
|
|
97
|
+
:value-single="true"
|
|
98
|
+
placeholder='请选择' v-model="model.f_user_type"
|
|
99
|
+
close-on-select></v-select>
|
|
100
|
+
</div>
|
|
101
|
+
<div class="col-sm-2 form-group">
|
|
102
|
+
<label for="f_user_usetype" class="font_normal_body ">用气类型</label>
|
|
103
|
+
<v-select :value.sync="model.f_user_usetype" :search="false"
|
|
104
|
+
@change="$parent.$parent.userUseTypeChange()"
|
|
105
|
+
v-model="model.f_user_usetype"
|
|
106
|
+
:value-single="true"
|
|
107
|
+
:options='$parent.$parent.userusetypes'
|
|
108
|
+
placeholder='用气类型'
|
|
109
|
+
close-on-select>
|
|
110
|
+
</v-select>
|
|
111
|
+
</div>
|
|
112
|
+
<div class="col-sm-2 form-group">
|
|
113
|
+
<label for="f_use_institution" class="font_normal_body">用气机构</label>
|
|
114
|
+
<v-select :value.sync="model.f_use_institution" :search="false"
|
|
115
|
+
@change="$parent.$parent.userUseInstitutionChange()"
|
|
116
|
+
v-model="model.f_use_institution"
|
|
117
|
+
:value-single="true"
|
|
118
|
+
:options='$parent.$parent.useinstitutions'
|
|
119
|
+
placeholder='用气机构'
|
|
120
|
+
close-on-select>
|
|
121
|
+
</v-select>
|
|
122
|
+
</div>
|
|
123
|
+
<div class="col-sm-2 form-group">
|
|
124
|
+
<label for="f_user_usenature" class="font_normal_body ">使用性质</label>
|
|
125
|
+
<v-select :value.sync="model.f_user_usenature" :search="false"
|
|
126
|
+
v-model="model.f_user_usenature"
|
|
127
|
+
:value-single="true"
|
|
128
|
+
:options='$parent.$parent.userusenatures'
|
|
129
|
+
placeholder='使用性质'
|
|
130
|
+
close-on-select>
|
|
131
|
+
</v-select>
|
|
132
|
+
</div>
|
|
133
133
|
<!-- <div class="col-sm-2 form-group">-->
|
|
134
134
|
<!-- <label for="endDate" class="font_normal_body">小区名称</label>-->
|
|
135
135
|
<!-- <v-select :value.sync="model.f_residential_area_id"-->
|
|
@@ -239,7 +239,12 @@ export default {
|
|
|
239
239
|
footer: [],
|
|
240
240
|
model: new PagedList('rs/sql/manage_companyGasSummary', 20, {
|
|
241
241
|
startDate: 'this.model.startDate',
|
|
242
|
-
endDate: 'this.model.endDate'
|
|
242
|
+
endDate: 'this.model.endDate',
|
|
243
|
+
f_user_type : 'this.model.f_user_type',
|
|
244
|
+
|
|
245
|
+
f_user_usetype : 'this.model.f_user_usetype',
|
|
246
|
+
f_user_usenature : 'this.model.f_user_usenature',
|
|
247
|
+
f_use_institution : 'this.model.f_use_institution'
|
|
243
248
|
}, {
|
|
244
249
|
f_oughtamount: 0,
|
|
245
250
|
f_pregas: 0
|
|
@@ -335,27 +340,36 @@ export default {
|
|
|
335
340
|
this.$refs.paged.$refs.cri.model[key] = []
|
|
336
341
|
})
|
|
337
342
|
},
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
343
|
+
userTypeChange () {
|
|
344
|
+
this.userusetypes = []
|
|
345
|
+
this.userusenatures = []
|
|
346
|
+
this.useinstitutions = []
|
|
347
|
+
this.$refs.paged.$refs.cri.model.f_user_usetype = ''
|
|
348
|
+
this.$refs.paged.$refs.cri.model.f_use_institution = ''
|
|
349
|
+
this.$refs.paged.$refs.cri.model.f_user_usenature = ''
|
|
350
|
+
if (this.$refs.paged.$refs.cri.model.f_user_type) {
|
|
351
|
+
let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
|
|
352
|
+
this.userusetypes = this.$appdata.getParam(str)
|
|
353
|
+
}
|
|
354
|
+
},
|
|
355
|
+
userUseTypeChange () {
|
|
356
|
+
this.useinstitutions = []
|
|
357
|
+
this.userusenatures = []
|
|
358
|
+
this.$refs.paged.$refs.cri.model.f_use_institution = ''
|
|
359
|
+
this.$refs.paged.$refs.cri.model.f_user_usenature = ''
|
|
360
|
+
if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
|
|
361
|
+
let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
|
|
362
|
+
this.useinstitutions = this.$appdata.getParam(str)
|
|
363
|
+
}
|
|
364
|
+
},
|
|
365
|
+
userUseInstitutionChange () {
|
|
366
|
+
this.userusenatures = []
|
|
367
|
+
this.$refs.paged.$refs.cri.model.f_user_usenature = ''
|
|
368
|
+
if (this.$refs.paged.$refs.cri.model.f_use_institution) {
|
|
369
|
+
let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
|
|
370
|
+
this.userusenatures = this.$appdata.getParam(str)
|
|
371
|
+
}
|
|
372
|
+
},
|
|
359
373
|
hidden () {
|
|
360
374
|
this.criteriaShow = !this.criteriaShow
|
|
361
375
|
},
|
|
@@ -479,6 +493,10 @@ export default {
|
|
|
479
493
|
condition: this.condition,
|
|
480
494
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
481
495
|
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
496
|
+
f_user_usetype : this.$refs.paged.$refs.cri.model.f_user_usetype,
|
|
497
|
+
f_user_type : this.$refs.paged.$refs.cri.model.f_user_type,
|
|
498
|
+
f_user_usenature : this.$refs.paged.$refs.cri.model.f_user_usenature,
|
|
499
|
+
f_use_institution : this.$refs.paged.$refs.cri.model.f_use_institution
|
|
482
500
|
}
|
|
483
501
|
},
|
|
484
502
|
getfield () {
|
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 ShanXianWebmeterManage from './filiale/
|
|
9
|
+
import ShanXianSaleManage from './filiale/WEINAN/sale'
|
|
10
|
+
import ShanXianWebmeterManage from './filiale/WEINAN/reportManage'
|
|
11
11
|
import webmeterManage from './webmeterManage'
|
|
12
12
|
import reportManage from './reportManage'
|
|
13
13
|
import newmanage from './newmanage'
|
|
@@ -49,10 +49,10 @@ system(false)
|
|
|
49
49
|
saleManage()
|
|
50
50
|
ShanXianSaleManage()
|
|
51
51
|
webmeterManage()
|
|
52
|
-
ShanXianWebmeterManage()
|
|
53
52
|
ManageHome()
|
|
54
53
|
newmanage()
|
|
55
54
|
reportManage()
|
|
55
|
+
ShanXianWebmeterManage()
|
|
56
56
|
require('system-clients/src/styles/less/bootstrap.less')
|
|
57
57
|
require('./components/qinhua/Style/qinhuaStyle.less')
|
|
58
58
|
// require('./bootstrap/less/manageStyle/manageChile.less')
|
package/src/reportManage.js
CHANGED
|
@@ -700,6 +700,10 @@ export default function () {
|
|
|
700
700
|
Vue.component('sx-month-summary', (resolve) => {
|
|
701
701
|
require(['./components/SellReport/shexian/SxMonthSummary'], resolve)
|
|
702
702
|
})
|
|
703
|
+
// 涉县报表展示组件(燃气财务报表)
|
|
704
|
+
Vue.component('sx-sell-summary', (resolve) => {
|
|
705
|
+
require(['./components/SellReport/shexian/SxSellSummary'], resolve)
|
|
706
|
+
})
|
|
703
707
|
// 机表抄表分项报表
|
|
704
708
|
Vue.component('genera-hand-report', (resolve) => {
|
|
705
709
|
require(['./components/handReport/GeneraHandReport'], resolve)
|