sale-client 3.6.462 → 3.6.463

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/newpriceadjustment/NewPriceAdjustment.vue +93 -35
  3. package/src/components/newpriceadjustment/NewPriceAdjustmentManage.vue +29 -33
  4. package/src/components/newpriceadjustment/NewPriceAdjustmentSell.vue +90 -4
  5. package/src/components/newpriceadjustment/NewPriceAdjustmentWebmeter.vue +96 -5
  6. package/src/filiale/rongchuang/FilesManage/FileUserFiles.vue +14 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.462",
3
+ "version": "3.6.463",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/newpriceadjustment/NewPriceAdjustment.vue CHANGED
@@ -42,6 +42,10 @@
42
42
  <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
43
43
  <button class="button_search" @click="search()" v-el:cx>查询</button>
44
44
  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
45
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
46
+ :field="$parent.$parent.getfield"
47
+ sqlurl="rs/logic/saleExport" sql-name="new_get_UserCharge" template-name='机表调价补差导出'
48
+ :choose-col="true"></export-excel>
45
49
  <div style="float: right" class="button_spacing"
46
50
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
47
51
  @click="$parent.$parent.hidden()"></div>
@@ -139,37 +143,6 @@
139
143
  condition="sp.id = '{}'"
140
144
  close-on-select></v-select>
141
145
  </div>
142
-
143
- <!-- <div class="col-sm-2 form-group">-->
144
- <!-- <label class="font_normal_body">抄&ensp;表&ensp;员</label>-->
145
- <!-- <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'-->
146
- <!-- style="width:60%"-->
147
-
148
- <!-- :options='$parent.$parent.inputtoreser' placeholder='抄表员'-->
149
- <!-- @change="$parent.$parent.inputtorchange"-->
150
- <!-- close-on-select-->
151
- <!-- v-el:cc></v-select>-->
152
- <!-- </div>-->
153
- <!-- &lt;!&ndash;表册片区&ndash;&gt;-->
154
- <!-- <div class="col-sm-2 form-group">-->
155
- <!-- <label class="font_normal_body">表册片区</label>-->
156
- <!-- <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"-->
157
- <!-- :options='$parent.$parent.bookSliceArea' placeholder='表册片区'-->
158
- <!-- multiple-->
159
- <!-- style="width:60%"-->
160
- <!-- @change="$parent.$parent.sliceChange"-->
161
- <!-- close-on-select-->
162
- <!-- condition="f_book_slice_area in {}"></v-select>-->
163
- <!-- </div>-->
164
- <!-- <div class="col-sm-2 form-group">-->
165
- <!-- <label class="font_normal_body">抄&ensp;表&ensp;册</label>-->
166
- <!-- <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"-->
167
- <!-- :options='$parent.$parent.meterbooks' placeholder='抄表册'-->
168
- <!-- multiple-->
169
- <!-- style="width:60%"-->
170
- <!-- close-on-select-->
171
- <!-- condition="f_meter_book_num in {}"></v-select>-->
172
- <!-- </div>-->
173
146
  </div>
174
147
  </div>
175
148
  </criteria>
@@ -304,7 +277,7 @@
304
277
  <th style="text-align: center;">{{row.f_stair_price2}}</th>
305
278
  <th style="text-align: center;">{{row.f_stair_price3}}</th>
306
279
  <th style="text-align: center;">
307
- <div v-if="!row.f_change_price1">
280
+ <div v-if="!row.f_surplus_fee">
308
281
  <button type="button" name="button" class="btn btn-link"
309
282
  @click.stop="$parent.$parent.$parent.calculation(row) && row.states === 1">调价补差
310
283
  </button>
@@ -340,7 +313,7 @@
340
313
  <th style="text-align: center;">{{row.f_stair_gas3}}</th>
341
314
  <th style="text-align: center;">{{row.f_operate_date}}</th>
342
315
  <th style="text-align: center;">
343
- <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
316
+ <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
344
317
  @click.stop="$parent.$parent.$parent.delectHand(row) && row.states === 1">冲正
345
318
  </button>
