manage-client 3.2.79-aode → 3.2.80-aode

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.
Files changed (75) hide show
  1. package/build/dev-server.js +193 -193
  2. package/build/webpack.base.conf.js +79 -79
  3. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  4. package/gradle/wrapper/gradle-wrapper.properties +5 -0
  5. package/gradlew +234 -0
  6. package/gradlew.bat +89 -0
  7. package/package.json +1 -1
  8. package/src/Util.js +383 -383
  9. package/src/components/MeterManage/MeterList.vue +336 -336
  10. package/src/components/WebReport/UserGasAll.vue +214 -214
  11. package/src/components/sale/businessquery/CancelChargeQuery.vue +650 -650
  12. package/src/components/sale/businessquery/ChangeMeterQuery.vue +667 -667
  13. package/src/components/sale/businessquery/ChargeQuery.vue +663 -663
  14. package/src/components/sale/businessquery/DeductionGas.vue +149 -149
  15. package/src/components/sale/businessquery/DisableQuery.vue +315 -315
  16. package/src/components/sale/businessquery/EnableQuery.vue +315 -315
  17. package/src/components/sale/businessquery/FillCardQuery.vue +436 -436
  18. package/src/components/sale/businessquery/FillGasQuery.vue +435 -435
  19. package/src/components/sale/businessquery/HandplanQuery.vue +705 -705
  20. package/src/components/sale/businessquery/InspectListGas.vue +456 -456
  21. package/src/components/sale/businessquery/InspectManage.vue +37 -37
  22. package/src/components/sale/businessquery/NewAccountQuery.vue +512 -506
  23. package/src/components/sale/businessquery/OtherChargeQuery.vue +406 -406
  24. package/src/components/sale/businessquery/QueryUserState.vue +313 -313
  25. package/src/components/sale/businessquery/ReverseQuery.vue +347 -347
  26. package/src/components/sale/businessquery/TransferQuery.vue +363 -363
  27. package/src/components/sale/businessquery/toolCardMakeQuery.vue +340 -340
  28. package/src/components/sale/config/exportConfig.js +271 -271
  29. package/src/components/sale/filesquery/ChangeUserQuery.vue +396 -396
  30. package/src/components/sale/filesquery/DeviceQuery.vue +329 -329
  31. package/src/components/sale/filesquery/MeterQuery.vue +593 -593
  32. package/src/components/sale/filesquery/UserQuery.vue +556 -556
  33. package/src/components/sale/filesquery/filequerydetail/BlackListQueryDetail.vue +219 -219
  34. package/src/components/sale/filesquery/filequerydetail/DisableQueryDetail.vue +272 -272
  35. package/src/components/sale/filesquery/filequerydetail/EnableQueryDetail.vue +274 -274
  36. package/src/components/sale/ncpush/ncUserLoad.vue +176 -176
  37. package/src/components/sale/ncpush/ncpushmanage/NCpushList.vue +497 -497
  38. package/src/components/sale/ncpush/ncrecord/pushdaydatalist.vue +298 -298
  39. package/src/components/sale/ncpush/pushconfirmlist.vue +414 -414
  40. package/src/components/sale/ncpush/pushconfirmmergelist.vue +480 -480
  41. package/src/components/sale/report/aode/MonthByChargeType.vue +526 -526
  42. package/src/components/sale/report/aode/MonthByUserType.vue +562 -562
  43. package/src/components/sale/report/aode/YearByChargeTpye.vue +254 -254
  44. package/src/components/sale/report/aode/YearByUserType.vue +351 -342
  45. package/src/components/sale/report/aode/iot/FarawayQuery.vue +401 -401
  46. package/src/components/sale/report/aode/userbuyQuery.vue +477 -477
  47. package/src/components/valueaddinfo/ValueAddinfoQuery.vue +425 -425
  48. package/src/components/valueaddinfo/renewalvalueAddUserQuery.vue +371 -371
  49. package/src/components/valueaddinfo/valueAddCountQuery.vue +315 -315
  50. package/src/components/valueaddinfo/valueAddUserQuery.vue +404 -404
  51. package/src/components/webmeter/ArreasuserQuery.vue +193 -193
  52. package/src/components/webmeter/DrillData/LostContactAnalysis.vue +531 -531
  53. package/src/components/webmeter/DrillData/LostContactAnalysisList.vue +548 -548
  54. package/src/components/webmeter/DrillData/NewUserGasAll.vue +596 -588
  55. package/src/components/webmeter/DrillData/UserGasAll.vue +24 -0
  56. package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue +507 -507
  57. package/src/components/webmeter/EasyExcelExportCk.vue +396 -396
  58. package/src/components/webmeter/IOTArrears/arrears.vue +324 -324
  59. package/src/components/webmeter/IOTArrears/iotRechargeAudit.vue +377 -377
  60. package/src/components/webmeter/NewWebmeterHandplanQuery.vue +605 -605
  61. package/src/components/webmeter/WebmeterHandplanQuery.vue +640 -640
  62. package/src/components/webmeter/dataCollection/DataCollection.vue +630 -630
  63. package/src/components/webmeter/gasAnalysis/GasAnalysisManage.vue +303 -303
  64. package/src/components/webmeter/handplan/NewWebMeterHandPlan.vue +745 -745
  65. package/src/components/webmeter/newwebmeter/NewException/NewMeterException.vue +449 -449
  66. package/src/components/webmeter/newwebmeter/NewWebUserHand.vue +325 -325
  67. package/src/components/webmeter/newwebmeter/ReportDataQuery.vue +283 -283
  68. package/src/components/webmeter/newwebmeter/UserGasList.vue +295 -295
  69. package/src/components/webmeter/newwebmeter/UserInstructList.vue +311 -311
  70. package/src/components/webmeter/newwebmeter/signAnalysisListMain.vue +386 -386
  71. package/src/components/webmeter/report/ReportList.vue +211 -211
  72. package/src/main.js +56 -56
  73. package/src/saleManage.js +263 -263
  74. package/src/webmeterManage.js +99 -99
  75. package/client.iml +0 -15
