manage-client 3.2.19 → 3.2.23

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 (77) hide show
  1. package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
  2. package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
  3. package/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
  4. package/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
  5. package/.gradle/7.1/dependencies-accessors/gc.properties +0 -0
  6. package/.gradle/{4.4/taskHistory/taskHistory.bin → 7.1/executionHistory/executionHistory.bin} +0 -0
  7. package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
  8. package/.gradle/7.1/fileChanges/last-build.bin +0 -0
  9. package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
  10. package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
  11. package/.gradle/7.1/gc.properties +0 -0
  12. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  13. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  14. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  15. package/build/dev-server.js +7 -7
  16. package/build/libs/ManageClient-3.1.0-17.jar +0 -0
  17. package/package.json +1 -1
  18. package/src/App.vue +28 -28
  19. package/src/components/SellReport/AmountGas.vue +257 -257
  20. package/src/components/SellReport/BusinessClassify.vue +268 -317
  21. package/src/components/SellReport/BusinessMoneyReport.vue +268 -268
  22. package/src/components/SellReport/BusinessReport.vue +256 -256
  23. package/src/components/SellReport/ChSellReport.vue +251 -251
  24. package/src/components/SellReport/ChargeBill.vue +244 -244
  25. package/src/components/SellReport/ChargeDayTable.vue +258 -258
  26. package/src/components/SellReport/ChargeMonthTable.vue +257 -257
  27. package/src/components/SellReport/ChargeYearTable.vue +252 -252
  28. package/src/components/SellReport/DepartmentPrick.vue +243 -288
  29. package/src/components/SellReport/DeptHomePage.vue +299 -299
  30. package/src/components/SellReport/FinanceSellType.vue +254 -254
  31. package/src/components/SellReport/GasMeterBrand.vue +228 -228
  32. package/src/components/SellReport/GasMoneyPublicReport.vue +263 -0
  33. package/src/components/SellReport/GasMoneyReport.vue +252 -254
  34. package/src/components/SellReport/GasPriceGroup.vue +228 -228
  35. package/src/components/SellReport/GasSummary.vue +257 -257
  36. package/src/components/SellReport/Gasc.vue +257 -257
  37. package/src/components/SellReport/GetUserNum.vue +240 -240
  38. package/src/components/SellReport/HandplanBili.vue +241 -241
  39. package/src/components/SellReport/HandplanUserCount.vue +227 -227
  40. package/src/components/SellReport/ManageGasSumChange.vue +265 -265
  41. package/src/components/SellReport/ManageGasSumChangeTwo.vue +271 -271
  42. package/src/components/SellReport/ManageGasSumOtherCharge.vue +244 -244
  43. package/src/components/SellReport/MarketMonth.vue +251 -297
  44. package/src/components/SellReport/MeterPrice.vue +244 -244
  45. package/src/components/SellReport/MeterReader.vue +231 -231
  46. package/src/components/SellReport/OperatorCheckoutTwo.vue +263 -263
  47. package/src/components/SellReport/OperatorSellReport.vue +268 -268
  48. package/src/components/SellReport/OtherChargePublicReport.vue +262 -0
  49. package/src/components/SellReport/PaymentDistribute.vue +228 -228
  50. package/src/components/SellReport/PaymentMethod.vue +274 -274
  51. package/src/components/SellReport/QTXManageBusSummary.vue +236 -236
  52. package/src/components/SellReport/QibiaoShouqi.vue +58 -98
  53. package/src/components/SellReport/SellDepReport.vue +264 -266
  54. package/src/components/SellReport/UserClassify.vue +222 -271
  55. package/src/components/SellReport/UserGasFillCard.vue +441 -441
  56. package/src/components/SellReport/UserSellingGas.vue +59 -8
  57. package/src/components/SellReport/WeiNanYuShou.vue +246 -246
  58. package/src/components/SellReport/YuShouTable.vue +298 -298
  59. package/src/components/SellReport/chargeSchedule.vue +410 -410
  60. package/src/components/SellReport/pengan/ManageBusPeng.vue +280 -280
  61. package/src/components/SellReport/userholds.vue +257 -257
  62. package/src/components/sale/report/aode/DayReportList.vue +371 -371
  63. package/src/components/webmeter/instruction/NewQueryInstruct.vue +443 -443
  64. package/src/components/webmeter/newwebmeter/PriceInstructDetail.vue +374 -0
  65. package/src/components/webmeter/newwebmeter/PriceInstructList.vue +332 -0
  66. package/src/components/webmeter/newwebmeter/PriceInstructManage.vue +44 -0
  67. package/src/components/webmeter/report/ReportList.vue +434 -422
  68. package/src/filiale/WEINAN/BankManager.vue +139 -0
  69. package/src/filiale/WEINAN/ReportDataQuery.vue +77 -1
  70. package/src/filiale/WEINAN/config/exportConfig.js +833 -817
  71. package/src/filiale/WEINAN/reportManage.js +13 -12
  72. package/src/filiale/shaoguan/RecordInfoQuery.vue +1108 -1108
  73. package/src/main.js +66 -66
  74. package/src/reportManage.js +498 -490
  75. package/src/webmeterManage.js +6 -0
  76. package/.gradle/4.4/fileContent/fileContent.lock +0 -0
  77. package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