346
319
  <!-- <button type="button" name="button" class="btn btn-link" v-if="!row.f_new_price"-->
@@ -350,6 +323,22 @@
350
323
  </template>
351
324
  </data-grid>
352
325
  </criteria-paged>
326
+ <table class="table-hover">
327
+ <tr style="position: relative" class="table-bordered">
328
+ <td
329
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
330
+ 汇总信息
331
+ </td>
332
+ <td
333
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
334
+ 补差气量:&emsp;{{sumsmodel.f_pregas}}
335
+ </td>
336
+ <td
337
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
338
+ 补差金额:&emsp;{{sumsmodel.f_surplus_fee}}
339
+ </td>
340
+ </tr>
341
+ </table>
353
342
  <modal :show.sync="show">
354
343
  <header slot="modal-header" class="modal-header">
355
344
  <h4 class="modal-title">调 价 补 差</h4>
@@ -404,6 +393,7 @@
404
393
  self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
405
394
  self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
406
395
  self.$refs.paged.$refs.criteria.model.f_change_date = ''
396
+ self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
407
397
  getPrice(self)
408
398
  self.$showAlert('请输入[气价变更时间,气价类型]后进行查询！', 'warning', 2000)
409
399
  self.pricechange = false
@@ -453,9 +443,12 @@
453
443
  data () {
454
444
  return {
455
445
  f_orgid: '',
446
+ footer: [],
447
+ other:[],
456
448
  pricechange: true,
457
449
  criteriaShow: false,
458
450
  f_change_price1:0,
451
+ sumsmodel:[],
459
452
  f_change_price2:0,
460
453
  f_change_price3:0,
461
454
  pricers: [{label: '全部', value: '', flage: ''}],
@@ -473,7 +466,38 @@
473
466
  endDate: 'this.model.endDate',
474
467
  price_states: 'this.model.price_states[0]',
475
468
  addSelectParam: 'this.model.addSelectParam'
469
+ },{
470
+ f_pregas: 0,
471
+ f_surplus_fee: 0
476
472
  }),
473
+ config: {
474
+ defaultPrint: [],
475
+ excelHeaders: {
476
+ 'f_userinfo_code': '用户编号',
477
+ 'f_meternumber': '表号',
478
+ 'f_user_name': '用户姓名',
479
+ 'f_user_type': '用户类型',
480
+ 'f_meter_type': '气表类型',
481
+ 'f_price_name': '气价名称',
482
+ 'f_stair_gas1': '一阶气量',
483
+ 'f_stair_gas2': '二阶气量',
484
+ 'f_stair_gas3': '三阶气量',
485
+ 'f_stair_price1': '一阶单价',
486
+ 'f_stair_price2': '二阶单价',
487
+ 'f_stair_price3': '三阶单价',
488
+ 'f_change_price1': '一阶补差单价',
489
+ 'f_change_price2': '二阶补差单价',
490
+ 'f_change_price3': '三阶补差单价',
491
+ 'f_surplus_fee1': '一阶补差金额',
492
+ 'f_surplus_fee2': '二阶补差金额',
493
+ 'f_surplus_fee3': '三阶补差金额',
494
+ 'f_last_tablebase': '上期底数',
495
+ 'f_tablebase': '本期底数',
496
+ 'f_pregas': '补差气量',
497
+ 'f_surplus_fee': '补差金额',
498
+ 'f_source': '差价来源'
499
+ }
500
+ },
477
501
  f_new_price: '',
478
502
  pricetime_states: '',
479
503
  show: false,
@@ -500,6 +524,22 @@
500
524
  asyncReadyGen(this)
501
525
  },
