sale-client 4.4.10 → 4.4.11

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.
@@ -1,7 +1,7 @@
1
1
  var path = require('path')
2
2
  var checkVersion = require('./versionCheck.js')
3
3
  checkVersion()
4
- const [ serverRul, localUrl ] = ['http://36.134.191.191:31467/', 'http://36.134.191.191:31467/']
4
+ const [ serverRul, localUrl ] = ['http://113.219.4.57:31467/', 'http://localhost:9026']
5
5
  var merge = require('webpack-merge')
6
6
  var baseConfig = require('./webpack.dev.conf')
7
7
  var devConfig = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.4.10",
3
+ "version": "4.4.11",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -74,6 +74,9 @@
74
74
  <th>
75
75
  <nobr>收费类型</nobr>
76
76
  </th>
77
+ <th>
78
+ <nobr>用户地址</nobr>
79
+ </th>
77
80
  <th v-if="!$parent.$parent.$parent.isIot">
78
81
  <nobr>收费区间</nobr>
79
82
  </th>
@@ -143,6 +146,7 @@
143
146
  <template partial='body' partial='list' v-ref:grid>
144
147
  <tr>
145
148
  <td style="text-align:center">{{ row.type }}</td>
149
+ <td style="text-align:center">{{ row.f_address }}</td>
146
150
  <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_hand_date }}</td>
147
151
 
148
152
  <td style="text-align:center">{{ row.f_meternumber }}</td>
@@ -281,7 +285,8 @@ export default {
281
285
  'f_operator': '操作员',
282
286
  'f_last_tablebase': '上期指数',
283
287
  'f_tablebase': '本期指数',
284
- 'f_comments': '备注'
288
+ 'f_comments': '备注',
289
+ 'f_address': '用户地址'
285
290
  },