@@ -0,0 +1,139 @@
1
+ <template lang="html">
2
+ <div id="charts">
3
+ <div id="bm" :style="{width:'100%',height:'100%'}"></div>
4
+ </div>
5
+ </template>
6
+
7
+ <script>
8
+ import * as Util from '../../Util'
9
+ import co from 'co'
10
+ import echarts from 'echarts'
11
+ import {HttpResetClass} from 'vue-client'
12
+
13
+ let getData = function * (self) {
14
+ let load = new HttpResetClass()
15
+ load.load('POST', 'rs/sql/qibiao-shouqi',
16
+ {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: `f_orgid = ${self.orgid}`, condition: '1 = 1'}},
17
+ {resolveMsg: null, rejectMsg: null})
18
+ .then((res) => {
19
+ let data = res.data
20
+
21
+ console.log(data)
22
+
23
+ let biaoType = Array.from(new Set(data.map(x => x.biaopinpai)))
24
+ let totalGas = data.map(x => x.yongqi)
25
+ // for(let i = 0; i <= data.length; i++){
26
+ // if(data[i].biaopinpai == biaoType){
27
+ // totalGas.push(data[i].yongqi)
28
+ // }
29
+ // }
30
+ // let totalGas = data.map(x => x.yongqi)
31
+
32
+ console.log('表品牌', biaoType)
33
+ console.log('用气量', totalGas)
34
+
35
+ self.set(biaoType, totalGas)
36
+ })
37
+ }
38
+ export default {
39
+ props: {
40
+ startdate: {
41
+ type: String,
42
+ default: Util.toStandardDateString()
43
+ },
44
+ enddate: {
45
+ type: String,
46
+ default: Util.toStandardDateString()
47
+ },
48
+ orgid: {
49
+ type: String
50
+ }
51
+ },
52
+ data () {
53
+ title: '气量售气表'
54
+ return {
55
+ texttile: '',
56
+ xc: '',
57
+
58
+ minyongvalue: [],
59
+ feiminyongvalue: []
60
+ }
61
+ },
62
+ methods: {
63
+ set (biaoType, totalGas) {
64
+ this.xc = echarts.init(document.getElementById('bm'))
65
+ this.xc.setOption({
66
+ title: {
67
+ text: '气量售气表',
68
+ subtext: '数据查询来源',
69
+ x: 'left'
70
+ },
71
+ tooltip: {
72
+ trigger: 'axis'
73
+ },
74
+ legend: {
75
+ x: 'left',
76
+ y: 'bottom',
77
+ data: biaoType
78
+ },
79
+ toolbox: {
80
+ show: true,
81
+ feature: {
82
+ dataView: {show: true, readOnly: false},
83
+ magicType: {show: true, type: ['line', 'bar']},
84
+ restore: {show: true},
85
+ saveAsImage: {show: true}
86
+ }
87
+ },
88
+ calculable: true,
89
+ xAxis: [
90
+ {
91
+ type: 'category',
92
+ data: biaoType
93
+ }
94
+ ],
95
+ axisLabel: {
96
+ interval: 0,
97
+ rotate: 40
98
+ },
99
+ yAxis: [
100
+ {
101
+ type: 'value'
102
+ }
103
+ ],
104
+ series: [
105
+ {
106
+ name: '用气量',
107
+ type: 'bar',
108
+ data: totalGas,
109
+ markLine: {
110
+ data: [
111
+ {type: 'average', name: '平均值'}
112
+ ]
113
+ }
114
+ }
115
+ ]
116
+ })
117
+ },
118
+ searchdata () {
119
+ let getGen = getData(this)
120
+ co(getGen)
121
+ }
122
+ },
123
+ ready () {
124
+ this.searchdata()
125
+ },
126
+ watch: {
127
+ 'startdate' (val) {
128
+ this.searchdata()
129
+ },
130
+ 'enddate' (val) {
131
+ this.searchdata()
132
+ },
133
+ 'orgid' (val) {
134
+ this.searchdata()
135
+ }
136
+ }
137
+
138
+ }
139
+ </script>
@@ -33,6 +33,16 @@
33
33
  <div class="span" style="float:right;">
34
34
  <button class="button_search button_spacing" @click="search()">查询</button>
