manage-client 3.3.85 → 3.3.86
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 +2 -2
- package/src/components/sale/businessquery/HandplanQuery.vue +6 -0
- package/src/components/sale/businessquery/OtherChargeQuery.vue +10 -0
- package/src/components/sale/businessquery/TransferQuery.vue +11 -0
- package/src/components/sale/config/exportConfig.js +3 -3
- package/src/components/sale/filesquery/RecordInfoQuery.vue +8 -7
- package/src/components/webmeter/gasStatistics/GasStatistics.vue +12 -0
- package/src/components/webmeter/gasStatistics/NewGasStatistics.vue +12 -0
- package/src/filiale/WEINAN/ManageUserCount.vue +40 -27
- package/src/filiale/lixianV3/BusinessManage.vue +3 -0
- package/src/filiale/lixianV3/{GasYearRatioQuery.vue → GasAnalysisQuery.vue} +10 -10
- package/src/filiale/lixianV3/sale.js +2 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.86",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"system-clients": "3.2.61",
|
|
72
72
|
"url-loader": "^0.5.7",
|
|
73
73
|
"vue-amap": "0.5.10",
|
|
74
|
-
"vue-client": "1.24.
|
|
74
|
+
"vue-client": "1.24.115",
|
|
75
75
|
"vue-hot-reload-api": "^1.2.0",
|
|
76
76
|
"vue-html-loader": "^1.0.0",
|
|
77
77
|
"vue-loader": "8.2.1",
|
|
@@ -348,6 +348,9 @@
|
|
|
348
348
|
<data-order field="f_audit_date" name="审核日期"
|
|
349
349
|
:order.sync="$parent.$parent.$parent.orderFields.f_audit_date"></data-order>
|
|
350
350
|
</th>
|
|
351
|
+
<th>
|
|
352
|
+
<nobr>用气性质</nobr>
|
|
353
|
+
</th>
|
|
351
354
|
<th>
|
|
352
355
|
<nobr>上期底数</nobr>
|
|
353
356
|
</th>
|
|
@@ -506,6 +509,9 @@
|
|
|
506
509
|
<td style="text-align: center;">
|
|
507
510
|
<nobr>{{row.f_audit_date}}</nobr>
|
|
508
511
|
</td>
|
|
512
|
+
<td style="text-align: center;">
|
|
513
|
+
<nobr>{{row.f_gasproperties}}</nobr>
|
|
514
|
+
</td>
|
|
509
515
|
<td style="text-align: center;">
|
|
510
516
|
<nobr>{{row.f_last_tablebase}}</nobr>
|
|
511
517
|
</td>
|
|
@@ -180,6 +180,16 @@
|
|
|
180
180
|
condition="f_meter_brand in {}"
|
|
181
181
|
close-on-select></v-select>
|
|
182
182
|
</div>
|
|
183
|
+
<div class="col-sm-2 form-group">
|
|
184
|
+
<label class="font_normal_body" title="收据起始编号">收据票号</label>
|
|
185
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_bill_number_start"
|
|
186
|
+
condition="f_bill_number >= '{}'" placeholder="收据起始编号">
|
|
187
|
+
</div>
|
|
188
|
+
<div class="col-sm-2 form-group">
|
|
189
|
+
<label class="font_normal_body" title="收据终止编号">收据票号</label>
|
|
190
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_bill_number_end"
|
|
191
|
+
condition="f_bill_number <= '{}'" placeholder="收据终止编号">
|
|
192
|
+
</div>
|
|
183
193
|
</div>
|
|
184
194
|
</div>
|
|
185
195
|
</criteria>
|
|
@@ -99,6 +99,11 @@
|
|
|
99
99
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_newuser_phone"
|
|
100
100
|
condition="f_newuser_phone like '%{}%' " placeholder="新户电话">
|
|
101
101
|
</div>
|
|
102
|
+
<div class="col-sm-2 form-group">
|
|
103
|
+
<label class="font_normal_body">合同编号</label>
|
|
104
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_contract_id"
|
|
105
|
+
condition="f_contract_id like '%{}%' " placeholder="合同编号">
|
|
106
|
+
</div>
|
|
102
107
|
</div>
|
|
103
108
|
</div>
|
|
104
109
|
</criteria>
|
|
@@ -144,6 +149,9 @@
|
|
|
144
149
|
<nobr>过户费</nobr>
|
|
145
150
|
</th>
|
|
146
151
|
<th>
|
|
152
|
+
<nobr>合同编号</nobr>
|
|
153
|
+
</th>
|
|
154
|
+
<th>
|
|
147
155
|
<!-- <nobr>过户日期</nobr>-->
|
|
148
156
|
<data-order field="f_operate_date" name="过户日期"
|
|
149
157
|
:order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
|
|
@@ -198,6 +206,9 @@
|
|
|
198
206
|
<td style="text-align: center;">
|
|
199
207
|
<nobr>{{row.f_transfer_fees}}</nobr>
|
|
200
208
|
</td>
|
|
209
|
+
<td style="text-align: center;">
|
|
210
|
+
<nobr>{{row.f_contract_id}}</nobr>
|
|
211
|
+
</td>
|
|
201
212
|
<td style="text-align: center;">
|
|
202
213
|
<nobr>{{row.f_operate_date}}</nobr>
|
|
203
214
|
</td>
|
|
@@ -312,7 +312,7 @@ export default{
|
|
|
312
312
|
handplanConfig: {
|
|
313
313
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_meternumber': '表号', 'ym_data': '数据年月',
|
|
314
314
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '违约金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
|
|
315
|
-
'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额',
|
|
315
|
+
'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_gasproperties': '用气性质',
|
|
316
316
|
'f_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
|
|
317
317
|
'f_hand_date': '下发日期', 'f_input_person': '录入人员', 'f_input_date': '录入日期', 'f_audit_date': '审核日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
|
|
318
318
|
'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
|
|
@@ -446,7 +446,7 @@ export default{
|
|
|
446
446
|
transferConfig: {
|
|
447
447
|
'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
|
|
448
448
|
'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_newidnumber': '新客户身份证', 'f_user_phone': '原客户电话',
|
|
449
|
-
'f_idnumber': '原客户身份证', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期',
|
|
449
|
+
'f_idnumber': '原客户身份证', 'f_transfer_fees': '过户费', 'f_contract_id': '合同编号', 'f_operate_date': '过户日期',
|
|
450
450
|
'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
|
|
451
451
|
},
|
|
452
452
|
transferRecordConfig: {
|
|
@@ -681,7 +681,7 @@ export default{
|
|
|
681
681
|
'f_collection': '实收金额', 'f_instruct_state': '指令状态', 'f_receive_state': '表返回状态', 'f_instruct_date': '生成指令时间'
|
|
682
682
|
},
|
|
683
683
|
GasStatistics: {
|
|
684
|
-
'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号',
|
|
684
|
+
'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌',
|
|
685
685
|
'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_nature': '用气类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
|
|
686
686
|
'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_first_input_date': '首次抄表时间', 'f_input_date': '最后通讯日期'
|
|
687
687
|
},
|
|
@@ -498,7 +498,7 @@
|
|
|
498
498
|
<th rowspan="2">
|
|
499
499
|
<nobr>序号</nobr>
|
|
500
500
|
</th>
|
|
501
|
-
<th colspan="
|
|
501
|
+
<th colspan="6">
|
|
502
502
|
<nobr>用户信息</nobr>
|
|
503
503
|
</th>
|
|
504
504
|
<th colspan="5">
|
|
@@ -507,11 +507,15 @@
|
|
|
507
507
|
<th colspan="6">
|
|
508
508
|
<nobr>燃气表</nobr>
|
|
509
509
|
</th>
|
|
510
|
-
<th colspan="
|
|
510
|
+
<th colspan="62">
|
|
511
511
|
<nobr>其他</nobr>
|
|
512
512
|
</th>
|
|
513
513
|
</tr>
|
|
514
514
|
<tr>
|
|
515
|
+
<th>
|
|
516
|
+
<!--<nobr>客户编号</nobr>-->
|
|
517
|
+
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
518
|
+
</th>
|
|
515
519
|
<th>
|
|
516
520
|
<nobr>小区名称</nobr>
|
|
517
521
|
</th>
|
|
@@ -561,10 +565,7 @@
|
|
|
561
565
|
<nobr>生产年月</nobr>
|
|
562
566
|
</th>
|
|
563
567
|
<th><nobr>客户状态</nobr></th>
|
|
564
|
-
|
|
565
|
-
<!--<nobr>客户编号</nobr>-->
|
|
566
|
-
<data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
567
|
-
</th>
|
|
568
|
+
|
|
568
569
|
<th><nobr>档案编号</nobr></th>
|
|
569
570
|
<th><nobr>是否发卡</nobr></th>
|
|
570
571
|
<th><nobr>卡号</nobr></th>
|
|
@@ -707,6 +708,7 @@
|
|
|
707
708
|
</template>
|
|
708
709
|
<template partial='body'>
|
|
709
710
|
<td style="text-align: center;"><nobr>{{$index + 1}}</nobr></td>
|
|
711
|
+
<td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
|
|
710
712
|
<td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
|
|
711
713
|
<td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
|
|
712
714
|
<td style="text-align: center;"><nobr>{{row.f_idnumber}}</nobr></td>
|
|
@@ -727,7 +729,6 @@
|
|
|
727
729
|
<!-- <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>-->
|
|
728
730
|
<!-- </nobr> </td>-->
|
|
729
731
|
<td style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></td>
|
|
730
|
-
<td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
|
|
731
732
|
<td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
|
|
732
733
|
<td style="text-align: center;"><nobr>{{row.f_whether_hairpin}}</nobr></td>
|
|
733
734
|
<td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
|
|
@@ -158,6 +158,13 @@
|
|
|
158
158
|
condition="ss.f_balance_amount <= {} " placeholder="">
|
|
159
159
|
</div>
|
|
160
160
|
</div>
|
|
161
|
+
<div class="col-sm-2 form-group">
|
|
162
|
+
<label class="font_normal_body">用气性质</label>
|
|
163
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
164
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
165
|
+
condition="f_gasproperties = '{}'"
|
|
166
|
+
close-on-select></v-select>
|
|
167
|
+
</div>
|
|
161
168
|
</div>
|
|
162
169
|
</div>
|
|
163
170
|
</criteria>
|
|
@@ -171,6 +178,7 @@
|
|
|
171
178
|
<th><nobr>电话</nobr></th>
|
|
172
179
|
|
|
173
180
|
<th><nobr>燃气证号</nobr></th>
|
|
181
|
+
<th><nobr>气表品牌</nobr></th>
|
|
174
182
|
<th><nobr>表号</nobr></th>
|
|
175
183
|
<th><nobr>表具类型</nobr></th>
|
|
176
184
|
<th><nobr>表描述</nobr></th>
|
|
@@ -203,6 +211,7 @@
|
|
|
203
211
|
<td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
|
|
204
212
|
|
|
205
213
|
<td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
|
|
214
|
+
<th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
206
215
|
<th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
|
|
207
216
|
<th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
|
|
208
217
|
<th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
|
|
@@ -477,6 +486,9 @@
|
|
|
477
486
|
usertypes() {
|
|
478
487
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
479
488
|
},
|
|
489
|
+
gasproperties() {
|
|
490
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
|
|
491
|
+
},
|
|
480
492
|
pricetypes() {
|
|
481
493
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
482
494
|
},
|
|
@@ -159,6 +159,13 @@
|
|
|
159
159
|
condition="ss.f_balance_amount <= {} " placeholder="">
|
|
160
160
|
</div>
|
|
161
161
|
</div>
|
|
162
|
+
<div class="col-sm-2 form-group">
|
|
163
|
+
<label class="font_normal_body">用气性质</label>
|
|
164
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
165
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
166
|
+
condition="f_gasproperties = '{}'"
|
|
167
|
+
close-on-select></v-select>
|
|
168
|
+
</div>
|
|
162
169
|
</div>
|
|
163
170
|
</div>
|
|
164
171
|
</criteria>
|
|
@@ -172,6 +179,7 @@
|
|
|
172
179
|
<th><nobr>电话</nobr></th>
|
|
173
180
|
|
|
174
181
|
<th><nobr>燃气证号</nobr></th>
|
|
182
|
+
<th><nobr>气表品牌</nobr></th>
|
|
175
183
|
<th><nobr>表号</nobr></th>
|
|
176
184
|
<th><nobr>表具类型</nobr></th>
|
|
177
185
|
<th><nobr>表描述</nobr></th>
|
|
@@ -205,6 +213,7 @@
|
|
|
205
213
|
<td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
|
|
206
214
|
|
|
207
215
|
<td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
|
|
216
|
+
<th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
208
217
|
<th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
|
|
209
218
|
<th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
|
|
210
219
|
<th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
|
|
@@ -473,6 +482,9 @@
|
|
|
473
482
|
usertypes() {
|
|
474
483
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
475
484
|
},
|
|
485
|
+
gasproperties() {
|
|
486
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
|
|
487
|
+
},
|
|
476
488
|
pricetypes() {
|
|
477
489
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
478
490
|
},
|
|
@@ -30,6 +30,16 @@
|
|
|
30
30
|
<label class="font_normal_body" for="org">公  司:</label>
|
|
31
31
|
<right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
|
|
32
32
|
</div>
|
|
33
|
+
<div class="col-sm-2 form-group">
|
|
34
|
+
<label class="font_normal_body" for="dep" >部  门:</label>
|
|
35
|
+
<res-select id="dep" restype='department' style="width: 60%"
|
|
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>
|
|
33
43
|
<div class="col-sm-2 form-group">
|
|
34
44
|
<label class="font_normal_body">用气性质</label>
|
|
35
45
|
<v-select :value.sync="model.f_gasproperties"
|
|
@@ -46,14 +56,14 @@
|
|
|
46
56
|
condition="f_user_type = '{}'"
|
|
47
57
|
close-on-select></v-select>
|
|
48
58
|
</div>
|
|
49
|
-
<div class="col-sm-2 form-group"
|
|
50
|
-
<label class="font_normal_body">气价名称</label
|
|
51
|
-
<v-select :value.sync="model.f_price_name"
|
|
52
|
-
v-model="model.f_price_name"
|
|
53
|
-
:options="$parent.$parent.getPricenames"
|
|
54
|
-
condition="f_price_name = '{}'"
|
|
55
|
-
close-on-select></v-select
|
|
56
|
-
</div
|
|
59
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
60
|
+
<!-- <label class="font_normal_body">气价名称</label>-->
|
|
61
|
+
<!-- <v-select :value.sync="model.f_price_name"-->
|
|
62
|
+
<!-- v-model="model.f_price_name"-->
|
|
63
|
+
<!-- :options="$parent.$parent.getPricenames"-->
|
|
64
|
+
<!-- condition="f_price_name = '{}'"-->
|
|
65
|
+
<!-- close-on-select></v-select>-->
|
|
66
|
+
<!-- </div>-->
|
|
57
67
|
<div class="col-sm-2 form-group">
|
|
58
68
|
<label class="font_normal_body">气表品牌</label>
|
|
59
69
|
<v-select :value.sync="model.f_meter_brand"
|
|
@@ -193,7 +203,7 @@
|
|
|
193
203
|
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
194
204
|
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
195
205
|
this.initParams()
|
|
196
|
-
this.qijia()
|
|
206
|
+
// this.qijia()
|
|
197
207
|
},
|
|
198
208
|
methods: {
|
|
199
209
|
searchData () {
|
|
@@ -205,6 +215,9 @@
|
|
|
205
215
|
if (this.f_orgid[0]) {
|
|
206
216
|
this.orgCondtionStr += ` and f_orgid in ('${this.f_orgid}')`
|
|
207
217
|
}
|
|
218
|
+
if (this.f_depid[0]) {
|
|
219
|
+
this.orgCondtionStr += ` and f_depid = '${this.f_depid}'`
|
|
220
|
+
}
|
|
208
221
|
this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr
|
|
209
222
|
this.$refs.paged.search(args)
|
|
210
223
|
},
|
|
@@ -243,24 +256,24 @@
|
|
|
243
256
|
}
|
|
244
257
|
this.meterbrands = brandArr
|
|
245
258
|
},
|
|
246
|
-
async qijia (condition) {
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
},
|
|
259
|
+
// async qijia (condition) {
|
|
260
|
+
// // 初始化气价名称 t_stairprice 表中的 f_price_name 条件是f_state='有效'
|
|
261
|
+
// let HttpReset = new HttpResetClass()
|
|
262
|
+
// var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
|
|
263
|
+
// data: {
|
|
264
|
+
// condition: "1=1 and f_state='有效' " + (condition==null ? '' : condition),
|
|
265
|
+
// tablename: 't_stairprice',
|
|
266
|
+
// groupitem: 'f_price_name',
|
|
267
|
+
// orderitem: 'f_price_name',
|
|
268
|
+
// items: 'f_price_name'
|
|
269
|
+
// }
|
|
270
|
+
// }, {resolveMsg: null, rejectMsg: '获取气价名称失败!'})
|
|
271
|
+
// let brandArr1 = [{label: '全部', value: ''}]
|
|
272
|
+
// for (let row of data.data){
|
|
273
|
+
// brandArr1.push({label: row.f_price_name, value: row.f_price_name})
|
|
274
|
+
// }
|
|
275
|
+
// this.getPricenames = brandArr1
|
|
276
|
+
// },
|
|
264
277
|
// 根据文件路径获取储存的报表内容
|
|
265
278
|
getFileContent (path) {
|
|
266
279
|
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
@@ -127,6 +127,9 @@
|
|
|
127
127
|
<tabs header="发票查询" v-if="permission('发票查询')">
|
|
128
128
|
<invoice-details-query @deal-msg="dealMsg" :data="data"></invoice-details-query>
|
|
129
129
|
</tabs>
|
|
130
|
+
<tabs header="用气分析" v-if="permission('用气分析')">
|
|
131
|
+
<gas-analysis-query @deal-msg="dealMsg" :data="data"></gas-analysis-query>
|
|
132
|
+
</tabs>
|
|
130
133
|
</tab-button>
|
|
131
134
|
<!-- </div>-->
|
|
132
135
|
<!-- <div v-if="!listpage">-->
|
|
@@ -56,13 +56,13 @@
|
|
|
56
56
|
<label class="font_normal_body">气量百分比</label>
|
|
57
57
|
<input type="text" style="width:30%" class="input_search" title="大于等于"
|
|
58
58
|
v-model="model.f_gasprec_small"
|
|
59
|
-
condition="f_gasprec >= '{}
|
|
59
|
+
condition="f_gasprec >= '{}' " placeholder="大于等于">
|
|
60
60
|
<input type="text" style="width:30%" class="input_search" title="小于等于"
|
|
61
61
|
v-model="model.f_gasprec_big"
|
|
62
|
-
condition="f_gasprec <= '{}
|
|
62
|
+
condition="f_gasprec <= '{}' " placeholder="小于等于">
|
|
63
63
|
</div>
|
|
64
64
|
<div class="col-sm-2 form-group">
|
|
65
|
-
<label class="font_normal_body"> 增量 </label>
|
|
65
|
+
<label class="font_normal_body"> 增量 </label>
|
|
66
66
|
<input type="text" style="width:30%" class="input_search" title="大于等于"
|
|
67
67
|
v-model="model.f_gasdiff_small"
|
|
68
68
|
condition="f_gasdiff >= '{}' " placeholder="大于等于">
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
<datepicker id="startDate" placeholder="旧月开始日期" style="width:60%"
|
|
120
120
|
v-model="model.oldmonthstart"
|
|
121
121
|
:value.sync="model.oldmonthstart"
|
|
122
|
-
:format="'yyyy-MM-dd
|
|
122
|
+
:format="'yyyy-MM-dd'"
|
|
123
123
|
:show-reset-button="true">
|
|
124
124
|
</datepicker>
|
|
125
125
|
</div>
|
|
@@ -128,7 +128,7 @@
|
|
|
128
128
|
<datepicker id="endDate" placeholder="旧月结束时间" style="width:60%"
|
|
129
129
|
v-model="model.oldmonthend"
|
|
130
130
|
:value.sync="model.oldmonthend"
|
|
131
|
-
:format="'yyyy-MM-dd
|
|
131
|
+
:format="'yyyy-MM-dd'"
|
|
132
132
|
:show-reset-button="true">
|
|
133
133
|
</datepicker>
|
|
134
134
|
</div>
|
|
@@ -216,7 +216,7 @@
|
|
|
216
216
|
<td style="text-align: center;">{{ row.f_oldgas }}</td>
|
|
217
217
|
<td style="text-align: center;">{{ row.f_newgas }}</td>
|
|
218
218
|
<td style="text-align: center;">{{ row.f_gasdiff }}</td>
|
|
219
|
-
<td style="text-align: center;">{{ row.f_gasprec }}
|
|
219
|
+
<td style="text-align: center;">{{ row.f_gasprec }}%</td>
|
|
220
220
|
</tr>
|
|
221
221
|
</template>
|
|
222
222
|
<template partial='foot'></template>
|
|
@@ -240,7 +240,7 @@ export default {
|
|
|
240
240
|
title: '气量年比查询',
|
|
241
241
|
data () {
|
|
242
242
|
return {
|
|
243
|
-
model: new PagedList('rs/sql/
|
|
243
|
+
model: new PagedList('rs/sql/lixian_gasAnalysisQuery', 20, {
|
|
244
244
|
oldmonthstart: 'this.model.oldmonthstart',
|
|
245
245
|
oldmonthend: 'this.model.oldmonthend',
|
|
246
246
|
newmonthstart: 'this.model.newmonthstart',
|
|
@@ -261,8 +261,8 @@ export default {
|
|
|
261
261
|
}
|
|
262
262
|
},
|
|
263
263
|
ready () {
|
|
264
|
-
this.$refs.paged.$refs.cri.model.oldmonthend = this.$login.toStandardDateString()
|
|
265
|
-
this.$refs.paged.$refs.cri.model.newmonthend = this.$login.toStandardDateString()
|
|
264
|
+
this.$refs.paged.$refs.cri.model.oldmonthend = this.$login.toStandardDateString()
|
|
265
|
+
this.$refs.paged.$refs.cri.model.newmonthend = this.$login.toStandardDateString()
|
|
266
266
|
console.log('this.$refs.paged.$refs.cri.model.oldmonthend',this.$refs.paged.$refs.cri.model.oldmonthend)
|
|
267
267
|
console.log('this.$refs.paged.$refs.cri.model.newmonthend',this.$refs.paged.$refs.cri.model.newmonthend)
|
|
268
268
|
//加载抄表册
|
|
@@ -285,7 +285,7 @@ export default {
|
|
|
285
285
|
let otherInData = []
|
|
286
286
|
otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
|
|
287
287
|
let footerData = []
|
|
288
|
-
exportfield = this.getfield
|
|
288
|
+
let exportfield = this.getfield
|
|
289
289
|
// footerData.push("合计");
|
|
290
290
|
// let self = this;
|
|
291
291
|
// for (var field in self.sumsmodel) {
|