286
291
  iotFields: {
287
292
  'f_userinfo_code': '客户编号',
@@ -291,7 +296,8 @@ export default {
291
296
  'f_preamount': '购气金额',
292
297
  'f_operate_date': '缴费时间',
293
298
  'f_operator': '操作员',
294
- 'f_comments': '备注'
299
+ 'f_comments': '备注',
300
+ 'f_address': '用户地址'
295
301
  },
296
302
  defaultfield: [
297
303
  'f_userinfo_code',
@@ -504,7 +510,8 @@ export default {
504
510
  'f_operate_date': '缴费时间',
505
511
  'f_state': '缴费状态',
506
512
  'f_depname': '网点',
507
- 'f_comments': '备注'
513
+ 'f_comments': '备注',
514
+ 'f_address': '用户地址'
508
515
  }
509
516
  } else {
510
517
  fields = {
@@ -525,7 +532,8 @@ export default {
525
532
  'f_operate_date': '缴费时间',
526
533
  'f_state': '缴费状态',
527
534
  'f_depname': '网点',
528
- 'f_comments': '备注'
535
+ 'f_comments': '备注',
536
+ 'f_address': '用户地址'
529
537
  }
530
538
  }
531
539
  return fields
@@ -390,7 +390,7 @@ export default {
390
390
  },
391
391
  async calPreamount () {
392
392
  this.collectionreload = false
393
- this.model.f_preamount = ((this.model.f_pregas - 0) * (this.model.f_price - 0)).toFixed(4)
393
+ this.model.f_preamount = ((this.model.f_pregas - 0) * (this.model.f_price - 0)).toFixed(this.config.decimal)
394
394
  this.model.f_totalcost = this.model.f_balance > this.model.f_preamount ? 0 : (this.model.f_preamount - 0) - (this.model.f_balance - 0)
395
395
  this.model.f_collection = this.model.f_totalcost - 0
396
396
  await this.$nextTick()
@@ -434,7 +434,7 @@ export default {
434
434
  computed: {
435
435
  'f_curbalance' () {
436
436
  if (this.model.f_preamount) {
437
- return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
437
+ return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(this.config.decimal)
438
438
  } else {
439
439
  return this.model.f_balance
440
440
  }
@@ -0,0 +1,553 @@
1
+ <template>
2
+ <div class="flex" style="justify-content: space-between;">
3
+ <div @keyup.enter="search" style="">
4
+ <criteria-paged :model="model" v-ref:paged>
5
+ <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
6
+ <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
7
+ <div class="row" width="100%">
8
+ <div class="col-sm-2 form-group">
9
+ <label class="font_normal_body">开始时间</label>
10
+ <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
11
+ class="datepicker"
12
+ condition="f_operate_date >= '{} 00:00:00' "
13
+ placeholder="起始时间"
14
+ style="width:60%"
15
+ v-model="model.f_start_date"
16
+ ></datepicker>
17
+ </div>
18
+ <div class="col-sm-2 form-group">
19
+ <label class="font_normal_body">结束时间</label>
20
+ <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
21
+ class="datepicker"
22
+ condition="f_operate_date <= '{} 23:59:59' "
23
+ placeholder="结束时间"
24
+ style="width:60%"
25
+ v-model="model.f_end_date"
26
+ ></datepicker>
27
+ </div>
28
+ <div class="col-sm-2 form-group">
29
+ <label class="font_normal_body">缴费状态</label>
30
+ <v-select :value.sync="model.f_state" v-model='model.f_state'
31
+ style="width:60%"
32
+ :options='$parent.$parent.jiaofeistates' placeholder='缴费状态'
33
+ close-on-select
34
+ condition="s.f_state = '{}'"></v-select>
35
+ </div>
36
+ <div class="col-sm-2 form-group">
37
+ <label class="font_normal_body">收费类型</label>
38
+ <v-select :value.sync="model.f_type" v-model='model.f_type'
39
+ style="width:60%"
40
+ :options='$parent.$parent.types' placeholder='收费类型'
41
+ close-on-select
42
+ condition="f_type = '{}'"></v-select>
43
+ </div>
44
+ <div class="col-sm-2 form-group">
45
+ <label class="font_normal_body">表具状态</label>
46
+ <v-select :value.sync="model.f_table_state" v-model='model.f_table_state'
47
+ style="width:60%"
48
+ :options='$parent.$parent.tablestates' placeholder='表具状态'
49
+ close-on-select
50
+ condition="f_table_state = '{}'"></v-select>
51
+ </div>
52
+ <div style="float: right">
53
+ <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
54
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
55
+ :field="$parent.$parent.getExportFields" :header="$parent.$parent.other"
56
+ sqlurl="api/af-revenue/logic/saleExport"
57
+ :sql-name="$parent.$parent.isIot ? 'sale_WebChargeQuery' : 'sale_ChargeQuery'"
58
+ template-name='用户收费查询导出'
59
+ :choose-col="true">
60
+ </export-excel>
61
+ <print-data :defaultfield="$parent.$parent.defaultfield"
62
+ :field="$parent.$parent.isIot?$parent.$parent.iotFields:$parent.$parent.fields"
63
+ :is-selected="true" :model="$parent.$parent.printModel"
64
+ @print-data="$parent.$parent.print()" :print-name="$parent.$parent.printName"></print-data>
65
+ </div>
66
+ </div>
67
+ </div>
68
+
69
+
70
+ </criteria>
71
+ <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
72
+ <template partial='head'>
73
+ <tr>
74
+ <th>
75
+ <nobr>收费类型</nobr>
76
+ </th>
77
+ <th>
78
+ <nobr>用户地址</nobr>
79
+ </th>
80
+ <th v-if="!$parent.$parent.$parent.isIot">
81
+ <nobr>收费区间</nobr>
82
+ </th>
83
+
84
+ <th>
85
+ <nobr>表号</nobr>
86
+ </th>
87
+ <th v-if="!$parent.$parent.$parent.isIot">
88
+ <nobr>上期指数</nobr>
89
+ </th>
90
+ <th v-if="!$parent.$parent.$parent.isIot">
91
+ <nobr>本期指数</nobr>
92
+ </th>
93
+ <th>
94
+ <nobr>气价</nobr>
95
+ </th>
96
+ <th>
97
+ <nobr>气量</nobr>
98
+ </th>
99
+ <th>
100
+ <nobr>气费金额</nobr>
101
+ </th>
102
+ <th>
103
+ <nobr>违约金</nobr>
104
+ </th>
105
+ <th>
106
+ <nobr>减免金额</nobr>
107
+ </th>
108
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">
109
+ <nobr>上期结余</nobr>
110
+ </th>
111
+ <th v-if="!$parent.$parent.$parent.isIot">
112
+ <nobr>应交金额</nobr>
113
+ </th>
114
+ <th>
115
+ <nobr>实收金额</nobr>
116
+ </th>
117
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">
118
+ <nobr>本期结余</nobr>
119
+ </th>
120
+ <th>
121
+ <nobr>付款方式</nobr>
122
+ </th>
123
+ <th>
124
+ <nobr>操作员</nobr>
125
+ </th>
126
+ <th>
127
+ <nobr>缴费日期</nobr>
128
+ </th>
129
+ <th>
130
+ <nobr>缴费时间</nobr>
131
+ </th>
132
+ <th>
133
+ <nobr>缴费状态</nobr>
134
+ </th>
135
+ <th>
136
+ <nobr>网点</nobr>
137
+ </th>
138
+ <th>
139
+ <nobr>备注</nobr>
140
+ </th>
141
+ <th>
142
+ <nobr>操作</nobr>
143
+ </th>
144
+ </tr>
145
+ </template>
146
+ <template partial='body' partial='list' v-ref:grid>
147
+ <tr>
148
+ <td style="text-align:center">{{ row.type }}</td>
149
+ <td style="text-align:center">{{ row.f_address }}</td>
150
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_hand_date }}</td>
151
+
152
+ <td style="text-align:center">{{ row.f_meternumber }}</td>
153
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_last_tablebase }}</td>
154
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_tablebase }}</td>
155
+ <td style="text-align:center">{{ row.f_price }}</td>
156
+ <td style="text-align:center">{{ row.f_pregas }}</td>
157
+ <td style="text-align:center">{{ row.f_preamount }}</td>
158
+ <td style="text-align:center">{{ row.f_delaypay }}</td>
159
+ <td style="text-align:center">{{ row.f_jianmian }}</td>
160
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{ row.f_balance }}</td>
161
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_oughtfee }}</td>
162
+ <td style="text-align:center">{{ row.f_collection }}</td>
163
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{ row.f_curbalance }}</td>
164
+ <td style="text-align:center">{{ row.f_payment }}</td>
165
+ <td style="text-align:center">{{ row.f_operator }}</td>
166
+ <td style="text-align:center">{{ row.f_operate_date.substring(0, 10) }}</td>
167
+ <td style="text-align:center">{{ row.f_operate_date.substring(11, 19) }}</td>
168
+ <td style="text-align:center">{{ row.f_state }}</td>
169
+ <td style="text-align:center">{{ row.f_depname }}</td>
170
+ <td style="text-align:center">{{ row.f_comments }}</td>
171
+ <td style="text-align:center">
172
+ <button @click.stop="$parent.$parent.$parent.report(row)" class="btn btn-link" name="button"
173
+ type="button"
174
+ v-if="row.f_state==='有效'">票据补打
175
+ </button>
176
+ </td>
177
+ </tr>
178
+ </template>
179
+ <template partial='foot'></template>
180
+ </data-grid>
181
+ </criteria-paged>
182
+ </div>
183
+ <table class="table-hover">
184
+ <tr class="table-bordered" style="position: relative">
185
+ <td
186
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
187
+ 汇总信息
188
+ </td>
189
+ <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
190
+ <!-- 气量合计:&emsp;{{model.sums.f_pregas}}-->
191
+ <!-- </td>-->
192
+ <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
193
+ <!-- 金额合计:&emsp;{{model.sums.f_preamount}}-->
194
+ <!-- </td>-->
195
+ <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
196
+ <!-- 应交合计:&emsp;{{model.sums.f_oughtfee}}-->
197
+ <!-- </td>-->
198
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
199
+ 气量合计:&emsp;{{ sumsmodel.f_pregas}}
200
+ </td>
201
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
202
+ 实收合计:&emsp;{{ sumsmodel.f_collection }}
203
+ </td>
204
+ </tr>
205
+ </table>
206
+ <reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()"
207
+ @reissue-success="reissueSucc()" v-if="reissue_show"></reissue-bill>
208
+
209
+ </div>
210
+ </template>
211
+
212
+ <script>
213
+ import {HttpResetClass, PagedList} from 'vue-client'
214
+ import co from 'co'
215
+
216
+ let reprintGen = function* (self, row) {
217
+ try {
218
+ let reissueData = {}
219
+ reissueData = Object.assign({}, reissueData, row)
220
+
221
+ reissueData.f_bill_type = row.type
222
+ reissueData.f_bill_style = '普通收据'
223
+ reissueData.f_operator = self.$login.f.name
224
+ reissueData.f_operatorid = self.$login.f.id
225
+ reissueData.f_orgid = self.$login.f.orgid
226
+ reissueData.f_orgname = self.$login.f.orgs
227
+ reissueData.f_depid = self.$login.f.depids
228
+ reissueData.f_depname = self.$login.f.deps
229
+ reissueData.billUrl = self.getBillUrl(row.type)
230
+
231
+ self.reissue_data = reissueData
232
+ self.reissue_show = true
233
+ } catch (error) {
234
+ if (error.status) {
235
+ self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
236
+ }
237
+ throw error
238
+ }
239
+ }
240
+ export default {
241
+ title: '收费',
242
+ data () {
243
+ return {
244
+ reissue_show: false,
245
+ reissue_data: null,
246
+ condition: '1=1',
247
+ model: new PagedList(`${this.row.f_meter_type === '物联网表' ? 'api/af-revenue/sql/sale_WebChargeQuery' : 'api/af-revenue/sql/sale_ChargeQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
248
+ f_collection: 0,
249
+ f_pregas:0
250
+ }),
251
+ isIot: this.row.f_meter_type === '物联网表',
252
+ show: false,
253
+ list: [],
254
+ jiaofeistates: this.$appdata.getParam('缴费状态') ? [{
255
+ label: '全部',
256
+ value: ''
257
+ }, ...this.$appdata.getParam('缴费状态')] : [],
258
+ types: this.$appdata.getParam('收费类型') ? [{
259
+ label: '全部',
260
+ value: ''
261
+ }, ...this.$appdata.getParam('收费类型')] : [],
262
+ tablestates: this.$appdata.getParam('表具状态') ? [{
263
+ label: '全部',
264
+ value: ''
265
+ }, ...this.$appdata.getParam('表具状态')] : [],
266
+ // 控制单选
267
+ radio: [],
268
+ searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userinfo_id',
269
+ // 选中的页
270
+ all: [],
271
+ other: [],
272
+ f_calculation: '',
273
+ footer: [],
274
+ sumsmodel: {},
275
+ // row数据
276
+ rowsdata: [],
277
+ printName: this.$login.f.orgs + '购气流水',
278
+ fields: {
279
+ 'f_userinfo_code': '客户编号',
280
+ 'f_user_name': '客户姓名',
281
+ 'f_pregas': '购气量',
282
+ 'f_price': '单价',
283
+ 'f_preamount': '购气金额',
284
+ 'f_hand_date': '收费区间',
285
+ 'f_operate_date': '缴费时间',
286
+ 'f_operator': '操作员',
287
+ 'f_last_tablebase': '上期指数',
288
+ 'f_tablebase': '本期指数',
289
+ 'f_comments': '备注',
290
+ 'f_address': '用户地址'
291
+ },
292
+ iotFields: {
293
+ 'f_userinfo_code': '客户编号',
294
+ 'f_user_name': '客户姓名',
295
+ 'f_pregas': '购气量',
296
+ 'f_price': '单价',
297
+ 'f_preamount': '购气金额',
298
+ 'f_operate_date': '缴费时间',
299
+ 'f_operator': '操作员',
300
+ 'f_comments': '备注',
301
+ 'f_address': '用户地址'
302
+ },
303
+ defaultfield: [
304
+ 'f_userinfo_code',
305
+ 'f_user_name',
306
+ 'f_preamount',
307
+ 'f_pregas',
308
+ 'f_operate_date',
309
+ 'f_operator',
310
+ 'f_comments'
311
+ ],
312
+ printModel: {
313
+ rows: []
314
+ }
315
+ }
316
+ },
317
+ props: ['row'],
318
+ ready () {
319
+ this.$refs.paged.$refs.criteria.model.f_state = ['有效']
320
+ this.$refs.paged.$refs.criteria.model.f_user_id = this.row.f_user_id
321
+ this.f_calculation = this.row.f_calculation
322
+ this.$refs.paged.$refs.criteria.search()
323
+
324
+ },
325
+ methods: {
326
+ getotherfooter () {
327
+ this.other = []
328
+ this.footer = []
329
+ let otherInData = []
330
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
331
+ let footerData = []
332
+ let exportfield = this.getExportFields
333
+ footerData.push('合计')
334
+ for (var field in this.sumsmodel) {
335
+ footerData.push(`${exportfield[field]}合计:${this.sumsmodel[field]}`)
336
+ }
337
+ this.footer.push(footerData)
338
+ this.other.push(otherInData)
339
+ },
340
+ async search () {
341
+ console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
342
+ this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
343
+ this.model.search(this.condition, this.model)
344
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
345
+ let http = new HttpResetClass()
346
+ let res = await http.load('POST', `${this.row.f_meter_type === '物联网表' ? 'api/af-revenue/sql/sale_WebChargeQuery' : 'api/af-revenue/sql/sale_ChargeQuery'}`, {
347
+ data: {
348
+ condition: this.condition,
349
+ f_user_id: this.row.f_user_id
350
+ }
351
+ }, {resolveMsg: null, rejectMsg: null})
352
+ this.printModel.rows = res.data
353
+ },
354
+ // 多选框初始化
355
+ selectInit () {
356
+ this.rowsdata = []
357
+ this.all = []
358
+ this.radio = []
359
+ },
360
+ reissueSucc () {
361
+ this.reissue_show = false
362
+ this.$dispatch('refresh')
363
+ },
364
+ reissueOper () {
365
+ this.reissue_data = null
366
+ this.reissue_show = false
367
+ },
368
+ getBillUrl (type) {
369
+ let name = ''
370
+ // 根据type数据 选择调用的Logic
371
+ if (type === '机表收费') {
372
+ name = 'api/af-revenue/report/machine_bill'
373
+ } else if (type === '物联网收费') {
374
+ name = 'api/af-revenue/report/iot_bill'
375
+ } else if (type === '超用收费') {
376
+ name = 'api/af-revenue/report/overuse_bill'
377
+ } else if (type === '其他收费') {
378
+ name = 'api/af-revenue/report/otherCharge_bill'
379
+ } else if (type === '发卡售气') {
380
+ name = 'api/af-revenue/report/sendCard_bill'
381
+ } else if (type === '卡表收费') {
382
+ name = 'api/af-revenue/report/card_bill'
383
+ } else if (type === '预存缴费') {
384
+ name = 'api/af-revenue/report/pre_sell'
385
+ }
386
+ return name
387
+ },
388
+ report (row) {
389
+ let reprint = reprintGen(this, row)
390
+ return co(reprint)
391
+ },
392
+ print () {
393
+ this.selectInit()
394
+ },
395
+ select () {
396
+ let index = this.model.pageIndex - 1
397
+ if (!this.radio[index]) {
398
+ this.radio.$set(index, [])
399
+ }
400
+ if (this.all[index]) {
401
+ // 数据
402
+ this.rowsdata[index] = Object.assign([], this.model.rows)
403
+ // 勾选
404
+ for (var i = 0; i < this.model.rows.length; i++) {
405
+ this.radio[index].$set(i, true)
406
+ }
407
+ } else {
408
+ // 数据
409
+ this.rowsdata[index] = []
410
+ // 不勾选
411
+ for (var i = 0; i < this.model.rows.length; i++) {
412
+ this.radio[index].$set(i, false)
413
+ }
414
+ }
415
+ let z = 0
416
+ for (let i = 0; i < this.all.length; i++) {
417
+ for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
418
+ this.printModel.rows[z++] = this.rowsdata[i][j]
419
+ }
420
+ }
421
+ },
422
+ selectOne (event, row, i) {
423
+ let index = this.model.pageIndex - 1
424
+ if (!this.rowsdata[index]) {
425
+ this.rowsdata[index] = []
426
+ }
427
+ if (!this.radio[index]) {
428
+ this.radio.$set(index, [])
429
+ }
430
+ if (event.target.checked) {
431
+ // 数据
432
+ this.rowsdata[index][i] = row
433
+ // 勾选
434
+ this.radio[index].$set(i, true)
435
+ // 判断是否全部选中
436
+ var allState = true
437
+ if (this.model.rows.length != this.radio[index].length) {
438
+ allState = false
439
+ }
440
+ for (var state of this.radio[index]) {
441
+ if (!state) {
442
+ allState = false
443
+ }
444
+ }
445
+ if (allState) {
446
+ this.all.$set(index, true)
447
+ } else {
448
+ this.all.$set(index, false)
449
+ }
450
+ } else {
451
+ // 数据
452
+ this.rowsdata[index][i] = []
453
+ // 不勾选
454
+ this.radio[index].$set(i, false)
455
+ // 任意取消一个则全选状态设为false
456
+ this.all.$set(index, false)
457
+ }
458
+ let z = 0
459
+ this.printModel.rows = []
460
+ for (let i = 0; i < this.all.length; i++) {
461
+ for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
462
+ if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
463
+ this.printModel.rows[z++] = this.rowsdata[i][j]
464
+ }
465
+ }
466
+ }
467
+ }
468
+ },
469
+ watch: {
470
+ 'model.rows' (val) {
471
+ if (val.length === 0) {
472
+ this.sumsmodel = {}
473
+ }
474
+ },
475
+ 'sumsmodel': {
476
+ handler: function (val) {
477
+ this.getotherfooter()
478
+ },
479
+ deep: true
480
+ }
481
+ },
482
+ computed: {
483
+ getCondition () {
484
+ return {
485
+ condition: this.condition,
486
+ f_user_id: this.row.f_user_id
487
+ }
488
+ },
489
+ getExportFields () {
490
+ let fields
491
+ if (this.isIot) {
492
+ fields = {
493
+ 'f_userinfo_code': '客户编号',
494
+ 'f_user_name': '客户姓名',
495
+ 'type': '收费类型',
496
+ 'f_hand_date': '收费区间',
497
+ 'f_meternumber': '表号',
498
+ 'f_last_tablebase': '上期指数',
499
+ 'f_tablebase': '本期指数',
500
+ 'f_pregas': '气量',
501
+ 'f_price': '气价',
502
+ 'f_preamount': '气费金额',
503
+ 'f_delaypay': '违约金',
504
+ 'f_jianmian': '减免金额',
505
+ 'f_balance': '上期结余',
506
+ 'f_oughtfee': '应交金额',
507
+ 'f_collection': '实收金额',
508
+ 'f_curbalance': '本期结余',
509
+ 'f_payment': '付款方式',
510
+ 'f_operator': '操作员',
511
+ 'f_operate_date': '缴费时间',
512
+ 'f_state': '缴费状态',
513
+ 'f_depname': '网点',
514
+ 'f_comments': '备注',
515
+ 'f_address': '用户地址'
516
+ }
517
+ } else {
518
+ fields = {
519
+ 'f_userinfo_code': '客户编号',
520
+ 'f_user_name': '客户姓名',
521
+ 'type': '收费类型',
522
+ 'f_meternumber': '表号',
523
+ 'f_pregas': '气量',
524
+ 'f_price': '气价',
525
+ 'f_preamount': '气费金额',
526
+ 'f_delaypay': '违约金',
527
+ 'f_jianmian': '减免金额',
528
+ 'f_balance': '上期结余',
529
+ 'f_collection': '实收金额',
530
+ 'f_curbalance': '本期结余',
531
+ 'f_payment': '付款方式',
532
+ 'f_operator': '操作员',
533
+ 'f_operate_date': '缴费时间',
534
+ 'f_state': '缴费状态',
535
+ 'f_depname': '网点',
536
+ 'f_comments': '备注',
537
+ 'f_address': '用户地址'
538
+ }
539
+ }
540
+ return fields
541
+ },
542
+ ischecked () {
543
+ return function (index, i) {
544
+ if (!this.radio[index]) {
545
+ return false
546
+ }
547
+ return this.radio[index][i]
548
+ }
549
+ }
550
+ }
551
+ }
552
+ </script>
553
+
@@ -125,7 +125,7 @@
125
125
  import {HttpResetClass} from 'vue-client'
126
126
  // 导入IC卡相关查询界面
127
127
  import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
128
- import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
128
+ import ChargeQueryUser from './ChargeQueryUser'
129
129
  import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
130
130
  import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
131
131
  import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser'
@@ -13,4 +13,6 @@ export default function () {
13
13
  Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
14
14
  // 机表收费引导
15
15
  Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo.vue'], resolve) })
16
+ Vue.component('charge-query-user', (resolve) => { require(['./ChargeQueryUser.vue'], resolve) })
17
+
16
18
  }
package/src/main.js CHANGED
@@ -2,7 +2,7 @@ import Vue from 'vue'
2
2
  import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
- import FilialeSale from './filiale/hongYa/sale'
5
+ import FilialeSale from './filiale/jinhuang/sale'
6
6
  import sale from './sale'
7
7
  import address from 'address-client/src/address'
8
8
  import ldap from 'ldap-clients/src/ldap'