35
35
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
36
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
37
+ :field="$parent.$parent.getfield" :header="$parent.$parent.other"
38
+ sqlurl="rs/logic/exportfile" sql-name="manage_getReportDataQuery" template-name='上报数据导出'
39
+ :choose-col="true">
40
+ </export-excel>
41
+
42
+ <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
43
+ :defaultfield="$parent.$parent.defaultfield"
44
+ titletable="上报数据打印"
45
+ ></print-data>
36
46
  <div style="float: right" class="button_spacing"
37
47
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
38
48
  @click="$parent.$parent.hidden()"></div>
@@ -111,6 +121,20 @@
111
121
  <template partial='foot'></template>
112
122
  </data-grid>
113
123
  </criteria-paged>
124
+ <table class="table-hover">
125
+ <tr style="position: relative" class="table-bordered">
126
+ <td
127
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
128
+ 汇总信息
129
+ </td>
130
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
131
+ 用气量合计:&emsp;{{sumsmodel.f_oughtamount.toFixed(0)}}
132
+ </td>
133
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
134
+ 用气金额合计:&emsp;{{sumsmodel.f_oughtfee.toFixed(0)}}
135
+ </td>
136
+ </tr>
137
+ </table>
114
138
  </div>
115
139
  </div>
116
140
  </div>
@@ -121,8 +145,10 @@
121
145
  import tableConfig from './config/tableConfig'
122
146
  import plugins from '../../plugins/GetLoginInfoService'
123
147
  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
148
+ import exportConfig from './config/exportConfig'
124
149
 
125
150
  let readySomething = async function (self) {
151
+ self.defaultfield = [...self.defaultfield, ...self.defaultConfig.defaultPrint]
126
152
  await self.$MagLoadParams.loadParam()
127
153
  self.initParams()
128
154
  // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -131,8 +157,16 @@
131
157
  title: '上报数据查询',
132
158
  data() {
133
159
  return {
134
- model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
160
+ model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {},{
161
+ f_oughtamount: 0,
162
+ f_oughtfee: 0
163
+ }),
135
164
  criteriaShow: false,
165
+ defaultConfig: {
166
+ defaultPrint: []
167
+ },
168
+ other:[],
169
+ footer:[],
136
170
  config: {
137
171
  fieldMapping: {
138
172
  f_userinfo_code: '客户编号',
@@ -146,8 +180,11 @@
146
180
  {label: '全部', value: ''}
147
181
  ],
148
182
  styles:false,
183
+ sumsmodel: {},
149
184
  headData: [],
150
185
  bodyData: [],
186
+ //默认打印列
187
+ defaultfield: [],
151
188
  orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
152
189
  resshow:['company'],
153
190
  org:[this.$login.f.orgid],
@@ -189,6 +226,23 @@
189
226
  //初始化气表价格
190
227
  this.prices = this.$MagGetSaleParam.getPrices();
191
228
  },
229
+ getotherfooter () {
230
+ // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
231
+ // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
232
+ this.other = [];
233
+ this.footer = [];
234
+ let exportdata = this.getCondition;
235
+ let otherInData = [];
236
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
237
+ let footerData = [], exportfield = this.getfield;
238
+ footerData.push("合计");
239
+ let self = this;
240
+ for (var field in self.sumsmodel) {
241
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
242
+ }
243
+ this.footer.push(footerData);
244
+ this.other.push(otherInData);
245
+ },
192
246
  showMeterStyle() {
193
247
  this.styles = true
194
248
  },
@@ -198,6 +252,7 @@
198
252
  async selfSearch(args) {
199
253
  args.condition = `${args.condition}` + this.orgCondtionStr
200
254
  await this.model.search(args.condition, args.model)
255
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
201
256
  // 查询到数据进行处理
202
257
  // if (this.model.rows.length > 0) {
203
258
  // this.bodyData = Object.keys(this.model.rows[0])
@@ -239,11 +294,32 @@
239
294
  // }
240
295
  },
241
296
  watch: {
297
+ 'model.rows'(val) {
298
+ if(val.length === 0){
299
+ this.sumsmodel = {}
300
+ }
301
+ },
302
+ sumsmodel:{
303
+ handler: function(val) {
304
+ this.getotherfooter();
305
+ },
306
+ deep: true
307
+ }
242
308
  },
243
309
  computed: {
244
310
  metertypes() {
245
311
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
246
312
  },
313
+ getCondition() {
314
+ return {
315
+ startDate: this.$refs.paged.$refs.cri.model.startDate,
316
+ endDate: this.$refs.paged.$refs.cri.model.endDate,
317
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
318
+ }
319
+ },
320
+ getfield() {
321
+ return exportConfig.ReportDataConfig
322
+ },
247
323
  }
248
324
  }
249
325
  </script>