manage-client 3.2.90 → 3.2.91-1

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 (42) hide show
  1. package/.gradle/4.4/fileContent/fileContent.lock +0 -0
  2. package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
  3. package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
  4. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  5. package/build/dev-server.js +1 -1
  6. package/build/libs/ManageClient-3.1.0-17.jar +0 -0
  7. package/build/tmp/jar/MANIFEST.MF +2 -0
  8. package/package.json +1 -1
  9. package/src/components/SellReport/NonResidentGas.vue +216 -216
  10. package/src/components/SellReport/ReportComponrnt/TieAnAccount.vue +507 -507
  11. package/src/components/SellReport/ReportItems.vue +246 -246
  12. package/src/components/sale/businessquery/ArrearsQuery.vue +934 -934
  13. package/src/components/sale/businessquery/ChangeMeterQuery.vue +15 -9
  14. package/src/components/sale/businessquery/ChargeQuery.vue +6 -0
  15. package/src/components/sale/businessquery/InspectListGas.vue +552 -552
  16. package/src/components/sale/businessquery/InspectListUser.vue +449 -449
  17. package/src/components/sale/businessquery/sellingChargePrice.vue +126 -76
  18. package/src/components/sale/config/exportConfig.js +2 -2
  19. package/src/components/webmeter/gasStatistics/GasStatistics.vue +465 -465
  20. package/src/components/webmeter/instruction/NewQueryInstruct.vue +446 -446
  21. package/src/filiale/liaoyuan/MeterQuery.vue +905 -905
  22. package/src/filiale/liaoyuan/RecordInfoQuery.vue +1163 -1163
  23. package/src/filiale/liaoyuan/ReportList.vue +421 -421
  24. package/src/filiale/macheng/FxGasTable.vue +236 -236
  25. package/src/filiale/macheng/ManageDayGas.vue +248 -248
  26. package/src/filiale/macheng/ManageHandSellMoney.vue +249 -249
  27. package/src/filiale/macheng/ManageMonthGas.vue +250 -250
  28. package/src/filiale/macheng/ManageOtherCharge.vue +251 -251
  29. package/src/filiale/macheng/ManageSellType.vue +287 -287
  30. package/src/filiale/macheng/RecordInfoQuery.vue +1023 -1023
  31. package/src/filiale/macheng/SellingTable.vue +219 -219
  32. package/src/filiale/macheng/UserBalanceReport.vue +178 -178
  33. package/src/filiale/macheng/config/exportConfig.js +67 -67
  34. package/src/filiale/macheng/reportManage.js +19 -19
  35. package/src/filiale/macheng/sale.js +11 -11
  36. package/src/filiale/meihekou/HandplanQuery.vue +1234 -1234
  37. package/src/filiale/meihekou/UserQuery.vue +773 -773
  38. package/src/filiale/qianneng/OtherChargeQuery.vue +646 -646
  39. package/src/filiale/qianneng/SellDepReport.vue +295 -269
  40. package/src/filiale/qianneng/reportManage.js +10 -10
  41. package/src/filiale/qianneng/sale.js +12 -12
  42. package/src/main.js +65 -66
package/src/components/sale/businessquery/ChangeMeterQuery.vue CHANGED
@@ -13,7 +13,7 @@
13
13
  :value.sync="model.startDate"
14
14
  :format="'yyyy-MM-dd HH:mm:ss'"
15
15
  :show-reset-button="true"
16
- condition="f_operate_date >= '{}'">
16
+ condition="f_install_date >= '{}'">
17
17
  </datepicker>
18
18
  </div>
19
19
  <div class="col-sm-2 form-group">
@@ -23,7 +23,7 @@
23
23
  :value.sync="model.endDate"
24
24
  :format="'yyyy-MM-dd HH:mm:ss'"
25
25
  :show-reset-button="true"
26
- condition="f_operate_date <= '{}'">
26
+ condition="f_install_date <= '{}'">
27
27
  </datepicker>
28
28
  </div>
29
29
  <div class="col-sm-2 form-group ">
@@ -240,8 +240,11 @@
240
240
  </th>
241
241
  <th>
242
242
  <!-- <nobr>换表日期</nobr>-->
243
- <data-order field="f_operate_date" name="换表日期"
244
- :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
243
+ <data-order field="f_install_date" name="换表日期"
244
+ :order.sync="$parent.$parent.$parent.orderFields.f_install_date"></data-order>
245
+ </th>
246
+ <th>
247
+ <nobr>操作日期</nobr>
245
248
  </th>
246
249
  <th>
247
250
  <nobr>人员</nobr>
@@ -314,6 +317,9 @@
314
317
  <td style="text-align: center;">
315
318
  <nobr>{{row.f_state}}</nobr>
316
319
  </td>
320
+ <td style="text-align: center;">
321
+ <nobr>{{row.f_install_date}}</nobr>
322
+ </td>
317
323
  <td style="text-align: center;">
318
324
  <nobr>{{row.f_operate_date}}</nobr>
319
325
  </td>
@@ -430,7 +436,7 @@
430
436
  footer:[],
431
437
  meterbrands: [],
432
438
  pricenames: [],
433
- model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
439
+ model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_install_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
434
440
  criteriaShow: false,
435
441
  orgCondtionStr: '',
436
442
  modelval: [],
@@ -443,12 +449,12 @@
443
449
  user:[],
444
450
  },
445
451
  config: {
446
- defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
452
+ defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state','f_install_date', 'f_operate_date']
447
453
  },
448
454
  //排序
449
- orderitem:'f_operate_date desc',
455
+ orderitem:'f_install_date desc',
450
456
  orderFields: {
451
- f_operate_date: 'no'
457
+ f_install_date: 'no'
452
458
  },
453
459
  show:false,
454
460
  rowdata:{},
@@ -643,7 +649,7 @@
643
649
  getCondition() {
644
650
  return {
645
651
  condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
646
- orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
652
+ orderitem: this.orderitem?`${this.orderitem}`: " f_install_date desc"}
647
653
  },
648
654
  getfield() {
649
655
  return exportConfig.changemeterConfig
package/src/components/sale/businessquery/ChargeQuery.vue CHANGED
@@ -335,6 +335,9 @@
335
335
  <nobr>片区</nobr>
336
336
  </th>
337
337
  <th>
338
+ <nobr>小区</nobr>
339
+ </th>
340
+ <th>
338
341
  <!-- <nobr>客户地址</nobr>-->
339
342
  <data-order field="f_address" name="客户地址"
340
343
  :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -527,6 +530,9 @@
527
530
  <td style="text-align: center;">
528
531
  <nobr>{{row.f_zones}}</nobr>
529
532
  </td>
533
+ <td style="text-align: center;"><nobr>
534
+ <nobr>{{row.f_residential_area}}</nobr>
535
+ </nobr> </td>
530
536
  <td style="text-align: center;">
531
537
  <nobr>{{row.f_address}}</nobr>
532
538
  </td>