502
526
  methods: {
527
+ getotherfooter () {
528
+ this.other = []
529
+ this.footer = []
530
+ let exportdata = this.getCondition
531
+ let otherInData = []
532
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
533
+ let footerData = [], exportfield = this.getfield
534
+ footerData.push('合计')
535
+ let self = this
536
+
537
+ for (var field in self.sumsmodel) {
538
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
539
+ }
540
+ this.footer.push(footerData)
541
+ this.other.push(otherInData)
542
+ },
503
543
  getprice(row){
504
544
  this.show = true
505
545
 
@@ -710,7 +750,7 @@
710
750
  row.f_orgname = this.$login.f.orgs
711
751
  row.f_depid = this.$login.f.depids
712
752
  row.f_depname = this.$login.f.deps
713
- this.$resetpost('rs/logic/newpriceAdjustmentOffset', {data: row}).then(() => {
753
+ this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
714
754
  // this.$dispatch('refresh', '正在处理', row)
715
755
  this.selfSearch(this.model)
716
756
  })
@@ -886,7 +926,19 @@
886
926
  })
887
927
  }
888
928
  },
889
- computed: {},
929
+ computed: {
930
+ getCondition () {
931
+ return {
932
+ f_change_date:this.$refs.paged.$refs.criteria.model.f_change_date,
933
+ startDate:this.$refs.paged.$refs.criteria.model.startDate,
934
+ endDate: this.$refs.paged.$refs.criteria.model.endDate,
935
+ condition: this.condition
936
+ }
937
+ },
938
+ getfield () {
939
+ return this.config.excelHeaders
940
+ }
941
+ },
890
942
  watch: {
891
943
  async 'f_filialeid' (val) {
892
944
  // 更新抄表册
@@ -897,6 +949,12 @@
897
949
  if (this.f_filialeid) {
898
950
  getPrice(this)
899
951
  }
952
+ },
953
+ sumsmodel: {
954
+ handler: function (val) {
955
+ this.getotherfooter()
956
+ },
957
+ deep: true
900
958
  }
901
959
  }
902
960
  }
package/src/components/newpriceadjustment/NewPriceAdjustmentManage.vue CHANGED
@@ -11,46 +11,42 @@
11
11
  <new-price-adjustment-sell @deal-msg="dealMsg"></new-price-adjustment-sell>
12
12
  </tabs>
13
13
  </tab-button>
14
- <!-- </div>-->
15
- <!-- <div v-if="!listpage">-->
16
- <!-- <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
17
- <!-- </div>-->
18
14
  </template>
19
15
 
20
16
  <script>
21
- import TabButton from '../../components/revenue/comprehen/SpecialUser/common/TabButton'
22
- import Tabs from '../../components/revenue/comprehen/SpecialUser/common/Tabs'
17
+ import TabButton from '../../components/revenue/comprehen/SpecialUser/common/TabButton'
18
+ import Tabs from '../../components/revenue/comprehen/SpecialUser/common/Tabs'
23
19
 
