manage-client 3.2.78 → 3.2.79-jb

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 (33) hide show
  1. package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
  2. package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
  3. package/build/dev-server.js +176 -176
  4. package/package.json +107 -101
  5. package/src/components/SellReport/OperatorCheckoutTwo.vue +210 -210
  6. package/src/components/sale/businessquery/ChargeQuery.vue +1276 -1277
  7. package/src/components/sale/config/exportConfig.js +925 -925
  8. package/src/components/sale/filesquery/RecordInfoQuery.vue +5 -4
  9. package/src/components/webmeter/gasStatistics/GasStatistics.vue +3 -8
  10. package/src/components/webmeter/instruction/NewQueryInstruct.vue +446 -446
  11. package/src/filiale/jinbin/exportConfig.js +1110 -0
  12. package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +1372 -0
  13. package/src/filiale/jinbin/sale.js +7 -0
  14. package/src/filiale/macheng/RecordInfoQuery.vue +1023 -1023
  15. package/src/filiale/macheng/config/exportConfig.js +67 -67
  16. package/src/filiale/macheng/sale.js +11 -11
  17. package/src/main.js +66 -66
  18. package/.gradle/4.4/fileContent/fileContent.lock +0 -0
  19. package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
  20. package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
  21. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  22. package/build/libs/ManageClient-3.1.0-17.jar +0 -0
  23. package/build/tmp/jar/MANIFEST.MF +0 -2
  24. package/src/filiale/macheng/FxGasTable.vue +0 -236
  25. package/src/filiale/macheng/ManageBusSummary.vue +0 -224
  26. package/src/filiale/macheng/ManageDayGas.vue +0 -248
  27. package/src/filiale/macheng/ManageHandSellMoney.vue +0 -249
  28. package/src/filiale/macheng/ManageMonthGas.vue +0 -250
  29. package/src/filiale/macheng/ManageOtherCharge.vue +0 -251
  30. package/src/filiale/macheng/ManageSellType.vue +0 -287
  31. package/src/filiale/macheng/SellingTable.vue +0 -219
  32. package/src/filiale/macheng/UserBalanceReport.vue +0 -178
  33. package/src/filiale/macheng/reportManage.js +0 -19
package/src/components/sale/filesquery/RecordInfoQuery.vue CHANGED
@@ -484,6 +484,8 @@
484
484
  <!-- <th><nobr>旧客户编号</nobr></th> -->
485
485
  <th><nobr>客户类型</nobr></th>
486
486
  <th><nobr>用气性质</nobr></th>
487
+ <th><nobr>用气设备</nobr></th>
488
+
487
489
  <th><nobr>开户时间</nobr></th>
488
490
  <th><nobr>证件类型</nobr></th>
489
491
  <th><nobr>证件号码</nobr></th>
@@ -555,9 +557,7 @@
555
557
  <th>
556
558
  <nobr>换表时间</nobr>
557
559
  </th>
558
- <th>
559
- <nobr>灶具信息</nobr>
560
- </th>
560
+
561
561
  <th>
562
562
  <nobr>备注</nobr>
563
563
  </th>
@@ -604,6 +604,7 @@
604
604
  <!-- <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>-->
605
605
  <td style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></td>
606
606
  <td style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></td>
607
+ <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
607
608
 
608
609
  <td style="text-align: center;"><nobr>{{row.f_open_date}}</nobr></td>
609
610
  <td style="text-align: center;"><nobr>{{row.f_credentials}}</nobr></td>
@@ -669,7 +670,7 @@
669
670
  </td>
670
671
  <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
671
672
  <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
672
- <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
673
+
673
674
  <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
674
675
  </template>
675
676
  <template partial='foot'>
package/src/components/webmeter/gasStatistics/GasStatistics.vue CHANGED
@@ -444,15 +444,10 @@
444
444
  ]
445
445
  },
446
446
  getCondition () {
447
- var con = ""
448
- if (this.orgCondtionStr) {
449
- con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in (${this.orgCondtionStr})`
450
- }
451
- else {
452
- con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
453
- }
454
447
  return {
455
- condition: con
448
+ startDate: this.$refs.paged.$refs.criteria.model.startDate,
449
+ endDate: this.$refs.paged.$refs.criteria.model.endDate,
450
+ condition: this.condition
456
451
  }
457
452
  }
458
453
  }