sale-client 4.0.5-preview → 4.0.6-preview

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.
@@ -0,0 +1,2 @@
1
+ #Thu Aug 22 10:59:01 CST 2024
2
+ gradle.version=5.2.1
@@ -19,9 +19,9 @@ var devConfig = {
19
19
  children: false // 不输出子模块构建信息
20
20
  },
21
21
  proxy: {
22
- '/api/af-revenue': {
22
+ '/api/af-revenue/logic': {
23
23
  pathRewrite: {
24
- '/api/af-revenue': '/'
24
+ '/api/af-revenue/logic': '/logic'
25
25
  },
26
26
  target: 'http://localhost:9026/'
27
27
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.0.5-preview",
3
+ "version": "4.0.6-preview",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -104,7 +104,7 @@
104
104
  import {HttpResetClass} from 'vue-client'
105
105
  // 导入IC卡相关查询界面
106
106
  import ChangeMeterQueryUser from './ic_detail/ChangeMeterQueryUser'
107
- import ChargeQueryUser from './ic_detail/ChargeQueryUser'
107
+ // import ChargeQueryUser from './ic_detail/ChargeQueryUser'
108
108
  import ChargeRecordQueryUser from './ic_detail/ChargeRecordQuery'
109
109
  import FillCardQueryUser from './ic_detail/FillCardQueryUser'
110
110
  import HandQueryUser from './ic_detail/HandQueryUser'
@@ -145,7 +145,6 @@ export default {
145
145
  WebHandQueryUser,
146
146
  Repurchase,
147
147
  ChangeMeterQueryUser,
148
- ChargeQueryUser,
149
148
  ChargeRecordQueryUser,
150
149
  FillCardQueryUser,
151
150
  HandQueryUser,
@@ -0,0 +1,537 @@
1
+ <template>
2
+ <div class="flex" style="justify-content: space-between;">
3
+ <div @keyup.enter="search" style="">
4
+ <criteria-paged :model="model" v-ref:paged>
5
+ <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
6
+ <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
7
+ <div class="row" width="100%">
8
+ <div class="col-sm-2 form-group">
9
+ <label class="font_normal_body">开始时间</label>
10
+ <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
11
+ class="datepicker"
12
+ condition="f_operate_date >= '{} 00:00:00' "
13
+ placeholder="起始时间"
14
+ style="width:60%"
15
+ v-model="model.f_start_date"
16
+ ></datepicker>
17
+ </div>
18
+ <div class="col-sm-2 form-group">
19
+ <label class="font_normal_body">结束时间</label>
20
+ <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
21
+ class="datepicker"
22
+ condition="f_operate_date <= '{} 23:59:59' "
23
+ placeholder="结束时间"
24
+ style="width:60%"
25
+ v-model="model.f_end_date"
26
+ ></datepicker>
27
+ </div>
28
+ <div class="col-sm-2 form-group">
29
+ <label class="font_normal_body">缴费状态</label>
30
+ <v-select :value.sync="model.f_state" v-model='model.f_state'
31
+ style="width:60%"
32
+ :options='$parent.$parent.jiaofeistates' placeholder='缴费状态'
33
+ close-on-select
34
+ condition="s.f_state = '{}'"></v-select>
35
+ </div>
36
+ <div class="col-sm-2 form-group">
37
+ <label class="font_normal_body">收费类型</label>
38
+ <v-select :value.sync="model.f_type" v-model='model.f_type'
39
+ style="width:60%"
40
+ :options='$parent.$parent.types' placeholder='收费类型'
41
+ close-on-select
42
+ condition="f_type = '{}'"></v-select>
43
+ </div>
44
+
45
+ <div style="float: right">
46
+ <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
47
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
48
+ :field="$parent.$parent.getExportFields" :header="$parent.$parent.other"
49
+ sqlurl="api/af-revenue/logic/saleExport"
50
+ :sql-name="$parent.$parent.isIot ? 'sale_WebChargeQuery' : 'sale_ChargeQuery'"
51
+ template-name='用户收费查询导出'
52
+ :choose-col="true">
53
+ </export-excel>
54
+ <print-data :defaultfield="$parent.$parent.defaultfield"
55
+ :field="$parent.$parent.isIot?$parent.$parent.iotFields:$parent.$parent.fields"
56
+ :is-selected="true" :model="$parent.$parent.printModel"
57
+ @print-data="$parent.$parent.print()" print-name="购气流水"></print-data>
58
+ </div>
59
+ </div>
60
+ </div>
61
+
62
+
63
+ </criteria>
64
+ <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
65
+ <template partial='head'>
66
+ <tr>
67
+ <th>
68
+ <nobr>收费类型</nobr>
69
+ </th>
70
+ <th v-if="!$parent.$parent.$parent.isIot">
71
+ <nobr>收费区间</nobr>
72
+ </th>
73
+
74
+ <th>
75
+ <nobr>表号</nobr>
76
+ </th>
77
+ <th v-if="!$parent.$parent.$parent.isIot">
78
+ <nobr>上期指数</nobr>
79
+ </th>
80
+ <th v-if="!$parent.$parent.$parent.isIot">
81
+ <nobr>本期指数</nobr>
82
+ </th>
83
+ <th>
84
+ <nobr>气价</nobr>
85
+ </th>
86
+ <th>
87
+ <nobr>气量</nobr>
88
+ </th>
89
+ <th>
90
+ <nobr>气费金额</nobr>
91
+ </th>
92
+ <th>
93
+ <nobr>手续费</nobr>
94
+ </th>
95
+ <th>
96
+ <nobr>违约金</nobr>
97
+ </th>
98
+ <th>
99
+ <nobr>减免金额</nobr>
100
+ </th>
101
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">
102
+ <nobr>上期结余</nobr>
103
+ </th>
104
+ <th v-if="!$parent.$parent.$parent.isIot">
105
+ <nobr>应交金额</nobr>
106
+ </th>
107
+ <th>
108
+ <nobr>实收金额</nobr>
109
+ </th>
110
+ <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">
111
+ <nobr>本期结余</nobr>
112
+ </th>
113
+ <th>
114
+ <nobr>付款方式</nobr>
115
+ </th>
116
+ <th>
117
+ <nobr>操作员</nobr>
118
+ </th>
119
+ <th>
120
+ <nobr>缴费日期</nobr>
121
+ </th>
122
+ <th>
123
+ <nobr>缴费时间</nobr>
124
+ </th>
125
+ <th>
126
+ <nobr>缴费状态</nobr>
127
+ </th>
128
+ <th>
129
+ <nobr>网点</nobr>
130
+ </th>
131
+ <th>
132
+ <nobr>备注</nobr>
133
+ </th>
134
+ <th>
135
+ <nobr>操作</nobr>
136
+ </th>
137
+ </tr>
138
+ </template>
139
+ <template partial='body' partial='list' v-ref:grid>
140
+ <tr>
141
+ <td style="text-align:center">{{ row.type }}</td>
142
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_hand_date }}</td>
143
+
144
+ <td style="text-align:center">{{ row.f_meternumber }}</td>
145
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_last_tablebase }}</td>
146
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_tablebase }}</td>
147
+ <td style="text-align:center">{{ row.f_price }}</td>
148
+ <td style="text-align:center">{{ row.f_pregas }}</td>
149
+ <td style="text-align:center">{{ row.f_preamount }}</td>
150
+ <td style="text-align:center">{{ row.f_commission }}</td>
151
+ <td style="text-align:center">{{ row.f_delaypay }}</td>
152
+ <td style="text-align:center">{{ row.f_jianmian }}</td>
153
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{ row.f_balance }}</td>
154
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.isIot">{{ row.f_oughtfee }}</td>
155
+ <td style="text-align:center">{{ row.f_collection }}</td>
156
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{ row.f_curbalance }}</td>
157
+ <td style="text-align:center">{{ row.f_payment }}</td>
158
+ <td style="text-align:center">{{ row.f_operator }}</td>
159
+ <td style="text-align:center">{{ row.f_operate_date.substring(0, 10) }}</td>
160
+ <td style="text-align:center">{{ row.f_operate_date.substring(11, 19) }}</td>
161
+ <td style="text-align:center">{{ row.f_state }}</td>
162
+ <td style="text-align:center">{{ row.f_depname }}</td>
163
+ <td style="text-align:center">{{ row.f_comments }}</td>
164
+ <td style="text-align:center">
165
+ <button @click.stop="$parent.$parent.$parent.report(row)" class="btn btn-link" name="button"
166
+ type="button"
167
+ v-if="row.f_state==='有效'">票据补打
168
+ </button>
169
+ </td>
170
+ </tr>
171
+ </template>
172
+ <template partial='foot'></template>
173
+ </data-grid>
174
+ </criteria-paged>
175
+ </div>
176
+ <table class="table-hover">
177
+ <tr class="table-bordered" style="position: relative">
178
+ <td
179
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
180
+ 汇总信息
181
+ </td>
182
+ <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
183
+ <!-- 气量合计:&emsp;{{model.sums.f_pregas}}-->
184
+ <!-- </td>-->
185
+ <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
186
+ <!-- 金额合计:&emsp;{{model.sums.f_preamount}}-->
187
+ <!-- </td>-->
188
+ <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
189
+ <!-- 应交合计:&emsp;{{model.sums.f_oughtfee}}-->
190
+ <!-- </td>-->
191
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
192
+ 气量合计:&emsp;{{ sumsmodel.f_pregas}}
193
+ </td>
194
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
195
+ 实收合计:&emsp;{{ sumsmodel.f_collection }}
196
+ </td>
197
+ </tr>
198
+ </table>
199
+ <reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()"
200
+ @reissue-success="reissueSucc()" v-if="reissue_show"></reissue-bill>
201
+
202
+ </div>
203
+ </template>
204
+
205
+ <script>
206
+ import {HttpResetClass, PagedList} from 'vue-client'
207
+ import co from 'co'
208
+
209
+ let reprintGen = function* (self, row) {
210
+ try {
211
+ let reissueData = {}
212
+ reissueData = Object.assign({}, reissueData, row)
213
+
214
+ reissueData.f_bill_type = row.type
215
+ reissueData.f_bill_style = '普通收据'
216
+ reissueData.f_operator = self.$login.f.name
217
+ reissueData.f_operatorid = self.$login.f.id
218
+ reissueData.f_orgid = self.$login.f.orgid
219
+ reissueData.f_orgname = self.$login.f.orgs
220
+ reissueData.f_depid = self.$login.f.depids
221
+ reissueData.f_depname = self.$login.f.deps
222
+ reissueData.billUrl = self.getBillUrl(row.type)
223
+
224
+ self.reissue_data = reissueData
225
+ self.reissue_show = true
226
+ } catch (error) {
227
+ if (error.status) {
228
+ self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
229
+ }
230
+ throw error
231
+ }
232
+ }
233
+ export default {
234
+ title: '收费',
235
+ data () {
236
+ return {
237
+ reissue_show: false,
238
+ reissue_data: null,
239
+ condition: '1=1',
240
+ model: new PagedList(`${this.row.f_meter_type === '物联网表' ? 'api/af-revenue/sql/sale_WebChargeQuery' : 'api/af-revenue/sql/sale_ChargeQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
241
+ f_collection: 0,
242
+ f_pregas:0
243
+ }),
244
+ isIot: this.row.f_meter_type === '物联网表',
245
+ show: false,
246
+ list: [],
247
+ jiaofeistates: this.$appdata.getParam('缴费状态') ? [{
248
+ label: '全部',
249
+ value: ''
250
+ }, ...this.$appdata.getParam('缴费状态')] : [],
251
+ types: this.$appdata.getParam('收费类型') ? [{
252
+ label: '全部',
253
+ value: ''
254
+ }, ...this.$appdata.getParam('收费类型')] : [],
255
+ // 控制单选
256
+ radio: [],
257
+ searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
258
+ // 选中的页
259
+ all: [],
260
+ other: [],
261
+ f_calculation: '',
262
+ footer: [],
263
+ sumsmodel: {},
264
+ // row数据
265
+ rowsdata: [],
266
+ fields: {
267
+ 'f_userinfo_code': '客户编号',
268
+ 'f_user_name': '客户姓名',
269
+ 'f_pregas': '购气量',
270
+ 'f_price': '单价',
271
+ 'f_preamount': '购气金额',
272
+ 'f_hand_date': '收费区间',
273
+ 'f_operate_date': '缴费时间',
274
+ 'f_operator': '操作员',
275
+ 'f_last_tablebase': '上期指数',
276
+ 'f_tablebase': '本期指数',
277
+ 'f_comments': '备注'
278
+ },
279
+ iotFields: {
280
+ 'f_userinfo_code': '客户编号',
281
+ 'f_user_name': '客户姓名',
282
+ 'f_pregas': '购气量',
283
+ 'f_price': '单价',
284
+ 'f_preamount': '购气金额',
285
+ 'f_operate_date': '缴费时间',
286
+ 'f_operator': '操作员',
287
+ 'f_comments': '备注'
288
+ },
289
+ defaultfield: [
290
+ 'f_userinfo_code',
291
+ 'f_user_name',
292
+ 'f_preamount',
293
+ 'f_pregas',
294
+ 'f_operate_date',
295
+ 'f_operator',
296
+ 'f_comments'
297
+ ],
298
+ printModel: {
299
+ rows: []
300
+ }
301
+ }
302
+ },
303
+ props: ['row'],
304
+ ready () {
305
+ this.$refs.paged.$refs.criteria.model.f_state = ['有效']
306
+ this.$refs.paged.$refs.criteria.model.f_user_id = this.row.f_user_id
307
+ this.f_calculation = this.row.f_calculation
308
+ this.$refs.paged.$refs.criteria.search()
309
+
310
+ },
311
+ methods: {
312
+ getotherfooter () {
313
+ this.other = []
314
+ this.footer = []
315
+ let otherInData = []
316
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
317
+ let footerData = []
318
+ let exportfield = this.getExportFields
319
+ footerData.push('合计')
320
+ for (var field in this.sumsmodel) {
321
+ footerData.push(`${exportfield[field]}合计:${this.sumsmodel[field]}`)
322
+ }
323
+ this.footer.push(footerData)
324
+ this.other.push(otherInData)
325
+ },
326
+ async search () {
327
+ console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
328
+ this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
329
+ this.model.search(this.condition, this.model)
330
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
331
+ let http = new HttpResetClass()
332
+ let res = await http.load('POST', `${this.row.f_meter_type === '物联网表' ? 'api/af-revenue/sql/sale_WebChargeQuery' : 'api/af-revenue/sql/sale_ChargeQuery'}`, {
333
+ data: {
334
+ condition: this.condition,
335
+ f_user_id: this.row.f_user_id
336
+ }
337
+ }, {resolveMsg: null, rejectMsg: null})
338
+ this.printModel.rows = res.data
339
+ },
340
+ // 多选框初始化
341
+ selectInit () {
342
+ this.rowsdata = []
343
+ this.all = []
344
+ this.radio = []
345
+ },
346
+ reissueSucc () {
347
+ this.reissue_show = false
348
+ this.$dispatch('refresh')
349
+ },
350
+ reissueOper () {
351
+ this.reissue_data = null
352
+ this.reissue_show = false
353
+ },
354
+ getBillUrl (type) {
355
+ let name = ''
356
+ // 根据type数据 选择调用的Logic
357
+ if (type === '机表收费') {
358
+ name = 'api/af-revenue/report/machine_bill'
359
+ } else if (type === '物联网收费') {
360
+ name = 'api/af-revenue/report/iot_bill'
361
+ } else if (type === '超用收费') {
362
+ name = 'api/af-revenue/report/overuse_bill'
363
+ } else if (type === '其他收费') {
364
+ name = 'api/af-revenue/report/otherCharge_bill'
365
+ } else if (type === '发卡售气') {
366
+ name = 'api/af-revenue/report/sendCard_bill'
367
+ } else if (type === '卡表收费') {
368
+ name = 'api/af-revenue/report/card_bill'
369
+ } else if (type === '预存缴费') {
370
+ name = 'api/af-revenue/report/pre_sell'
371
+ }
372
+ return name
373
+ },
374
+ report (row) {
375
+ let reprint = reprintGen(this, row)
376
+ return co(reprint)
377
+ },
378
+ print () {
379
+ this.selectInit()
380
+ },
381
+ select () {
382
+ let index = this.model.pageIndex - 1
383
+ if (!this.radio[index]) {
384
+ this.radio.$set(index, [])
385
+ }
386
+ if (this.all[index]) {
387
+ // 数据
388
+ this.rowsdata[index] = Object.assign([], this.model.rows)
389
+ // 勾选
390
+ for (var i = 0; i < this.model.rows.length; i++) {
391
+ this.radio[index].$set(i, true)
392
+ }
393
+ } else {
394
+ // 数据
395
+ this.rowsdata[index] = []
396
+ // 不勾选
397
+ for (var i = 0; i < this.model.rows.length; i++) {
398
+ this.radio[index].$set(i, false)
399
+ }
400
+ }
401
+ let z = 0
402
+ for (let i = 0; i < this.all.length; i++) {
403
+ for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
404
+ this.printModel.rows[z++] = this.rowsdata[i][j]
405
+ }
406
+ }
407
+ },
408
+ selectOne (event, row, i) {
409
+ let index = this.model.pageIndex - 1
410
+ if (!this.rowsdata[index]) {
411
+ this.rowsdata[index] = []
412
+ }
413
+ if (!this.radio[index]) {
414
+ this.radio.$set(index, [])
415
+ }
416
+ if (event.target.checked) {
417
+ // 数据
418
+ this.rowsdata[index][i] = row
419
+ // 勾选
420
+ this.radio[index].$set(i, true)
421
+ // 判断是否全部选中
422
+ var allState = true
423
+ if (this.model.rows.length != this.radio[index].length) {
424
+ allState = false
425
+ }
426
+ for (var state of this.radio[index]) {
427
+ if (!state) {
428
+ allState = false
429
+ }
430
+ }
431
+ if (allState) {
432
+ this.all.$set(index, true)
433
+ } else {
434
+ this.all.$set(index, false)
435
+ }
436
+ } else {
437
+ // 数据
438
+ this.rowsdata[index][i] = []
439
+ // 不勾选
440
+ this.radio[index].$set(i, false)
441
+ // 任意取消一个则全选状态设为false
442
+ this.all.$set(index, false)
443
+ }
444
+ let z = 0
445
+ this.printModel.rows = []
446
+ for (let i = 0; i < this.all.length; i++) {
447
+ for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
448
+ if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
449
+ this.printModel.rows[z++] = this.rowsdata[i][j]
450
+ }
451
+ }
452
+ }
453
+ }
454
+ },
455
+ watch: {
456
+ 'model.rows' (val) {
457
+ if (val.length === 0) {
458
+ this.sumsmodel = {}
459
+ }
460
+ },
461
+ 'sumsmodel': {
462
+ handler: function (val) {
463
+ this.getotherfooter()
464
+ },
465
+ deep: true
466
+ }
467
+ },
468
+ computed: {
469
+ getCondition () {
470
+ return {
471
+ condition: this.condition,
472
+ f_user_id: this.row.f_user_id
473
+ }
474
+ },
475
+ getExportFields () {
476
+ let fields
477
+ if (this.isIot) {
478
+ fields = {
479
+ 'f_userinfo_code': '客户编号',
480
+ 'f_user_name': '客户姓名',
481
+ 'type': '收费类型',
482
+ 'f_hand_date': '收费区间',
483
+ 'f_meternumber': '表号',
484
+ 'f_last_tablebase': '上期指数',
485
+ 'f_tablebase': '本期指数',
486
+ 'f_pregas': '气量',
487
+ 'f_price': '气价',
488
+ 'f_preamount': '气费金额',
489
+ 'f_delaypay': '违约金',
490
+ 'f_jianmian': '减免金额',
491
+ 'f_balance': '上期结余',
492
+ 'f_oughtfee': '应交金额',
493
+ 'f_collection': '实收金额',
494
+ 'f_curbalance': '本期结余',
495
+ 'f_payment': '付款方式',
496
+ 'f_operator': '操作员',
497
+ 'f_operate_date': '缴费时间',
498
+ 'f_state': '缴费状态',
499
+ 'f_depname': '网点',
500
+ 'f_comments': '备注'
501
+ }
502
+ } else {
503
+ fields = {
504
+ 'f_userinfo_code': '客户编号',
505
+ 'f_user_name': '客户姓名',
506
+ 'type': '收费类型',
507
+ 'f_meternumber': '表号',
508
+ 'f_pregas': '气量',
509
+ 'f_price': '气价',
510
+ 'f_preamount': '气费金额',
511
+ 'f_delaypay': '违约金',
512
+ 'f_jianmian': '减免金额',
513
+ 'f_balance': '上期结余',
514
+ 'f_collection': '实收金额',
515
+ 'f_curbalance': '本期结余',
516
+ 'f_payment': '付款方式',
517
+ 'f_operator': '操作员',
518
+ 'f_operate_date': '缴费时间',
519
+ 'f_state': '缴费状态',
520
+ 'f_depname': '网点',
521
+ 'f_comments': '备注'
522
+ }
523
+ }
524
+ return fields
525
+ },
526
+ ischecked () {
527
+ return function (index, i) {
528
+ if (!this.radio[index]) {
529
+ return false
530
+ }
531
+ return this.radio[index][i]
532
+ }
533
+ }
534
+ }
535
+ }
536
+ </script>
537
+
@@ -0,0 +1,104 @@
1
+ <template>
2
+ <div style="height:100%">
3
+ <data-grid :model="model" class="table_sy" partial='list' v-ref:grid >
4
+ <template partial='head' >
5
+ <tr>
6
+ <th><nobr>序号</nobr></th>
7
+ <th><nobr>气量</nobr></th>
8
+ <th><nobr>应交</nobr></th>
9
+ <th><nobr>手续费</nobr></th>
10
+ <th><nobr>付款方式</nobr></th>
11
+ <th v-if="!$parent.$parent.f_calculation.includes('表端结算')"><nobr>上期结余</nobr></th>
12
+ <th><nobr>收款</nobr></th>
13
+ <th v-if="!$parent.$parent.f_calculation.includes('表端结算')"><nobr>本期结余</nobr></th>
14
+ <th><nobr>操作类型</nobr></th>
15
+ <th><nobr>操作时间 </nobr></th>
16
+ <th><nobr>操作员 </nobr></th>
17
+ <th><nobr>备注</nobr></th>
18
+ <th><nobr>写卡状态</nobr></th>
19
+ </tr>
20
+ </template>
21
+ <template partial='body' >
22
+ <tr >
23
+ <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
24
+ <td style="text-align:center;white-space:nowrap;">{{row.gas}}</td>
25
+ <td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
26
+ <td style="text-align:center;white-space:nowrap;">{{row.f_commission}}</td>
27
+ <td style="text-align:center;white-space:nowrap;">{{row.f_payment}}</td>
28
+ <td style="text-align:center;white-space:nowrap;" v-if="!$parent.$parent.f_calculation.includes('表端结算')">{{row.f_balance}}</td>
29
+ <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
30
+ <td style="text-align:center;white-space:nowrap;" v-if="!$parent.$parent.f_calculation.includes('表端结算')">{{row.f_curbalance}}</td>
31
+ <td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
32
+ <td style="text-align:center;white-space:nowrap;">{{row.operate_date}}</td>
33
+ <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
34
+ <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
35
+ <td style="text-align:center;white-space:nowrap;">{{row.f_write_card}}</td>
36
+ </tr>
37
+ </template>
38
+ </data-grid>
39
+ <modal :show.sync="cardCental" v-ref:modal backdrop="false">
40
+ <header slot="modal-header" class="modal-header">
41
+ <h4 class="modal-title">温馨提示</h4>
42
+ </header>
43
+ <article slot="modal-body" class="modal-body">
44
+ <div class="form-group">
45
+ <p> 当日此用户已经进行过一次购气,若卡上无气,请先进行补卡(未过表),之后掉气补气即可</p>
46
+ </div>
47
+ </article>
48
+ <footer slot="modal-footer" class="modal-footer">
49
+ <button type="button" class="btn btn-success" @click='cancel()'>确认
50
+ </button>
51
+ </footer>
52
+ </modal>
53
+ </div>
54
+ </template>
55
+
56
+ <script>
57
+ import {HttpResetClass} from 'vue-client'
58
+
59
+ export default {
60
+ title: '操作查询',
61
+ data () {
62
+ return {
63
+ model: {rows: []},
64
+ f_calculation: '',
65
+ cardCental:false,
66
+ hasCardCental: false
67
+ }
68
+ },
69
+ props: ['searchdata'],
70
+ ready () {
71
+ this.getsalerecord()
72
+ },
73
+ methods: {
74
+ cancel(){
75
+ this.cardCental = false;
76
+ },
77
+ async getsalerecord () {
78
+ let http = new HttpResetClass()
79
+ // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
80
+ this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
81
+ let record = await http.load('POST', 'api/af-revenue/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
82
+ rejectMsg: '流水查询出错!!',
83
+ resolveMsg: null
84
+ })
85
+ this.f_calculation = this.searchdata.f_calculation
86
+ this.model.rows = record.data
87
+ this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : false
88
+ if (this.hasCardCental && this.model.rows.length > 0 && (this.model.rows[0].type == '发卡售气' || this.model.rows[0].type == '卡表收费')) {
89
+ let checkdata = this.model.rows[0].operate_date.substr(0, 10)
90
+ let nowdate = new Date()
91
+ let pdate = nowdate.getFullYear() + '-' + (nowdate.getMonth() < 10 ? '0' + nowdate.getMonth() + 1 : nowdate.getMonth() + 1) + '-' + (nowdate.getDate() < 10 ? '0' + nowdate.getDate() : nowdate.getDate())
92
+ if (new Date(checkdata).getTime() == new Date(pdate).getTime()) {
93
+ this.cardCental = true
94
+ }
95
+ }
96
+ }
97
+ },
98
+ watch: {
99
+ 'searchdata' () {
100
+ this.getsalerecord()
101
+ }
102
+ }
103
+ }
104
+ </script>
@@ -28,9 +28,9 @@
28
28
  <label class="font_normal_body">剩余金额</label>
29
29
  <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>
30
30
  </div>
31
- <div class="col-sm-4 form-group">
31
+ <div class="col-sm-4 form-group" :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
32
32
  <label class="font_normal_body">所退气量</label>
33
- <input class="input_search" style="width:60%" type="number" v-model="model.f_pregas" >
33
+ <input class="input_search" style="width:60%" type="number" v-validate:f_pregas='{required: true, dctest: [data.f_total_gas, "<=" ]}' v-model="model.f_pregas" >
34
34
  </div>
35
35
  </div>
36
36
  <div v-for="row in stairmodel">
@@ -132,7 +132,7 @@
132
132
  billType: '燃气费'
133
133
  },
134
134
  stairmodel: [{f_pregas: 0, f_price: 0, f_collection: 0}],
135
- ratio: this.$appdata.getSingleValue('手续费比率'),
135
+ ratio: this.$appdata.getSingleValue('手续费比率') ? this.$appdata.getSingleValue('手续费比率') : 0,
136
136
  model: {
137
137
  f_refund_fee: '',
138
138
  f_pregas: 0,
@@ -218,7 +218,7 @@
218
218
  this.model.f_collection = this.model.f_refund_fee - this.model.f_commission
219
219
  },
220
220
  getCollection () {
221
- this.model.f_collection = this.model.f_refund_fee - this.model.f_commission
221
+ this.model.f_collection = ((this.model.f_refund_fee - 0) - (this.model.f_commission - 0)).toFixed(this.config.decimal)
222
222
  },
223
223
  getRandomId () {
224
224
  this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -140,7 +140,7 @@
140
140
  f_print: '',
141
141
  f_price: 0
142
142
  },
143
- ratio: this.$appdata.getSingleValue('手续费比率'),
143
+ ratio: this.$appdata.getSingleValue('手续费比率') ? this.$appdata.getSingleValue('手续费比率') : 0,
144
144
  blodid: '',
145
145
  hasValidateBill: false,
146
146
  randomBusinessId: '',
@@ -102,7 +102,7 @@
102
102
  payment: '现金缴费',
103
103
  billType: '燃气费'
104
104
  },
105
- ratio: this.$appdata.getSingleValue('手续费比率'),
105
+ ratio: this.$appdata.getSingleValue('手续费比率') ? this.$appdata.getSingleValue('手续费比率') : 0,
106
106
  model: {
107
107
  f_refund_fee: '',
108
108
  f_collection: null,
@@ -52,6 +52,7 @@ export default {
52
52
  },
53
53
  methods: {
54
54
  async confirm () {
55
+ // console.log(JSON.stringify(this.row))
55
56
  await this.$LogicService.meterDisable(this.model, this.row)
56
57
  if (this.$appdata.getSingleValue('v4后台')) {
57
58
  await this.$resetpost('api/af-revenue/entity/save/t_userfiles', {
@@ -75,4 +75,8 @@ export default function () {
75
75
  Vue.component('disable-manage', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/MeterDisable/DisableManage'], resolve) })
76
76
  // 其他补气
77
77
  Vue.component('other-gas', (resolve) => { require(['./OtherGas'], resolve) })
78
+ // 收费页面的流水查询
79
+ Vue.component('meter-charge-record-query', (resolve) => { require(['./ChargeRecordQuery'], resolve) })
80
+ // 收费查询
81
+ Vue.component('charge-query-user', (resolve) => { require(['./ChargeQueryUser.vue'], resolve) })
78
82
  }
package/src/main.js CHANGED
@@ -4,7 +4,7 @@ import App from './App'
4
4
  import system from 'system-clients/src/system'
5
5
  // import FilialeSale from './filiale/dexin/sale'
6
6
  import sale from './sale'
7
- import FilialeSale from './filiale/fugou/sale'
7
+ import FilialeSale from './filiale/xihu/sale'
8
8
  import address from 'address-client/src/address'
9
9
  import ldap from 'ldap-clients/src/ldap'
10
10
  import VueClipboard from 'vue-clipboard2'
package/src/sale.js CHANGED
@@ -738,6 +738,7 @@ export default function () {
738
738
  Vue.component('purchase-water', (resolve) => { require(['./components/revenue/base/PurchaseWater'], resolve) })
739
739
  // 单用户查询界面
740
740
  Vue.component('user-info-detail-manage', (resolve) => { require(['./components/common/userinfo_detail/UserInfoDetailManage'], resolve) })
741
+ Vue.component('charge-query-user', (resolve) => { require(['./components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue'], resolve) })
741
742
  Vue.component('automatic-purse', (resolve) => { require(['./components/common/userinfo_detail/ic_detail/AutomaticPurse'], resolve) })
742
743
  Vue.component('user-base-info', (resolve) => { require(['./components/common/userinfo_detail/UserBaseInfo'], resolve) })
743
744
  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./components/common/userinfo_detail/UserInfoDetailManageNew'], resolve) })
@@ -1,254 +0,0 @@
1
- #
2
- # There is insufficient memory for the Java Runtime Environment to continue.
3
- # Native memory allocation (mmap) failed to map 266338304 bytes. Error detail: G1 virtual space
4
- # Possible reasons:
5
- # The system is out of physical RAM or swap space
6
- # This process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
7
- # Possible solutions:
8
- # Reduce memory load on the system
9
- # Increase physical memory or swap space
10
- # Check if swap backing store is full
11
- # Decrease Java heap size (-Xmx/-Xms)
12
- # Decrease number of Java threads
13
- # Decrease Java thread stack sizes (-Xss)
14
- # Set larger code cache with -XX:ReservedCodeCacheSize=
15
- # JVM is running with Zero Based Compressed Oops mode in which the Java heap is
16
- # placed in the first 32GB address space. The Java Heap base address is the
17
- # maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
18
- # to set the Java Heap base and to place the Java Heap above 32GB virtual address.
19
- # This output file may be truncated or incomplete.
20
- #
21
- # Out of Memory Error (os_windows.cpp:3825), pid=23568, tid=27428
22
- #
23
- # JRE version: (17.0.11+1) (build )
24
- # Java VM: OpenJDK 64-Bit Server VM (17.0.11+1-b1207.24, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
25
- # No core dump will be written. Minidumps are not enabled by default on client versions of Windows
26
- #
27
-
28
- --------------- S U M M A R Y ------------
29
-
30
- Command Line: git4idea.http.GitAskPassApp Username for 'http://192.168.50.67:32573':
31
-
32
- Host: Intel(R) Core(TM) i7-10870H CPU @ 2.20GHz, 16 cores, 15G, Windows 11 , 64 bit Build 22621 (10.0.22621.3958)
33
- Time: Fri Sep 6 17:29:47 2024 Windows 11 , 64 bit Build 22621 (10.0.22621.3958) elapsed time: 0.034717 seconds (0d 0h 0m 0s)
34
-
35
- --------------- T H R E A D ---------------
36
-
37
- Current thread (0x000002badc8ad190): JavaThread "Unknown thread" [_thread_in_vm, id=27428, stack(0x000000c894300000,0x000000c894400000)]
38
-
39
- Stack: [0x000000c894300000,0x000000c894400000]
40
- Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
41
- V [jvm.dll+0x6877f9]
42
- V [jvm.dll+0x8411aa]
43
- V [jvm.dll+0x842e2e]
44
- V [jvm.dll+0x843493]
45
- V [jvm.dll+0x249fdf]
46
- V [jvm.dll+0x6845c9]
47
- V [jvm.dll+0x678e7a]
48
- V [jvm.dll+0x30ab4b]
49
- V [jvm.dll+0x311ff6]
50
- V [jvm.dll+0x361a5e]
51
- V [jvm.dll+0x361c8f]
52
- V [jvm.dll+0x2e0978]
53
- V [jvm.dll+0x2e18e4]
54
- V [jvm.dll+0x811c71]
55
- V [jvm.dll+0x36f7c8]
56
- V [jvm.dll+0x7f05f6]
57
- V [jvm.dll+0x3f398f]
58
- V [jvm.dll+0x3f5541]
59
- C [jli.dll+0x528f]
60
- C [ucrtbase.dll+0x29333]
61
- C [KERNEL32.DLL+0x1257d]
62
- C [ntdll.dll+0x5af28]
63
-
64
-
65
- --------------- P R O C E S S ---------------
66
-
67
- Threads class SMR info:
68
- _java_thread_list=0x00007ffbad3aefd8, length=0, elements={
69
- }
70
-
71
- Java Threads: ( => current thread )
72
-
73
- Other Threads:
74
- 0x000002badc9191b0 GCTaskThread "GC Thread#0" [stack: 0x000000c894400000,0x000000c894500000] [id=30500]
75
- 0x000002badc92a560 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000c894500000,0x000000c894600000] [id=25908]
76
- 0x000002badc92af80 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000c894600000,0x000000c894700000] [id=19132]
77
-
78
- [error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffbacb61547]
79
-
80
- VM state: not at safepoint (not fully initialized)
81
-
82
- VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
83
- [0x000002badc8a78c0] Heap_lock - owner thread: 0x000002badc8ad190
84
-
85
- Heap address: 0x0000000703400000, size: 4044 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
86
-
87
- CDS archive(s) mapped at: [0x0000000000000000-0x0000000000000000-0x0000000000000000), size 0, SharedBaseAddress: 0x0000000800000000, ArchiveRelocationMode: 1.
88
- Narrow klass base: 0x0000000000000000, Narrow klass shift: 0, Narrow klass range: 0x0
89
-
90
- GC Precious Log:
91
- <Empty>
92
-
93
- Heap:
94
- garbage-first heap total 0K, used 0K [0x0000000703400000, 0x0000000800000000)
95
- region size 2048K, 0 young (0K), 0 survivors (0K)
96
- Metaspace used 0K, committed 0K, reserved 0K
97
- class space used 0K, committed 0K, reserved 0K
98
-
99
- Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next)
100
-
101
- Card table byte_map: [0x000002baf0090000,0x000002baf0880000] _byte_map_base: 0x000002baec876000
102
-
103
- Marking Bits (Prev, Next): (CMBitMap*) 0x000002badc9197d0, (CMBitMap*) 0x000002badc919810
104
- Prev Bits: [0x000002baf1070000, 0x000002baf4fa0000)
105
- Next Bits: [0x000002baf4fa0000, 0x000002baf8ed0000)
106
-
107
- GC Heap History (0 events):
108
- No events
109
-
110
- Dll operation events (1 events):
111
- Event: 0.017 Loaded shared library D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\java.dll
112
-
113
- Deoptimization events (0 events):
114
- No events
115
-
116
- Classes unloaded (0 events):
117
- No events
118
-
119
- Classes redefined (0 events):
120
- No events
121
-
122
- Internal exceptions (0 events):
123
- No events
124
-
125
- VM Operations (0 events):
126
- No events
127
-
128
- Events (0 events):
129
- No events
130
-
131
-
132
- Dynamic libraries:
133
- 0x00007ff62f1e0000 - 0x00007ff62f1ea000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\java.exe
134
- 0x00007ffc1ea50000 - 0x00007ffc1ec67000 C:\Windows\SYSTEM32\ntdll.dll
135
- 0x00007ffc1dfc0000 - 0x00007ffc1e084000 C:\Windows\System32\KERNEL32.DLL
136
- 0x00007ffc1be60000 - 0x00007ffc1c20d000 C:\Windows\System32\KERNELBASE.dll
137
- 0x00007ffc16450000 - 0x00007ffc164e7000 C:\Windows\SYSTEM32\apphelp.dll
138
- 0x00007ffc1c210000 - 0x00007ffc1c321000 C:\Windows\System32\ucrtbase.dll
139
- 0x00007ffc14920000 - 0x00007ffc14937000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\jli.dll
140
- 0x00007ffc09690000 - 0x00007ffc096ab000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\VCRUNTIME140.dll
141
- 0x00007ffc1e760000 - 0x00007ffc1e90e000 C:\Windows\System32\USER32.dll
142
- 0x00007ffc1c750000 - 0x00007ffc1c776000 C:\Windows\System32\win32u.dll
143
- 0x00007ffc07f90000 - 0x00007ffc08223000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955\COMCTL32.dll
144
- 0x00007ffc1cac0000 - 0x00007ffc1cae9000 C:\Windows\System32\GDI32.dll
145
- 0x00007ffc1d1f0000 - 0x00007ffc1d297000 C:\Windows\System32\msvcrt.dll
146
- 0x00007ffc1c3a0000 - 0x00007ffc1c4b9000 C:\Windows\System32\gdi32full.dll
147
- 0x00007ffc1c630000 - 0x00007ffc1c6ca000 C:\Windows\System32\msvcp_win.dll
148
- 0x00007ffc1e380000 - 0x00007ffc1e3b1000 C:\Windows\System32\IMM32.DLL
149
- 0x00007ffc09680000 - 0x00007ffc0968c000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\vcruntime140_1.dll
150
- 0x00007ffbd3250000 - 0x00007ffbd32dd000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\msvcp140.dll
151
- 0x00007ffbac870000 - 0x00007ffbad4f3000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\server\jvm.dll
152
- 0x00007ffc1caf0000 - 0x00007ffc1cba2000 C:\Windows\System32\ADVAPI32.dll
153
- 0x00007ffc1e4e0000 - 0x00007ffc1e589000 C:\Windows\System32\sechost.dll
154
- 0x00007ffc1bd70000 - 0x00007ffc1bd98000 C:\Windows\System32\bcrypt.dll
155
- 0x00007ffc1dea0000 - 0x00007ffc1dfb4000 C:\Windows\System32\RPCRT4.dll
156
- 0x00007ffc149e0000 - 0x00007ffc149e9000 C:\Windows\SYSTEM32\WSOCK32.dll
157
- 0x00007ffc1abc0000 - 0x00007ffc1ac0d000 C:\Windows\SYSTEM32\POWRPROF.dll
158
- 0x00007ffc121b0000 - 0x00007ffc121e4000 C:\Windows\SYSTEM32\WINMM.dll
159
- 0x00007ffc1e140000 - 0x00007ffc1e1b1000 C:\Windows\System32\WS2_32.dll
160
- 0x00007ffc164f0000 - 0x00007ffc164fa000 C:\Windows\SYSTEM32\VERSION.dll
161
- 0x00007ffc1aba0000 - 0x00007ffc1abb3000 C:\Windows\SYSTEM32\UMPDC.dll
162
- 0x00007ffc1ae50000 - 0x00007ffc1ae68000 C:\Windows\SYSTEM32\kernel.appcore.dll
163
- 0x00007ffc149d0000 - 0x00007ffc149da000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\jimage.dll
164
- 0x00007ffc19350000 - 0x00007ffc19582000 C:\Windows\SYSTEM32\DBGHELP.DLL
165
- 0x00007ffc1db10000 - 0x00007ffc1de9d000 C:\Windows\System32\combase.dll
166
- 0x00007ffc1e670000 - 0x00007ffc1e747000 C:\Windows\System32\OLEAUT32.dll
167
- 0x00007ffbfa020000 - 0x00007ffbfa052000 C:\Windows\SYSTEM32\dbgcore.DLL
168
- 0x00007ffc1c6d0000 - 0x00007ffc1c74b000 C:\Windows\System32\bcryptPrimitives.dll
169
- 0x00007ffc14940000 - 0x00007ffc14965000 D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\java.dll
170
-
171
- dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
172
- symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin;C:\Windows\SYSTEM32;C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955;D:\Program Files\JetBrains\WebStorm 2024.1.3\jbr\bin\server
173
-
174
- VM Arguments:
175
- java_command: git4idea.http.GitAskPassApp Username for 'http://192.168.50.67:32573':
176
- java_class_path (initial): D:/Program Files/JetBrains/WebStorm 2024.1.3/plugins/vcs-git/lib/git4idea-rt.jar;D:/Program Files/JetBrains/WebStorm 2024.1.3/lib/externalProcess-rt.jar
177
- Launcher Type: SUN_STANDARD
178
-
179
- [Global flags]
180
- intx CICompilerCount = 12 {product} {ergonomic}
181
- uint ConcGCThreads = 3 {product} {ergonomic}
182
- uint G1ConcRefinementThreads = 13 {product} {ergonomic}
183
- size_t G1HeapRegionSize = 2097152 {product} {ergonomic}
184
- uintx GCDrainStackTargetSize = 64 {product} {ergonomic}
185
- size_t InitialHeapSize = 266338304 {product} {ergonomic}
186
- size_t MarkStackSize = 4194304 {product} {ergonomic}
187
- size_t MaxHeapSize = 4240441344 {product} {ergonomic}
188
- size_t MinHeapDeltaBytes = 2097152 {product} {ergonomic}
189
- size_t MinHeapSize = 8388608 {product} {ergonomic}
190
- uintx NonNMethodCodeHeapSize = 7602480 {pd product} {ergonomic}
191
- uintx NonProfiledCodeHeapSize = 122027880 {pd product} {ergonomic}
192
- uintx ProfiledCodeHeapSize = 122027880 {pd product} {ergonomic}
193
- uintx ReservedCodeCacheSize = 251658240 {pd product} {ergonomic}
194
- bool SegmentedCodeCache = true {product} {ergonomic}
195
- size_t SoftMaxHeapSize = 4240441344 {manageable} {ergonomic}
196
- bool UseCompressedClassPointers = true {product lp64_product} {ergonomic}
197
- bool UseCompressedOops = true {product lp64_product} {ergonomic}
198
- bool UseG1GC = true {product} {ergonomic}
199
- bool UseLargePagesIndividualAllocation = false {pd product} {ergonomic}
200
-
201
- Logging:
202
- Log output configuration:
203
- #0: stdout all=warning uptime,level,tags
204
- #1: stderr all=off uptime,level,tags
205
-
206
- Environment Variables:
207
- JAVA_HOME=C:\Program Files\Java\jdk-1.8
208
- CLASSPATH=.;C:\Program Files\Java\jdk-1.8\lib\dt.jar;C:\Program Files\Java\jdk-1.8\lib\tools.jar;C:\Program Files\Java\jdk-1.8\lib;
209
- PATH=D:\Program Files (x86)\Git\mingw32\libexec\git-core;D:\Program Files (x86)\Git\mingw32\libexec\git-core;D:\Program Files (x86)\Git\mingw32\bin;D:\Program Files (x86)\Git\usr\bin;C:\Users\������\bin;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Python312\Scripts;C:\Program Files\Java\jdk-1.8\bin;C:\Python312;C:\Program Files\Common Files\Oracle\Java\javapath;C:\Program Files\Microsoft MPI\Bin;C:\Program Files (x86)\Common Files\Oracle\Java\java8path;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;D:\work\gradle-3.5.1-all\gradle-3.5.1\bin;C:\Program Files (x86)\VMware\VMware Workstation\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;D:\files\apache-maven-3.6.1\bin;D:\Program Files (x86)\Git\cmd;D:\work\apache-tomcat-9.0.83\bin;C:\Program Files\OpenVPN\bin;D:\Program Files (x86)\Microsoft SQL Server\160\Tools\Binn;D:\Program Files\Microsoft SQL Server\160\Tools\Binn;D:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;D:\Program Files\Microsoft SQL Server\160\DTS\Binn;D:\Program Files (x86)\Microsoft SQL Server\160\DTS\Binn;C:\Program Files\Java\jdk-1.8\bin;D:\Program Files\Bandizip;C:\ProgramData\chocolatey\bin;D:\work\nvm;C:\Program Files\nodejs;C:\Program Files\nodejs;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Users\������\AppData\Local\Microsoft\WindowsApps;C:\Program Files\JetBrains\IntelliJ IDEA 2020.3.3\bin;D:\Users\������\AppData\Local\Programs\Microsoft VS Code\bin
210
- USERNAME=������
211
- DISPLAY=:0.0
212
- LC_ALL=en_US.UTF-8
213
- TERM=xterm-256color
214
- TMPDIR=C:\Users\������\AppData\Local\Temp
215
- OS=Windows_NT
216
- PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 165 Stepping 2, GenuineIntel
217
- TMP=C:\Users\������\AppData\Local\Temp
218
- TEMP=C:\Users\������\AppData\Local\Temp
219
-
220
-
221
-
222
- Periodic native trim disabled
223
-
224
- JNI global refs:
225
- JNI global refs: 0, weak refs: 0
226
-
227
- JNI global refs memory usage: 0, weak refs: 0
228
-
229
- Process memory usage:
230
- Resident Set Size: 12396K (0% of 16556244K total physical memory with 332300K free physical memory)
231
-
232
- OOME stack traces (most recent first):
233
- Classloader memory used:
234
-
235
-
236
- --------------- S Y S T E M ---------------
237
-
238
- OS:
239
- Windows 11 , 64 bit Build 22621 (10.0.22621.3958)
240
- OS uptime: 1 days 0:18 hours
241
- Hyper-V role detected
242
-
243
- CPU: total 16 (initial active 16) (8 cores per cpu, 2 threads per core) family 6 model 165 stepping 2 microcode 0xe0, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, fma, vzeroupper, clflush, clflushopt, hv
244
- Processor Information for all 16 processors :
245
- Max Mhz: 2208, Current Mhz: 2208, Mhz Limit: 2208
246
-
247
- Memory: 4k page, system-wide physical 16168M (323M free)
248
- TotalPageFile size 49688M (AvailPageFile size 248M)
249
- current process WorkingSet (physical memory assigned to process): 12M, peak: 12M
250
- current process commit charge ("private bytes"): 71M, peak: 324M
251
-
252
- vm_info: OpenJDK 64-Bit Server VM (17.0.11+1-b1207.24) for windows-amd64 JRE (17.0.11+1-b1207.24), built on 2024-05-15 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
253
-
254
- END.
File without changes