24
- export default {
25
- name: 'PriceAdjustmentManage',
26
- title: '调价补差管理',
27
- data () {
28
- return {// 页面开关
29
- f_start_date: '',
30
- f_end_date: '',
31
- listpage: true,
32
- width: {
33
- left: '100%',
34
- right: '0%'
35
- },
36
- // searchNumber:'',
37
- rowData: {},
38
- show: [true]
39
- }
40
- },
41
- components: {Tabs, TabButton},
42
- ready () {
43
- console.log(this.$refs.list)
44
- console.log('业务查询')
45
- },
46
- methods: {
47
- cancel (obj) {
48
- this.listpage = true
20
+ export default {
21
+ name: 'PriceAdjustmentManage',
22
+ title: '调价补差管理',
23
+ data () {
24
+ return {// 页面开关
25
+ f_start_date: '',
26
+ f_end_date: '',
27
+ listpage: true,
28
+ width: {
29
+ left: '100%',
30
+ right: '0%'
49
31
  },
50
- dealMsg (obj) {
51
- }
32
+ // searchNumber:'',
33
+ rowData: {},
34
+ show: [true]
35
+ }
36
+ },
37
+ components: {Tabs, TabButton},
38
+ ready () {
39
+ console.log(this.$refs.list)
40
+ console.log('业务查询')
41
+ },
42
+ methods: {
43
+ cancel (obj) {
44
+ this.listpage = true
45
+ },
46
+ dealMsg (obj) {
52
47
  }
53
48
  }
49
+ }
54
50
  </script>
55
51
 
56
52
  <style scoped>
package/src/components/newpriceadjustment/NewPriceAdjustmentSell.vue CHANGED
@@ -49,6 +49,10 @@
49
49
  <div class="span" style="float:right;">&nbsp;&nbsp;
50
50
  <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
51
51
  <button class="button_search" @click="search()" v-el:cx>查询</button>
52
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
53
+ :field="$parent.$parent.getfield"
54
+ sqlurl="rs/logic/saleExport" sql-name="get_AdjustSellCharge" template-name='卡表调价补差导出'
55
+ :choose-col="true"></export-excel>
52
56
  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
53
57
  <div style="float: right" class="button_spacing"
54
58
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -195,7 +199,7 @@
195
199
  <th style="text-align: center;">{{row.f_stair_price2}}</th>
196
200
  <th style="text-align: center;">{{row.f_stair_price3}}</th>
197
201
  <th style="text-align: center;">
198
- <div v-if="!row.f_change_price1">
202
+ <div v-if="!row.f_surplus_fee">
199
203
  <button type="button" name="button" class="btn btn-link"
200
204
  @click.stop="$parent.$parent.$parent.calculation(row) && row.states === 1">调价补差
201
205
  </button>
@@ -240,13 +244,29 @@
240
244
  <th style="text-align: center;">{{row.f_surplus_fee}}</th>
241
245
  <th style="text-align: center;">{{row.f_source}}</th>
242
246
  <th style="text-align: center;">
243
- <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
247
+ <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
244
248
  @click.stop="$parent.$parent.$parent.delectHand(row) && row.states === 1">冲正
245
249
  </button>
246
250
  </th>
247
251
  </template>
248
252
  </data-grid>
249
253
  </criteria-paged>
254
+ <table class="table-hover">
255
+ <tr style="position: relative" class="table-bordered">
256
+ <td
257
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
258
+ 汇总信息
259
+ </td>
260
+ <td
261
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
262
+ 补差气量:&emsp;{{sumsmodel.f_pregas}}
263
+ </td>
264
+ <td
265
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
266
+ 补差金额:&emsp;{{sumsmodel.f_surplus_fee}}
267
+ </td>
268
+ </tr>
269
+ </table>
250
270
  <modal :show.sync="show">
251
271
  <header slot="modal-header" class="modal-header">
252
272
  <h4 class="modal-title">调 价 补 差</h4>
@@ -300,6 +320,7 @@
300
320
  self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
301
321
  self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
302
322
  self.$refs.paged.$refs.criteria.model.f_change_date = ''
323
+ self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
303
324
  getPrice(self)
304
325
  self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
305
326
  self.pricechange = false
@@ -332,9 +353,40 @@
332
353
  data () {
333
354
  return {
334
355
  f_orgid: '',
356
+ sumsmodel:[],
357
+ footer: [],
358
+ other:[],
335
359
  f_filialeid: this.$login.f.orgid,
336
360
  operatorrow:'',
337
361
  operatortype :'one',
362
+ config: {
363
+ defaultPrint: [],
364
+ excelHeaders: {
365
+ 'f_userinfo_code': '用户编号',
366
+ 'f_meternumber': '表号',
367
+ 'f_user_name': '用户姓名',
368
+ 'sell_date': '购气时间',
369
+ 'f_preamount': '购气金额',
370
+ 'f_user_type': '用户类型',
371
+ 'f_meter_type': '气表类型',
372
+ 'f_price_name': '气价名称',
373
+ 'f_stair_gas1': '一阶气量',
374
+ 'f_stair_gas2': '二阶气量',
375
+ 'f_stair_gas3': '三阶气量',
376
+ 'f_stair_price1': '一阶单价',
377
+ 'f_stair_price2': '二阶单价',
378
+ 'f_stair_price3': '三阶单价',
379
+ 'f_change_price1': '一阶补差单价',
380
+ 'f_change_price2': '二阶补差单价',
381
+ 'f_change_price3': '三阶补差单价',
382
+ 'f_surplus_fee1': '一阶补差金额',
383
+ 'f_surplus_fee2': '二阶补差金额',
384
+ 'f_surplus_fee3': '三阶补差金额',
385
+ 'f_pregas': '补差气量',
386
+ 'f_surplus_fee': '补差金额',
387
+ 'f_source': '差价来源'
388
+ }
389
+ },
338
390
  pricechange: true,
339
391
  criteriaShow: false,
340
392
  f_change_price1:0,
@@ -347,7 +399,9 @@
347
399
  priceTypes: this.$appdata.getParam('气价类型') ? [ ...this.$appdata.getParam('气价类型')] : [],
348
400
  condition: '',
349
401
  locking: false,
350
- model: new PagedList('rs/sql/get_AdjustSellCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'}),
402
+ model: new PagedList('rs/sql/get_AdjustSellCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'},{ f_pregas: 0,
403
+ f_surplus_fee: 0
404
+ }),
351
405
  f_new_price: 0.0,
352
406
  f_old_price:0.0,
353
407
  f_change_price:0.0,
@@ -365,6 +419,22 @@
365
419
  })
366
420
  },
