manage-client 3.2.102 → 3.2.103-test

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 (35) hide show
  1. package/build/dev-server.js +176 -177
  2. package/build/webpack.base.conf.js +83 -82
  3. package/package.json +2 -2
  4. package/src/components/ManageHomeCS/Home/ShanxiMap.vue +432 -432
  5. package/src/components/daping/DataManagement.vue +536 -537
  6. package/src/components/sale/businessquery/BusinessManage.vue +191 -179
  7. package/src/components/sale/businessquery/FillCardQuery.vue +39 -2
  8. package/src/components/sale/config/exportConfig.js +1008 -988
  9. package/src/components/sale/config/tableConfig.js +48 -48
  10. package/src/components/valueaddinfo/ValueAddinfoQuery.vue +408 -0
  11. package/src/components/valueaddinfo/renewalvalueAddUserQuery.vue +371 -0
  12. package/src/components/valueaddinfo/valueAddCountQuery.vue +315 -0
  13. package/src/components/valueaddinfo/valueAddUserQuery.vue +392 -0
  14. package/src/components/webmeter/DrillData/UserGasAll.vue +1 -1
  15. package/src/components/webmeter/WebmeterQuery.vue +3 -0
  16. package/src/components/webmeter/gasAnalysis/WebmeterSettlementAnalysis.vue +432 -0
  17. package/src/components/webmeter/handplan/NewWebMeterHandPlan.vue +8 -1
  18. package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue +566 -506
  19. package/src/components/webmeter/report/ReportList.vue +4 -4
  20. package/src/components/webmeter/reportdata/ReportDataQuery.vue +279 -279
  21. package/src/filiale/qianneng/BusinessManage.vue +179 -0
  22. package/src/filiale/qianneng/ChargeQuery.vue +191 -184
  23. package/src/filiale/qianneng/HandplanQuery.vue +130 -117
  24. package/src/filiale/qianneng/OtherChargeQuery.vue +33 -31
  25. package/src/filiale/qianneng/SellDepReport.vue +27 -7
  26. package/src/filiale/qianneng/UserQuery.vue +938 -0
  27. package/src/filiale/qianneng/sale.js +5 -1
  28. package/src/filiale/shaoguan/TransferQuery.vue +8 -3
  29. package/src/newmanage.js +535 -525
  30. package/src/saleManage.js +572 -558
  31. package/src/webmeterManage.js +2 -0
  32. package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
  33. package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
  34. package/.gradle/buildOutputCleanup/built.bin +0 -0
  35. package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
package/src/filiale/qianneng/sale.js CHANGED
@@ -5,7 +5,11 @@ let specialComp = {
5
5
  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
6
6
  'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
7
7
  // 表具查询
8
- 'meter-query': (resolve) => { require(['./MeterQuery'], resolve) }
8
+ 'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
9
+ // 用户查询
10
+ 'user-query': (resolve) => { require(['./UserQuery'], resolve) },
11
+ 'business-manage': (resolve) => { require(['./BusinessManage'], resolve) }
12
+
9
13
  }
10
14
  exports.specialComp = specialComp
11
15
 
package/src/filiale/shaoguan/TransferQuery.vue CHANGED
@@ -231,7 +231,7 @@
231
231
  footer:[],
232
232
  show:false,
233
233
  rowdata:{},
234
- model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0}),
234
+ model: new PagedList('rs/sql/transferQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{f_transfer_fees: 0}),
235
235
  criteriaShow: false,
236
236
  initres: {
237
237
  org:[this.$login.f.orgid],
@@ -249,7 +249,10 @@
249
249
  tfoot: '',
250
250
  showupload:false,
251
251
  selected:{},
252
-
252
+ orderitem:'f_operate_date desc',
253
+ orderFields: {
254
+ f_operate_date: 'no'
255
+ },
253
256
  transferstate: this.$appdata.getParam('过户状态') ? [{
254
257
  label: '全部',
255
258
  value: ''
@@ -393,7 +396,9 @@
393
396
  },
394
397
  computed: {
395
398
  getCondition() {
396
- return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
399
+ return {
400
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
401
+ orderitem: this.orderitem?`${this.orderitem}`: `'f_operate_date desc'` }
397
402
  },
398
403
  getfield() {
399
404
  return exportConfig.transferConfig