@@ -1,414 +1,414 @@
1
- <template>
2
- <div style="height: 95%;">
3
- <criteria-paged :model="model" v-ref:paged @sort="sort" >
4
- <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
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">客户类型</label>
9
- <v-select :value.sync="model.f_user_type"
10
- @change="$parent.$parent.userTypeChange()"
11
- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
12
- condition="f_user_type = '{}'"
13
- close-on-select></v-select>
14
- </div>
15
- <div class="col-sm-2 form-group">
16
- <label class="font_normal_body">用气性质</label>
17
- <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
18
- :options='$parent.$parent.gasproperties' placeholder='请选择'
19
- condition="f_gasproperties = '{}'"
20
- close-on-select></v-select>
21
- </div>
22
- <div class="button-range" style="float:right;margin-top:10px">
23
- <button class="button_search button_spacing" @click="search()">查询</button>
24
- <button v-if="false" style="float:right;" type="button" class="button_search button_spacing" @click='$parent.$parent.addpushData'>新增交账记录</button>
25
- </div>
26
- </div>
27
- </div>
28
- </criteria>
29
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
30
- <template partial='head'>
31
- <tr>
32
- <th>
33
- <data-order name="操作"></data-order>
34
- </th>
35
- <th>
36
- <data-order field="f_userinfo_code" name="客户编号"></data-order>
37
- </th>
38
- <th><data-order field="f_user_name" name="客户姓名"></data-order>
39
- </th>
40
- <th><nobr>地址</nobr></th>
41
- <th>
42
- <data-order field="f_meter_brand" name="气表厂家"></data-order>
43
- </th>
44
- <th><data-order field="f_operate_date" name="操作时间"></data-order>
45
- <!--<nobr>操作时间</nobr>-->
46
- </th>
47
- <th><data-order field="f_operate_date" name="操作状态"></data-order>
48
- <!--<nobr>操作时间</nobr>-->
49
- </th>
50
- <th>
51
- <data-order field="f_type" name="收费类型"></data-order>
52
- <!--<nobr>收费类型</nobr>-->
53
- </th>
54
- <th>
55
- <data-order field="f_pregas" name="气量"></data-order>
56
- </th>
57
- <th>
58
- <data-order field="f_preamount" name="应收金额"></data-order>
59
- </th>
60
- <th>
61
- <data-order field="f_collection" name="实收金额"></data-order>
62
- </th>
63
- <th>
64
- <data-order field="f_stair1price" name="1单价"></data-order>
65
- </th>
66
- <th>
67
- <data-order field="f_stair1amount" name="1气量"></data-order>
68
- </th>
69
- <th>
70
- <data-order field="f_stair2price" name="2单价"></data-order>
71
- </th>
72
- <th>
73
- <data-order field="f_stair2amount" name="2气量"></data-order>
74
- </th>
75
- <th>
76
- <data-order field="f_stair3price" name="3单价"></data-order>
77
- </th>
78
- <th>
79
- <data-order field="f_stair3amount" name="3气量"></data-order>
80
- </th>
81
- <th><nobr>上期余额</nobr></th>
82
- <th><nobr>本期余额</nobr></th>
83
- <th>
84
- <data-order field="f_payment" name="付款方式"></data-order>
85
- <!--<nobr>付款方式</nobr>-->
86
- </th>
87
-
88
- <th>
89
- <data-order field="f_operator" name="操作员"></data-order>
90
- </th>
91
- <th>
92
- <data-order field="f_user_type" name="客户类型"></data-order>
93
- <!--<nobr>客户类型</nobr>-->
94
- </th>
95
- <th><nobr>备注</nobr></th>
96
-
97
- </tr>
98
- </template>
99
- <template partial='body' >
100
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
101
- <div v-if="row.flag!=null && row.flag=='1'">
102
- <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.deleterow(row)'>删除</button>
103
- <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.updaterow(row)'>修改</button>
104
- </div>
105
- </nobr> </td>
106
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
107
- <span >{{row.f_userinfo_code}}</span>
108
- </nobr> </td>
109
- <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_name}}</nobr></td>
110
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_address}}</nobr></td>
111
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_meter_brand}}</nobr></td>
112
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operate_date}}</nobr></td>
113
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_state}}</nobr></td>
114
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_type}}</nobr></td>
115
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_pregas}}</nobr></td>
116
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_preamount}}</nobr></td>
117
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_collection}}</nobr></td>
118
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1price}}</nobr></td>
119
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1amount}}</nobr></td>
120
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2price}}</nobr></td>
121
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2amount}}</nobr></td>
122
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3price}}</nobr></td>
123
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3amount}}</nobr></td>
124
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_balance}}</nobr></td>
125
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_curbalance}}</nobr></td>
126
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_payment}}</nobr></td>
127
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operator}}</nobr></td>
128
- <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_type}}</nobr></td>
129
- <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_comments}}</nobr></td>
130
- </template>
131
- </data-grid>
132
- </criteria-paged>
133
- <table class="table-hover">
134
- <tr style="position: relative" class="table-bordered">
135
- <td
136
- style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
137
- 汇总信息
138
- </td>
139
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
140
- 业务气量:&emsp;{{sumsmodel.f_shouru_gas}}
141
- </td>
142
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
143
- 实收金额:&emsp;{{sumsmodel.f_shouru_fee}}
144
- </td>
145
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
146
- 应收金额:&emsp;{{sumsmodel.f_yingshou_fee}}
147
- </td>
148
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
149
- 柜台微信:&emsp;{{sumsmodel.f_sumgtwx}}
150
- </td>
151
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
152
- 财务收款:&emsp;{{sumsmodel.f_sumcwsf}}
153
- </td>
154
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
155
- 现金缴费:&emsp;{{sumsmodel.f_sumxjjf}}
156
- </td>
157
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
158
- 柜台支付宝:&emsp;{{sumsmodel.f_sumzfb}}
159
- </td>
160
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
161
- pos:&emsp;{{sumsmodel.f_sumpos}}
162
- </td>
163
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
164
- 销售气票:&emsp;{{sumsmodel.f_sumqp}}
165
- </td>
166
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
167
- 银行码收款:&emsp;{{sumsmodel.f_sumyysk}}
168
- </td>
169
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
170
- 降价补气:&emsp;{{sumsmodel.f_sumjjbq}}
171
- </td>
172
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
173
- 煤改气补贴款:&emsp;{{sumsmodel.f_sumbtk}}
174
- </td>
175
- </tr>
176
- </table>
177
-
178
- </div>
179
- </template>
180
-
181
- <script>
182
- import { PagedList } from 'vue-client'
183
- let readySomething = async function (self) {
184
- self.model.params.startDate = self.searchcondition.startDate;
185
- self.model.params.endDate = self.searchcondition.endDate;
186
- self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
187
- self.sumchangeflag = 0;
188
- }
189
- export default {
190
- title: '交账记录确认',
191
- data() {
192
- return {
193
- gasproperties:[],
194
- orderDefault: "'f_operate_date'",
195
- orderFields: {
196
- f_userinfo_code: 'no'
197
- },
198
- confirmmodel:[],
199
- sumsmodel: {},
200
- allmodel:{},
201
- model: new PagedList('rs/sql/nopushdayReport', 30, {},{
202
- f_pregas: 0,
203
- f_collection: 0,
204
- f_count_open: 0,
205
- f_pregas_open: 0,
206
- f_collection_open: 0,
207
- f_count_zg: 0,
208
- f_pregas_zg: 0,
209
- f_collection_zg: 0,
210
- f_count_bk: 0,
211
- f_pregas_bk: 0,
212
- f_collection_bk: 0,
213
- f_count_bq: 0,
214
- f_pregas_bq: 0,
215
- f_collection_bq: 0,
216
- f_count_hb: 0,
217
- f_pregas_hb: 0,
218
- f_collection_hb: 0,
219
- f_count_cz: 0,
220
- f_pregas_cz: 0,
221
- f_collection_cz: 0,
222
- f_sum_count:0,
223
- f_shouru_gas:0,
224
- f_shouru_fee:0,
225
- f_yingshou_fee:0,
226
- f_usebenqi_fee:0,
227
- f_benqi_fee:0,
228
- f_sumgtwx:0,
229
- f_sumcwsf:0,
230
- f_sumxjjf:0,
231
- f_sumzfb:0,
232
- f_sumpos:0,
233
- f_sumwxjf:0,
234
- f_sumqp:0,
235
- f_sumyysk:0,
236
- f_sumjjbq:0,
237
- f_sumbtk:0
238
- }),
239
- sumchangeflag:0,
240
- }
241
- },
242
- props:['nopushmodel','othermodel','searchcondition'],
243
- ready() {
244
-
245
- readySomething(this);
246
- this.search();
247
- //let json = JSON.stringify(this.model);
248
- //this.allmodel = JSON.parse(json);
249
- //this.sumsmodel = this.allmodel.sums;
250
- //this.sumalldata();
251
- },
252
- methods: {
253
- userTypeChange () {
254
- this.gasproperties=[]
255
- if(this.$refs.paged.$refs.cri.model !==null) {
256
- this.$refs.paged.$refs.cri.model.f_gasproperties=''
257
- if(this.$refs.paged.$refs.cri.model.f_user_type[0] == null) return;
258
- this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
259
- // this.gasproperties.push({label: '全部', value: ''})
260
- }
261
- else{
262
- this.gasproperties =[{label: '全部', value: ''}]
263
- }
264
- },
265
- search() {
266
- this.$refs.paged.$refs.cri.search();
267
- this.sumchangeflag=0;
268
- this.checkotherbill();
269
- },
270
- async selfSearch(args) {
271
- this.model.params.startDate = this.searchcondition.startDate;
272
- this.model.params.endDate = this.searchcondition.endDate;
273
- args.condition = `${args.condition} and ` + this.searchcondition.condition;
274
- await this.model.search(args.condition, args.model);
275
- this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
276
- if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
277
- for (let key in this.sumsmodel) {
278
- this.sumsmodel[key] = 0;
279
- }
280
- }
281
- this.sumchangeflag=0;
282
- this.checkotherbill();
283
- },
284
- checkotherbill(){
285
- //检查特殊数据
286
- if(this.othermodel && this.othermodel.length>0 && this.model.rows){
287
- //如果存在将数据放入开头
288
- let newrow =[];
289
- if(this.model.rows.length>0){
290
- this.model.rows.forEach((item,index)=>{
291
- let flag = 1;
292
- this.othermodel.forEach(item2=>{
293
- if(this.compareObject(item,item2)){
294
- flag = 0;
295
- }
296
- })
297
- if(flag == 1){
298
- newrow.push(item);
299
- }
300
- })
301
- }
302
- this.model.rows = newrow;
303
- this.model.rows = [...this.othermodel,...this.model.rows];
304
- }
305
- //检查为交账数据
306
- if(this.nopushmodel && this.nopushmodel.length>0 && this.sumchangeflag==0 ){
307
- this.sumchangeflag = 1;
308
- this.nopushmodel.forEach(items=>{
309
- let newsums = this.sumsmodel;
310
- items.showflag = 1;
311
- newsums.f_shouru_gas = newsums.f_shouru_gas+ parseFloat(items.f_pregas-0);
312
- newsums.f_shouru_fee = newsums.f_shouru_fee+ parseFloat(items.f_preamount-0);
313
- newsums.f_yingshou_fee = newsums.f_yingshou_fee+ parseFloat(items.f_collection-0);
314
- if(items.f_payment=='柜台微信'){
315
- newsums.f_sumgtwx = newsums.f_sumgtwx+ parseFloat(items.f_collection-0);
316
- }
317
- if(items.f_payment=='财务收款'){
318
- newsums.f_sumcwsf = newsums.f_sumcwsf+ parseFloat(items.f_collection-0);
319
- }
320
- if(items.f_payment=='现金缴费'){
321
- newsums.f_sumxjjf = newsums.f_sumxjjf+ parseFloat(items.f_collection-0);
322
- }
323
- if(items.f_payment=='柜台支付宝'){
324
- newsums.f_sumzfb = newsums.f_sumzfb+ parseFloat(items.f_collection-0);
325
- }
326
- if(items.f_payment=='POS'){
327
- newsums.f_sumpos = newsums.f_sumpos+ parseFloat(items.f_collection-0);
328
- }
329
- this.$set('this.sumsmodel',newsums);
330
- this.$refs.paged.$refs.grid.model.sums = newsums;
331
- this.model.rows.unshift(items);
332
- })
333
- }
334
- },
335
- deleterow(row){
336
- this.othermodel.pop(row);
337
- this.$showAlert('删除成功!','success',1000);
338
- this.search();
339
- },
340
- updaterow(row){
341
- this.$dispatch('updaterow',row)
342
- },
343
- addpushData(){
344
- this.$dispatch('add');
345
- },
346
- compareObject(o1,o2){
347
- if(typeof o1 != typeof o2)return false;
348
- if(typeof o1 == 'object'){
349
- for(var o in o1){
350
- if(typeof o2[o] == 'undefined')return false;
351
- if(!this.compareObject(o1[o],o2[o]))return false;
352
- }
353
- return true;
354
- }else{
355
- return o1 === o2;
356
- }
357
- },
358
- sort (field, rule) {
359
- // 将所有排序方式设为不排序,实现相互排斥
360
- for (let key in this.orderFields) {
361
- if (key === field) {
362
- this.orderFields[key] = rule
363
- } else {
364
- this.orderFields[key] = 'no'
365
- }
366
- }
367
- if (rule === 'no') {
368
- this.allmodel.paramSource.orderitem = `'${this.orderDefault}'`
369
- } else {
370
- this.allmodel.paramSource.orderitem = `'${field} ${rule}'`
371
- }
372
- },
373
-
374
- sumalldata(){
375
- if(this.allmodel.rows && this.allmodel.rows.length>0){
376
- for (let keys in this.sumsmodel) {
377
- this.sumsmodel[keys] = 0;
378
- }
379
- this.allmodel.rows.forEach((item)=>{
380
- for (let key in this.sumsmodel) {
381
- let sumr = 0;
382
- if(item[key]!= null && item[key]!=''){
383
- if(!isNaN(item[key]))
384
- sumr = parseFloat(item[key]);
385
- }
386
- this.sumsmodel[key] +=sumr
387
- }
388
- })
389
- }
390
- }
391
- },
392
- computed:{
393
- usertypes() {
394
- return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
395
- },
396
- },
397
- watch:{
398
- 'model.pageIndex'(){
399
- this.checkotherbill();
400
- }
401
- }
402
- }
403
- </script>
404
-
405
- <style scoped>
406
-
407
- .col {
408
- width: 300px;
409
- overflow: hidden;
410
- text-overflow: ellipsis;
411
- white-space: nowrap;
412
- }
413
-
414
- </style>
1
+ <template>
2
+ <div style="height: 95%;">
3
+ <criteria-paged :model="model" v-ref:paged @sort="sort" >
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
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">客户类型</label>
9
+ <v-select :value.sync="model.f_user_type"
10
+ @change="$parent.$parent.userTypeChange()"
11
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
12
+ condition="f_user_type = '{}'"
13
+ close-on-select></v-select>
14
+ </div>
15
+ <div class="col-sm-2 form-group">
16
+ <label class="font_normal_body">用气性质</label>
17
+ <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
18
+ :options='$parent.$parent.gasproperties' placeholder='请选择'
19
+ condition="f_gasproperties = '{}'"
20
+ close-on-select></v-select>
21
+ </div>
22
+ <div class="button-range" style="float:right;margin-top:10px">
23
+ <button class="button_search button_spacing" @click="search()">查询</button>
24
+ <button v-if="false" style="float:right;" type="button" class="button_search button_spacing" @click='$parent.$parent.addpushData'>新增交账记录</button>
25
+ </div>
26
+ </div>
27
+ </div>
28
+ </criteria>
29
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
30
+ <template partial='head'>
31
+ <tr>
32
+ <th>
33
+ <data-order name="操作"></data-order>
34
+ </th>
35
+ <th>
36
+ <data-order field="f_userinfo_code" name="客户编号"></data-order>
37
+ </th>
38
+ <th><data-order field="f_user_name" name="客户姓名"></data-order>
39
+ </th>
40
+ <th><nobr>地址</nobr></th>
41
+ <th>
42
+ <data-order field="f_meter_brand" name="气表厂家"></data-order>
43
+ </th>
44
+ <th><data-order field="f_operate_date" name="操作时间"></data-order>
45
+ <!--<nobr>操作时间</nobr>-->
46
+ </th>
47
+ <th><data-order field="f_operate_date" name="操作状态"></data-order>
48
+ <!--<nobr>操作时间</nobr>-->
49
+ </th>
50
+ <th>
51
+ <data-order field="f_type" name="收费类型"></data-order>
52
+ <!--<nobr>收费类型</nobr>-->
53
+ </th>
54
+ <th>
55
+ <data-order field="f_pregas" name="气量"></data-order>
56
+ </th>
57
+ <th>
58
+ <data-order field="f_preamount" name="应收金额"></data-order>
59
+ </th>
60
+ <th>
61
+ <data-order field="f_collection" name="实收金额"></data-order>
62
+ </th>
63
+ <th>
64
+ <data-order field="f_stair1price" name="1单价"></data-order>
65
+ </th>
66
+ <th>
67
+ <data-order field="f_stair1amount" name="1气量"></data-order>
68
+ </th>
69
+ <th>
70
+ <data-order field="f_stair2price" name="2单价"></data-order>
71
+ </th>
72
+ <th>
73
+ <data-order field="f_stair2amount" name="2气量"></data-order>
74
+ </th>
75
+ <th>
76
+ <data-order field="f_stair3price" name="3单价"></data-order>
77
+ </th>
78
+ <th>
79
+ <data-order field="f_stair3amount" name="3气量"></data-order>
80
+ </th>
81
+ <th><nobr>上期余额</nobr></th>
82
+ <th><nobr>本期余额</nobr></th>
83
+ <th>
84
+ <data-order field="f_payment" name="付款方式"></data-order>
85
+ <!--<nobr>付款方式</nobr>-->
86
+ </th>
87
+
88
+ <th>
89
+ <data-order field="f_operator" name="操作员"></data-order>
90
+ </th>
91
+ <th>
92
+ <data-order field="f_user_type" name="客户类型"></data-order>
93
+ <!--<nobr>客户类型</nobr>-->
94
+ </th>
95
+ <th><nobr>备注</nobr></th>
96
+
97
+ </tr>
98
+ </template>
99
+ <template partial='body' >
100
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
101
+ <div v-if="row.flag!=null && row.flag=='1'">
102
+ <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.deleterow(row)'>删除</button>
103
+ <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.updaterow(row)'>修改</button>
104
+ </div>
105
+ </nobr> </td>
106
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
107
+ <span >{{row.f_userinfo_code}}</span>
108
+ </nobr> </td>
109
+ <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_name}}</nobr></td>
110
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_address}}</nobr></td>
111
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_meter_brand}}</nobr></td>
112
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operate_date}}</nobr></td>
113
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_state}}</nobr></td>
114
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_type}}</nobr></td>
115
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_pregas}}</nobr></td>
116
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_preamount}}</nobr></td>
117
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_collection}}</nobr></td>
118
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1price}}</nobr></td>
119
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1amount}}</nobr></td>
120
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2price}}</nobr></td>
121
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2amount}}</nobr></td>
122
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3price}}</nobr></td>
123
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3amount}}</nobr></td>
124
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_balance}}</nobr></td>
125
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_curbalance}}</nobr></td>
126
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_payment}}</nobr></td>
127
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operator}}</nobr></td>
128
+ <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_type}}</nobr></td>
129
+ <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_comments}}</nobr></td>
130
+ </template>
131
+ </data-grid>
132
+ </criteria-paged>
133
+ <table class="table-hover">
134
+ <tr style="position: relative" class="table-bordered">
135
+ <td
136
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
137
+ 汇总信息
138
+ </td>
139
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
140
+ 业务气量:&emsp;{{sumsmodel.f_shouru_gas}}
141
+ </td>
142
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
143
+ 实收金额:&emsp;{{sumsmodel.f_shouru_fee}}
144
+ </td>
145
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
146
+ 应收金额:&emsp;{{sumsmodel.f_yingshou_fee}}
147
+ </td>
148
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
149
+ 柜台微信:&emsp;{{sumsmodel.f_sumgtwx}}
150
+ </td>
151
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
152
+ 财务收款:&emsp;{{sumsmodel.f_sumcwsf}}
153
+ </td>
154
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
155
+ 现金缴费:&emsp;{{sumsmodel.f_sumxjjf}}
156
+ </td>
157
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
158
+ 柜台支付宝:&emsp;{{sumsmodel.f_sumzfb}}
159
+ </td>
160
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
161
+ pos:&emsp;{{sumsmodel.f_sumpos}}
162
+ </td>
163
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
164
+ 销售气票:&emsp;{{sumsmodel.f_sumqp}}
165
+ </td>
166
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
167
+ 银行码收款:&emsp;{{sumsmodel.f_sumyysk}}
168
+ </td>
169
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
170
+ 降价补气:&emsp;{{sumsmodel.f_sumjjbq}}
171
+ </td>
172
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
173
+ 煤改气补贴款:&emsp;{{sumsmodel.f_sumbtk}}
174
+ </td>
175
+ </tr>
176
+ </table>
177
+
178
+ </div>
179
+ </template>
180
+
181
+ <script>
182
+ import { PagedList } from 'vue-client'
183
+ let readySomething = async function (self) {
184
+ self.model.params.startDate = self.searchcondition.startDate;
185
+ self.model.params.endDate = self.searchcondition.endDate;
186
+ self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
187
+ self.sumchangeflag = 0;
188
+ }
189
+ export default {
190
+ title: '交账记录确认',
191
+ data() {
192
+ return {
193
+ gasproperties:[],
194
+ orderDefault: "'f_operate_date'",
195
+ orderFields: {
196
+ f_userinfo_code: 'no'
197
+ },
198
+ confirmmodel:[],
199
+ sumsmodel: {},
200
+ allmodel:{},
201
+ model: new PagedList('rs/sql/nopushdayReport', 30, {},{
202
+ f_pregas: 0,
203
+ f_collection: 0,
204
+ f_count_open: 0,
205
+ f_pregas_open: 0,
206
+ f_collection_open: 0,
207
+ f_count_zg: 0,
208
+ f_pregas_zg: 0,
209
+ f_collection_zg: 0,
210
+ f_count_bk: 0,
211
+ f_pregas_bk: 0,
212
+ f_collection_bk: 0,
213
+ f_count_bq: 0,
214
+ f_pregas_bq: 0,
215
+ f_collection_bq: 0,
216
+ f_count_hb: 0,
217
+ f_pregas_hb: 0,
218
+ f_collection_hb: 0,
219
+ f_count_cz: 0,
220
+ f_pregas_cz: 0,
221
+ f_collection_cz: 0,
222
+ f_sum_count:0,
223
+ f_shouru_gas:0,
224
+ f_shouru_fee:0,
225
+ f_yingshou_fee:0,
226
+ f_usebenqi_fee:0,
227
+ f_benqi_fee:0,
228
+ f_sumgtwx:0,
229
+ f_sumcwsf:0,
230
+ f_sumxjjf:0,
231
+ f_sumzfb:0,
232
+ f_sumpos:0,
233
+ f_sumwxjf:0,
234
+ f_sumqp:0,
235
+ f_sumyysk:0,
236
+ f_sumjjbq:0,
237
+ f_sumbtk:0
238
+ }),
239
+ sumchangeflag:0,
240
+ }
241
+ },
242
+ props:['nopushmodel','othermodel','searchcondition'],
243
+ ready() {
244
+
245
+ readySomething(this);
246
+ this.search();
247
+ //let json = JSON.stringify(this.model);
248
+ //this.allmodel = JSON.parse(json);
249
+ //this.sumsmodel = this.allmodel.sums;
250
+ //this.sumalldata();
251
+ },
252
+ methods: {
253
+ userTypeChange () {
254
+ this.gasproperties=[]
255
+ if(this.$refs.paged.$refs.cri.model !==null) {
256
+ this.$refs.paged.$refs.cri.model.f_gasproperties=''
257
+ if(this.$refs.paged.$refs.cri.model.f_user_type[0] == null) return;
258
+ this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
259
+ // this.gasproperties.push({label: '全部', value: ''})
260
+ }
261
+ else{
262
+ this.gasproperties =[{label: '全部', value: ''}]
263
+ }
264
+ },
265
+ search() {
266
+ this.$refs.paged.$refs.cri.search();
267
+ this.sumchangeflag=0;
268
+ this.checkotherbill();
269
+ },
270
+ async selfSearch(args) {
271
+ this.model.params.startDate = this.searchcondition.startDate;
272
+ this.model.params.endDate = this.searchcondition.endDate;
273
+ args.condition = `${args.condition} and ` + this.searchcondition.condition;
274
+ await this.model.search(args.condition, args.model);
275
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
276
+ if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
277
+ for (let key in this.sumsmodel) {
278
+ this.sumsmodel[key] = 0;
279
+ }
280
+ }
281
+ this.sumchangeflag=0;
282
+ this.checkotherbill();
283
+ },
284
+ checkotherbill(){
285
+ //检查特殊数据
286
+ if(this.othermodel && this.othermodel.length>0 && this.model.rows){
287
+ //如果存在将数据放入开头
288
+ let newrow =[];
289
+ if(this.model.rows.length>0){
290
+ this.model.rows.forEach((item,index)=>{
291
+ let flag = 1;
292
+ this.othermodel.forEach(item2=>{
293
+ if(this.compareObject(item,item2)){
294
+ flag = 0;
295
+ }
296
+ })
297
+ if(flag == 1){
298
+ newrow.push(item);
299
+ }
300
+ })
301
+ }
302
+ this.model.rows = newrow;
303
+ this.model.rows = [...this.othermodel,...this.model.rows];
304
+ }
305
+ //检查为交账数据
306
+ if(this.nopushmodel && this.nopushmodel.length>0 && this.sumchangeflag==0 ){
307
+ this.sumchangeflag = 1;
308
+ this.nopushmodel.forEach(items=>{
309
+ let newsums = this.sumsmodel;
310
+ items.showflag = 1;
311
+ newsums.f_shouru_gas = newsums.f_shouru_gas+ parseFloat(items.f_pregas-0);
312
+ newsums.f_shouru_fee = newsums.f_shouru_fee+ parseFloat(items.f_preamount-0);
313
+ newsums.f_yingshou_fee = newsums.f_yingshou_fee+ parseFloat(items.f_collection-0);
314
+ if(items.f_payment=='柜台微信'){
315
+ newsums.f_sumgtwx = newsums.f_sumgtwx+ parseFloat(items.f_collection-0);
316
+ }
317
+ if(items.f_payment=='财务收款'){
318
+ newsums.f_sumcwsf = newsums.f_sumcwsf+ parseFloat(items.f_collection-0);
319
+ }
320
+ if(items.f_payment=='现金缴费'){
321
+ newsums.f_sumxjjf = newsums.f_sumxjjf+ parseFloat(items.f_collection-0);
322
+ }
323
+ if(items.f_payment=='柜台支付宝'){
324
+ newsums.f_sumzfb = newsums.f_sumzfb+ parseFloat(items.f_collection-0);
325
+ }
326
+ if(items.f_payment=='POS'){
327
+ newsums.f_sumpos = newsums.f_sumpos+ parseFloat(items.f_collection-0);
328
+ }
329
+ this.$set('this.sumsmodel',newsums);
330
+ this.$refs.paged.$refs.grid.model.sums = newsums;
331
+ this.model.rows.unshift(items);
332
+ })
333
+ }
334
+ },
335
+ deleterow(row){
336
+ this.othermodel.pop(row);
337
+ this.$showAlert('删除成功!','success',1000);
338
+ this.search();
339
+ },
340
+ updaterow(row){
341
+ this.$dispatch('updaterow',row)
342
+ },
343
+ addpushData(){
344
+ this.$dispatch('add');
345
+ },
346
+ compareObject(o1,o2){
347
+ if(typeof o1 != typeof o2)return false;
348
+ if(typeof o1 == 'object'){
349
+ for(var o in o1){
350
+ if(typeof o2[o] == 'undefined')return false;
351
+ if(!this.compareObject(o1[o],o2[o]))return false;
352
+ }
353
+ return true;
354
+ }else{
355
+ return o1 === o2;
356
+ }
357
+ },
358
+ sort (field, rule) {
359
+ // 将所有排序方式设为不排序,实现相互排斥
360
+ for (let key in this.orderFields) {
361
+ if (key === field) {
362
+ this.orderFields[key] = rule
363
+ } else {
364
+ this.orderFields[key] = 'no'
365
+ }
366
+ }
367
+ if (rule === 'no') {
368
+ this.allmodel.paramSource.orderitem = `'${this.orderDefault}'`
369
+ } else {
370
+ this.allmodel.paramSource.orderitem = `'${field} ${rule}'`
371
+ }
372
+ },
373
+
374
+ sumalldata(){
375
+ if(this.allmodel.rows && this.allmodel.rows.length>0){
376
+ for (let keys in this.sumsmodel) {
377
+ this.sumsmodel[keys] = 0;
378
+ }
379
+ this.allmodel.rows.forEach((item)=>{
380
+ for (let key in this.sumsmodel) {
381
+ let sumr = 0;
382
+ if(item[key]!= null && item[key]!=''){
383
+ if(!isNaN(item[key]))
384
+ sumr = parseFloat(item[key]);
385
+ }
386
+ this.sumsmodel[key] +=sumr
387
+ }
388
+ })
389
+ }
390
+ }
391
+ },
392
+ computed:{
393
+ usertypes() {
394
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
395
+ },
396
+ },
397
+ watch:{
398
+ 'model.pageIndex'(){
399
+ this.checkotherbill();
400
+ }
401
+ }
402
+ }
403
+ </script>
404
+
405
+ <style scoped>
406
+
407
+ .col {
408
+ width: 300px;
409
+ overflow: hidden;
410
+ text-overflow: ellipsis;
411
+ white-space: nowrap;
412
+ }
413
+
414
+ </style>