367
421
  methods: {
422
+ getotherfooter () {
423
+ this.other = []
424
+ this.footer = []
425
+ let exportdata = this.getCondition
426
+ let otherInData = []
427
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
428
+ let footerData = [], exportfield = this.getfield
429
+ footerData.push('合计')
430
+ let self = this
431
+
432
+ for (var field in self.sumsmodel) {
433
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
434
+ }
435
+ this.footer.push(footerData)
436
+ this.other.push(otherInData)
437
+ },
368
438
  calculation (row) {
369
439
  this.f_change_price1 = 0,
370
440
  this.f_change_price2 = 0,
@@ -427,7 +497,7 @@
427
497
  row.f_orgname = this.$login.f.orgs
428
498
  row.f_depid = this.$login.f.depids
429
499
  row.f_depname = this.$login.f.deps
430
- this.$resetpost('rs/logic/newpriceAdjustmentOffset', {data: row}).then(() => {
500
+ this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
431
501
  // this.$dispatch('refresh', '正在处理', row)
432
502
  this.selfSearch(this.model)
433
503
  })
@@ -576,6 +646,16 @@
576
646
  }
577
647
  },
578
648
  computed: {
649
+ getCondition () {
650
+ return {
651
+ startDate:this.$refs.paged.$refs.criteria.model.startDate,
652
+ endDate: this.$refs.paged.$refs.criteria.model.endDate,
653
+ condition: this.condition
654
+ }
655
+ },
656
+ getfield () {
657
+ return this.config.excelHeaders
658
+ }
579
659
  },
580
660
  watch: {
581
661
  async 'f_filialeid' (val) {
@@ -587,6 +667,12 @@
587
667
  if (this.f_filialeid) {
588
668
  getPrice(this)
589
669
  }
670
+ },
671
+ sumsmodel: {
672
+ handler: function (val) {
673
+ this.getotherfooter()
674
+ },
675
+ deep: true
590
676
  }
591
677
  }
592
678
  }
package/src/components/newpriceadjustment/NewPriceAdjustmentWebmeter.vue CHANGED
@@ -49,6 +49,10 @@
49
49
  <div class="span" style="float:right;">&nbsp;&nbsp;
50
50
  <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
51
51
  <button class="button_search" @click="search()" v-el:cx>查询</button>
52
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
53
+ :field="$parent.$parent.getfield"
54
+ sqlurl="rs/logic/saleExport" sql-name="get_WebUserCharge" template-name='物联网表调价补差导出'
55
+ :choose-col="true"></export-excel>
52
56
  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
53
57
  <div style="float: right" class="button_spacing"
54
58
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -197,7 +201,7 @@
197
201
  <th style="text-align: center;">{{row.f_stair_price2}}</th>
198
202
  <th style="text-align: center;">{{row.f_stair_price3}}</th>
199
203
  <th style="text-align: center;">
200
- <div v-if="!row.f_change_price1">
204
+ <div v-if="!row.f_surplus_fee">
201
205
  <button type="button" name="button" class="btn btn-link"
202
206
  @click.stop="$parent.$parent.$parent.calculation(row) && row.states === 1">调价补差
203
207
  </button>
@@ -244,13 +248,29 @@
244
248
  <th style="text-align: center;">{{row.f_surplus_fee}}</th>
245
249
  <th style="text-align: center;">{{row.f_source}}</th>
246
250
  <th style="text-align: center;">
247
- <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
251
+ <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
248
252
  @click.stop="$parent.$parent.$parent.delectHand(row) && row.states === 1">冲正
249
253
  </button>
250
254
  </th>
251
255
  </template>
252
256
  </data-grid>
253
257
  </criteria-paged>
258
+ <table class="table-hover">
259
+ <tr style="position: relative" class="table-bordered">
260
+ <td
261
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
262
+ 汇总信息
263
+ </td>
264
+ <td
265
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
266
+ 补差气量:&emsp;{{sumsmodel.pregas}}
267
+ </td>
268
+ <td
269
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
270
+ 补差金额:&emsp;{{sumsmodel.f_surplus_fee}}
271
+ </td>
272
+ </tr>
273
+ </table>
254
274
  <modal :show.sync="show">
255
275
  <header slot="modal-header" class="modal-header">
256
276
  <h4 class="modal-title">调 价 补 差</h4>
@@ -305,6 +325,7 @@
305
325
  self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
306
326
  self.$refs.paged.$refs.criteria.model.f_change_date = ''
307
327
  getPrice(self)
328
+ self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
308
329
  self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
309
330
  self.pricechange = false
310
331
 
@@ -338,6 +359,9 @@
338
359
  f_orgid: '',
339
360
  f_filialeid: this.$login.f.orgid,
340
361
  operatorrow:'',
362
+ sumsmodel: [],
363
+ footer: [],
364
+ other:[],
341
365
  operatortype :'one',
342
366
  pricechange: true,
343
367
  criteriaShow: false,
@@ -351,7 +375,40 @@
351
375
  priceTypes: this.$appdata.getParam('气价类型') ? [ ...this.$appdata.getParam('气价类型')] : [],
352
376
  condition: '',
353
377
  locking: false,
354
- model: new PagedList('rs/sql/get_WebUserCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'}),
378
+ model: new PagedList('rs/sql/get_WebUserCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'},{
379
+ pregas: 0,
380
+ f_surplus_fee: 0
381
+ }),
382
+ config: {
383
+ defaultPrint: [],
384
+ excelHeaders: {
385
+ 'f_userinfo_code': '用户编号',
386
+ 'f_meternumber': '表号',
387
+ 'f_user_name': '用户姓名',
388
+ 'f_user_type': '用户类型',
389
+ 'f_meter_type': '气表类型',
390
+ 'f_start_date': '开始抄表时间',
391
+ 'f_end_date': '结束抄表时间',
392
+ 'f_price_name': '气价名称',
393
+ 'f_stair_gas1': '一阶气量',
394
+ 'f_stair_gas2': '二阶气量',
395
+ 'f_stair_gas3': '三阶气量',
396
+ 'f_stair_price1': '一阶单价',
397
+ 'f_stair_price2': '二阶单价',
398
+ 'f_stair_price3': '三阶单价',
399
+ 'f_change_price1': '一阶补差单价',
400
+ 'f_change_price2': '二阶补差单价',
401
+ 'f_change_price3': '三阶补差单价',
402
+ 'f_surplus_fee1': '一阶补差金额',
403
+ 'f_surplus_fee2': '二阶补差金额',
404
+ 'f_surplus_fee3': '三阶补差金额',
405
+ 'f_last_tablebase': '上期底数',
406
+ 'f_tablebase': '本期底数',
407
+ 'pregas': '补差气量',
408
+ 'f_surplus_fee': '补差金额',
409
+ 'f_source': '差价来源'
410
+ }
411
+ },
355
412
  f_new_price: 0.0,
356
413
  f_old_price:0.0,
357
414
  f_change_price:0.0,
@@ -369,6 +426,23 @@
369
426
  })
370
427
  },
371
428
  methods: {
429
+
430
+ getotherfooter () {
431
+ this.other = []
432
+ this.footer = []
433
+ let exportdata = this.getCondition
434
+ let otherInData = []
435
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
436
+ let footerData = [], exportfield = this.getfield
437
+ footerData.push('合计')
438
+ let self = this
439
+
440
+ for (var field in self.sumsmodel) {
441
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
442
+ }
443
+ this.footer.push(footerData)
444
+ this.other.push(otherInData)
445
+ },
372
446
  calculation (row) {
373
447
  this.f_change_price1 = 0,
374
448
  this.f_change_price2 = 0,
@@ -431,7 +505,7 @@
431
505
  row.f_orgname = this.$login.f.orgs
432
506
  row.f_depid = this.$login.f.depids
433
507
  row.f_depname = this.$login.f.deps
434
- this.$resetpost('rs/logic/newpriceAdjustmentOffset', {data: row}).then(() => {
508
+ this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
435
509
  // this.$dispatch('refresh', '正在处理', row)
436
510
  this.selfSearch(this.model)
437
511
  })
@@ -580,6 +654,16 @@
580
654
  }
581
655
  },
582
656
  computed: {
657
+ getCondition () {
658
+ return {
659
+ startDate:this.$refs.paged.$refs.criteria.model.startDate,
660
+ endDate: this.$refs.paged.$refs.criteria.model.endDate,
661
+ condition: this.condition
662
+ }
663
+ },
664
+ getfield () {
665
+ return this.config.excelHeaders
666
+ }
583
667
  },
584
668
  watch: {
585
669
  async 'f_filialeid' (val) {
@@ -591,10 +675,17 @@
591
675
  if (this.f_filialeid) {
592
676
  getPrice(this)
593
677
  }
678
+ },
679
+ sumsmodel: {
680
+ handler: function (val) {
681
+ this.getotherfooter()
682
+ },
683
+ deep: true
594
684
  }
595
685
  }
596
686
  }
597
687
  </script>
598
688
 
599
- <style >
689
+ <style scoped lang="css" >
690
+
600
691
  </style>
package/src/filiale/rongchuang/FilesManage/FileUserFiles.vue CHANGED
@@ -40,9 +40,18 @@
40
40
  <div
41
41
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
42
42
  class="form-group">
43
- <label class="font_normal_body">安装合同编号</label>
43
+ <label class="font_normal_body">合同编号</label>
44
44
  <input class="input_search" condition="f_contract_id = '{}'"
45
45
  v-model="model.f_contract_id"
46
+ placeholder='合同编号'
47
+ style="width:60%" type="text" >
48
+ </div>
49
+ <div
50
+ :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
51
+ class="form-group">
52
+ <label class="font_normal_body">安装合同编号</label>
53
+ <input class="input_search" condition="f_install_contract_code = '{}'"
54
+ v-model="model.f_install_contract_code"
46
55
  placeholder='安装合同编号'
47
56
  style="width:60%" type="text" >
48
57
  </div>
@@ -350,6 +359,9 @@
350
359
  <th>
351
360
  <nobr>客户名称</nobr>
352
361
  </th>
362
+ <th>
363
+ <nobr>合同编号</nobr>
364
+ </th>
353
365
  <th>
354
366
  <nobr>安装合同编号</nobr>
355
367
  </th>
@@ -417,6 +429,7 @@
417
429
  <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_user_name}}</b></a></span>
418
430
  </td>
419
431
  <td style="text-align: center;">{{row.f_contract_id}}</td>
432
+ <td style="text-align: center;">{{row.f_install_contract_code}}</td>
420
433
  <td style="text-align: center;">{{row.f_gas_supply_contract_code}}</td>
421
434
  <td style="text-align: center;">{{row.f_meternumber}}</td>
422
435
  <td style="text-align: center;">{{row.f_card_id}}</td>