manage-client 3.2.83 → 3.2.86

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 (26) hide show
  1. package/build/dev-server.js +6 -6
  2. package/package.json +1 -1
  3. package/src/components/SellReport/ReportComponrnt/TieAnAccount.vue +4 -4
  4. package/src/components/sale/businessquery/BusinesQuery.vue +1 -1
  5. package/src/components/sale/businessquery/CancellationQuery.vue +37 -6
  6. package/src/components/sale/businessquery/CardHandplanQuery.vue +34 -6
  7. package/src/components/sale/businessquery/ChangeMeterQuery.vue +38 -7
  8. package/src/components/sale/businessquery/DisableQuery.vue +39 -6
  9. package/src/components/sale/businessquery/EnableQuery.vue +40 -6
  10. package/src/components/sale/businessquery/FillCardQuery.vue +38 -6
  11. package/src/components/sale/businessquery/FillGasQuery.vue +37 -6
  12. package/src/components/sale/businessquery/HandplanQuery.vue +55 -13
  13. package/src/components/sale/businessquery/MoveMeterQuery.vue +42 -8
  14. package/src/components/sale/businessquery/OtherChargeQuery.vue +37 -6
  15. package/src/components/sale/businessquery/PrivilegeQuery.vue +36 -6
  16. package/src/components/sale/businessquery/ReceiptQuery.vue +9 -6
  17. package/src/components/sale/businessquery/ReverseQuery.vue +37 -6
  18. package/src/components/sale/businessquery/TransferQuery.vue +37 -6
  19. package/src/components/sale/businessquery/overDueQuery.vue +17 -6
  20. package/src/components/sale/businessquery/priceadjustQuery.vue +36 -6
  21. package/src/components/sale/filesquery/RecordInfoQuery.vue +1270 -1268
  22. package/src/components/sale/filesquery/UserQuery.vue +937 -933
  23. package/src/filiale/qianneng/ChargeQuery.vue +1289 -1289
  24. package/src/filiale/qianneng/HandplanQuery.vue +1352 -1344
  25. package/src/filiale/qianneng/exportConfig.js +69 -69
  26. package/src/main.js +66 -66
package/src/components/sale/businessquery/FillGasQuery.vue CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="basic-main" @keyup.enter="search">
4
4
  <div class="flex" v-if="!show">
5
5
 
6
- <criteria-paged :model="model" v-ref:paged>
6
+ <criteria-paged :model="model" v-ref:paged @sort="sort">
7
7
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
9
9
  <div class="row">
@@ -142,7 +142,9 @@
142
142
  <template partial='head'>
143
143
  <tr>
144
144
  <th>
145
- <nobr>客户编号</nobr>
145
+ <!-- <nobr>客户编号</nobr>-->
146
+ <data-order field="f_userinfo_code" name="客户编号"
147
+ :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
146
148
  </th>
147
149
  <th>
148
150
  <nobr>客户名称</nobr>
@@ -157,7 +159,9 @@
157
159
  <nobr>客户电话</nobr>
158
160
  </th>
159
161
  <th>
160
- <nobr>客户地址</nobr>
162
+ <!-- <nobr>客户地址</nobr>-->
163
+ <data-order field="f_address" name="客户地址"
164
+ :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
161
165
  </th>
162
166
  <th>
163
167
  <nobr>卡号</nobr>
@@ -175,7 +179,9 @@
175
179
  <nobr>补气类型</nobr>
176
180
  </th>
177
181
  <th>
178
- <nobr>补气日期</nobr>
182
+ <!-- <nobr>补气日期</nobr>-->
183
+ <data-order field="f_operate_date" name="补气日期"
184
+ :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
179
185
  </th>
180
186
  <th>
181
187
  <nobr>补气原因</nobr>
@@ -307,7 +313,7 @@
307
313
  data: {},
308
314
  other:[],
309
315
  footer:[],
310
- model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0,hushu:0}),
316
+ model: new PagedList('rs/sql/fillGasQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_pregas: 0,f_preamount: 0,hushu:0}),
311
317
  criteriaShow: false,
312
318
  headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补气类型", "表编号", "卡号", "气表品牌", "气表状态", "补气量", "补气日期", "操作员", "部门", "公司"],
313
319
  bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", "f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_fillgas", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -315,6 +321,11 @@
315
321
  config: {
316
322
  defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_idnumber', 'f_type', 'f_meter_brand', 'f_fillgas','f_operate_date', 'f_operator']
317
323
  },
324
+ //排序
325
+ orderitem:'f_operate_date desc',
326
+ orderFields: {
327
+ f_operate_date: 'no'
328
+ },
318
329
  //默认打印列
319
330
  defaultfield: [],
320
331
  modelval: [],
@@ -370,6 +381,24 @@
370
381
  this.footer.push(footerData);
371
382
  this.other.push(otherInData);
372
383
  },
384
+ sort (field, rule) {
385
+ // 将所有排序方式设为不排序，实现相互排斥
386
+ for (let key in this.orderFields) {
387
+ if (key === field) {
388
+ this.orderFields[key] = rule
389
+ } else {
390
+ this.orderFields[key] = 'no'
391
+ }
392
+ }
393
+ // 如果新规则不排序，还原为默认排序
394
+ if (rule === 'no') {
395
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
396
+ } else {
397
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
398
+ }
399
+
400
+ this.search()
401
+ },
373
402
  search(){
374
403
  this.$refs.paged.$refs.cri.search()
375
404
  },
@@ -510,7 +539,9 @@
510
539
  },
511
540
  computed: {
512
541
  getCondition() {
513
- return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
542
+ return {
543
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
544
+ orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
514
545
  },
515
546
  getfield() {
516
547
  return exportConfig.fillgasConfig
package/src/components/sale/businessquery/HandplanQuery.vue CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="basic-main" @keyup.enter="search" v-if="!show">
4
4
  <div class="flex">
5
5
 
6
- <criteria-paged :model="model" v-ref:paged>
6
+ <criteria-paged :model="model" v-ref:paged @sort="sort">
7
7
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
9
9
  <div class="row">
@@ -313,7 +313,9 @@
313
313
  <template partial='head'>
314
314
  <tr>
315
315
  <th>
316
- <nobr>客户编号</nobr>
316
+ <!-- <nobr>客户编号</nobr>-->
317
+ <data-order field="f_userinfo_code" name="客户编号"
318
+ :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
317
319
  </th>
318
320
  <th>
319
321
  <nobr>客户名称</nobr>
@@ -328,7 +330,9 @@
328
330
  <nobr>表册片区</nobr>
329
331
  </th>
330
332
  <th>
331
- <nobr>客户地址</nobr>
333
+ <!-- <nobr>客户地址</nobr>-->
334
+ <data-order field="f_address" name="客户地址"
335
+ :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
332
336
  </th>
333
337
  <th>
334
338
  <nobr>客户手机</nobr>
@@ -337,14 +341,18 @@
337
341
  <nobr>表号</nobr>
338
342
  </th>
339
343
  <th>
340
- <nobr>数据年月</nobr>
344
+ <!-- <nobr>数据年月</nobr>-->
345
+ <data-order field="ym_data" name="数据年月"
346
+ :order.sync="$parent.$parent.$parent.orderFields.ym_data"></data-order>
341
347
  </th>
342
348
  <th>
343
- <nobr>审核日期</nobr>
349
+ <!-- <nobr>审核日期</nobr>-->
350
+ <data-order field="f_audit_date" name="审核日期"
351
+ :order.sync="$parent.$parent.$parent.orderFields.f_audit_date"></data-order>
344
352
  </th>
345
353
  <th>
346
354
  <nobr>上期底数</nobr>
347
- </th>
355
+ </th>/
348
356
  <th>
349
357
  <nobr>本期底数</nobr>
350
358
  </th>
@@ -376,25 +384,35 @@
376
384
  <nobr>下账状态</nobr>
377
385
  </th>
378
386
  <th>
379
- <nobr>收费时间</nobr>
387
+ <!-- <nobr>收费时间</nobr>-->
388
+ <data-order field="f_sellinggas_operate_date" name="收费时间"
389
+ :order.sync="$parent.$parent.$parent.orderFields.f_sellinggas_operate_date"></data-order>
380
390
  </th>
381
391
  <th>
382
392
  <nobr>收费人员</nobr>
383
393
  </th>
384
394
  <th>
385
- <nobr>冲正时间</nobr>
395
+ <!-- <nobr>冲正时间</nobr>-->
396
+ <data-order field="f_corrhand_date" name="冲正时间"
397
+ :order.sync="$parent.$parent.$parent.orderFields.f_corrhand_date"></data-order>
386
398
  </th>
387
399
  <th>
388
400
  <nobr>冲正人员</nobr>
389
401
  </th>
390
402
  <th>
391
- <nobr>下发日期</nobr>
403
+ <!-- <nobr>下发日期</nobr>-->
404
+ <data-order field="f_hand_date" name="下发日期"
405
+ :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
392
406
  </th>
393
407
  <th>
394
- <nobr>所属年月</nobr>
408
+ <!-- <nobr>所属年月</nobr>-->
409
+ <data-order field="belongmonth" name="所属年月"
410
+ :order.sync="$parent.$parent.$parent.orderFields.belongmonth"></data-order>
395
411
  </th>
396
412
  <th>
397
- <nobr>录入日期</nobr>
413
+ <!-- <nobr>录入日期</nobr>-->
414
+ <data-order field="f_input_date" name="录入日期"
415
+ :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
398
416
  </th>
399
417
  <th>
400
418
  <nobr>气价名称</nobr>
@@ -748,7 +766,7 @@
748
766
  other:[],
749
767
  footer:[],
750
768
  data: {},
751
- model: new PagedList('rs/sql/handplanQuery', 20, {startDate: 'this.model.handStartDate', endDate: 'this.model.handEndDate'}, {
769
+ model: new PagedList('rs/sql/handplanQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`' z '`}, {
752
770
  f_oughtamount: 0,
753
771
  f_oughtfee: 0,
754
772
  f_debt_money: 0,
@@ -763,6 +781,11 @@
763
781
  f_haircut_gas: 0,
764
782
  alloughtfee:0
765
783
  }),
784
+ //排序
785
+ orderitem:' z ',
786
+ orderFields: {
787
+ f_userinfo_code: 'no'
788
+ },
766
789
  initres: {
767
790
  org:[this.$login.f.orgid],
768
791
  dep:[],
@@ -1095,6 +1118,24 @@
1095
1118
  }
1096
1119
  this.thead += '</tr>'
1097
1120
  },
1121
+ sort (field, rule) {
1122
+ // 将所有排序方式设为不排序，实现相互排斥
1123
+ for (let key in this.orderFields) {
1124
+ if (key === field) {
1125
+ this.orderFields[key] = rule
1126
+ } else {
1127
+ this.orderFields[key] = 'no'
1128
+ }
1129
+ }
1130
+ // 如果新规则不排序，还原为默认排序
1131
+ if (rule === 'no') {
1132
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
1133
+ } else {
1134
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
1135
+ }
1136
+
1137
+ this.search()
1138
+ },
1098
1139
  print() {
1099
1140
  this.$refs.print.PrintAsFile()
1100
1141
  this.printshow = false
@@ -1197,7 +1238,8 @@
1197
1238
  return {
1198
1239
  startDate: this.$refs.paged.$refs.cri.model.startDate,
1199
1240
  endDate: this.$refs.paged.$refs.cri.model.endDate,
1200
- condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
1241
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
1242
+ orderitem: this.orderitem?`${this.orderitem}`: " z "}
1201
1243
  },
1202
1244
  getfield() {
1203
1245
  return exportConfig.handplanConfig
package/src/components/sale/businessquery/MoveMeterQuery.vue CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="basic-main" @keyup.enter="search">
4
4
  <div class="flex" v-if="!show">
5
5
 
6
- <criteria-paged :model="model" v-ref:paged>
6
+ <criteria-paged :model="model" v-ref:paged @sort="sort">
7
7
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
9
9
  <div class="row">
@@ -74,19 +74,27 @@
74
74
  <template partial='head'>
75
75
  <tr>
76
76
  <th>
77
- <nobr>客户编号</nobr>
77
+ <!-- <nobr>客户编号</nobr>-->
78
+ <data-order field="f_userinfo_code" name="客户编号"
79
+ :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
78
80
  </th>
79
81
  <th>
80
82
  <nobr>客户名称</nobr>
81
83
  </th>
82
84
  <th>
83
- <nobr>档案编号</nobr>
85
+ <!-- <nobr>档案编号</nobr>-->
86
+ <data-order field="f_userinfo_code" name="档案编号"
87
+ :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
84
88
  </th>
85
89
  <th>
86
- <nobr>旧地址</nobr>
90
+ <!-- <nobr>旧地址</nobr>-->
91
+ <data-order field="f_address" name="旧地址"
92
+ :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
87
93
  </th>
88
94
  <th>
89
- <nobr>新地址</nobr>
95
+ <!-- <nobr>新地址</nobr>-->
96
+ <data-order field="f_address_new" name="新地址"
97
+ :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
90
98
  </th>
91
99
  <th>
92
100
  <nobr>旧表箱号</nobr>
@@ -95,7 +103,9 @@
95
103
  <nobr>新表箱号</nobr>
96
104
  </th>
97
105
  <th>
98
- <nobr>操作日期</nobr>
106
+ <!-- <nobr>操作日期</nobr>-->
107
+ <data-order field="f_operate_date" name="操作日期"
108
+ :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
99
109
  </th>
100
110
  <th>
101
111
  <nobr>人员</nobr>
@@ -196,7 +206,12 @@
196
206
  data: {},
197
207
  other: [],
198
208
  footer: [],
199
- model: new PagedList('rs/sql/movemeterQuery', 20, {}),
209
+ //排序
210
+ orderitem:'f_operate_date desc',
211
+ orderFields: {
212
+ f_operate_date: 'no'
213
+ },
214
+ model: new PagedList('rs/sql/movemeterQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}),
200
215
  criteriaShow: false,
201
216
  // headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
202
217
  // bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -330,7 +345,25 @@
330
345
  })
331
346
  this.modelval = sortModel
332
347
  console.log('选择的打印的字段', this.modelval)
348
+ },
349
+ sort (field, rule) {
350
+ // 将所有排序方式设为不排序，实现相互排斥
351
+ for (let key in this.orderFields) {
352
+ if (key === field) {
353
+ this.orderFields[key] = rule
354
+ } else {
355
+ this.orderFields[key] = 'no'
356
+ }
333
357
  }
358
+ // 如果新规则不排序，还原为默认排序
359
+ if (rule === 'no') {
360
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
361
+ } else {
362
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
363
+ }
364
+
365
+ this.search()
366
+ }
334
367
  },
335
368
  watch: {
336
369
  'all'(val) {
@@ -353,7 +386,8 @@
353
386
  },
354
387
  computed: {
355
388
  getCondition() {
356
- return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr}
389
+ return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr,
390
+ orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
357
391
  },
358
392
  getfield() {
359
393
  return exportConfig.movemeterConfig
package/src/components/sale/businessquery/OtherChargeQuery.vue CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="basic-main" @keyup.enter="search">
4
4
  <div class="flex" v-if="!show">
5
5
 
6
- <criteria-paged :model="model" v-ref:paged>
6
+ <criteria-paged :model="model" v-ref:paged @sort="sort">
7
7
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
9
9
  <div class="row">
@@ -188,7 +188,9 @@
188
188
  <template partial='head'>
189
189
  <tr>
190
190
  <th>
191
- <nobr>客户编号</nobr>
191
+ <!-- <nobr>客户编号</nobr>-->
192
+ <data-order field="f_userinfo_code" name="客户编号"
193
+ :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
192
194
  </th>
193
195
  <th>
194
196
  <nobr>档案编号</nobr>
@@ -200,7 +202,9 @@
200
202
  <nobr>客户名称</nobr>
201
203
  </th>
202
204
  <th>
203
- <nobr>客户地址</nobr>
205
+ <!-- <nobr>客户地址</nobr>-->
206
+ <data-order field="f_address" name="客户地址"
207
+ :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
204
208
  </th>
205
209
  <th>
206
210
  <nobr>客户电话</nobr>
@@ -243,7 +247,9 @@
243
247
  <nobr>状态</nobr>
244
248
  </th>
245
249
  <th>
246
- <nobr>收费日期</nobr>
250
+ <!-- <nobr>收费日期</nobr>-->
251
+ <data-order field="f_operate_date" name="收费日期"
252
+ :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
247
253
  </th>
248
254
  <th>
249
255
  <nobr>服务人员</nobr>
@@ -419,7 +425,7 @@
419
425
  data: {},
420
426
  other:[],
421
427
  footer:[],
422
- model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
428
+ model: new PagedList('rs/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_money: 0,hushu:0}),
423
429
  criteriaShow: false,
424
430
  orgCondtionStr: '',
425
431
  modelval: [],
@@ -429,6 +435,11 @@
429
435
  config: {
430
436
  defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
431
437
  },
438
+ //排序
439
+ orderitem:'f_operate_date desc',
440
+ orderFields: {
441
+ f_operate_date: 'no'
442
+ },
432
443
  //默认打印列
433
444
  defaultfield: [],
434
445
  thead: '',
@@ -594,6 +605,24 @@
594
605
  },
595
606
  setTypenumber (val) {
596
607
  this.typenumberList = this.$appdata.getParam(val)
608
+ },
609
+ sort (field, rule) {
610
+ // 将所有排序方式设为不排序，实现相互排斥
611
+ for (let key in this.orderFields) {
612
+ if (key === field) {
613
+ this.orderFields[key] = rule
614
+ } else {
615
+ this.orderFields[key] = 'no'
616
+ }
617
+ }
618
+ // 如果新规则不排序，还原为默认排序
619
+ if (rule === 'no') {
620
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
621
+ } else {
622
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
623
+ }
624
+
625
+ this.search()
597
626
  }
598
627
  },
599
628
  watch: {
@@ -617,7 +646,9 @@
617
646
  },
618
647
  computed: {
619
648
  getCondition() {
620
- return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
649
+ return {
650
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
651
+ orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
621
652
  },
622
653
  service_person() {
623
654
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
package/src/components/sale/businessquery/PrivilegeQuery.vue CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="basic-main">
4
4
  <div class="flex">
5
5
 
6
- <criteria-paged :model="model" v-ref:paged>
6
+ <criteria-paged :model="model" v-ref:paged @sort="sort">
7
7
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
9
9
  <div class="row">
@@ -84,7 +84,9 @@
84
84
  <template partial='head'>
85
85
  <tr>
86
86
  <th>
87
- <nobr>用户编号</nobr>
87
+ <!-- <nobr>用户编号</nobr>-->
88
+ <data-order field="f_userinfo_code" name="客户编号"
89
+ :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
88
90
  </th>
89
91
  <th>
90
92
  <nobr>用户姓名</nobr>
@@ -93,7 +95,9 @@
93
95
  <nobr>用户类型</nobr>
94
96
  </th>
95
97
  <th>
96
- <nobr>用气地址</nobr>
98
+ <!-- <nobr>用气地址</nobr>-->
99
+ <data-order field="f_address" name="用气地址"
100
+ :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
97
101
  </th>
98
102
  <th>
99
103
  <nobr>气表类型</nobr>
@@ -108,7 +112,9 @@
108
112
  <nobr>操作员</nobr>
109
113
  </th>
110
114
  <th>
111
- <nobr>时间</nobr>
115
+ <!-- <nobr>时间</nobr>-->
116
+ <data-order field="f_operate_date" name="时间"
117
+ :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
112
118
  </th>
113
119
  </tr>
114
120
 
@@ -185,7 +191,7 @@
185
191
  data: {},
186
192
  other:[],
187
193
  footer:[],
188
- model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
194
+ model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"},{
189
195
  f_privilege_gas:0,
190
196
  f_privilege_money:0
191
197
  }),
@@ -206,6 +212,11 @@
206
212
  'f_operator',
207
213
  'f_operate_date']
208
214
  },
215
+ //排序
216
+ orderitem:'f_operate_date desc',
217
+ orderFields: {
218
+ f_operate_date: 'no'
219
+ },
209
220
  //默认打印列
210
221
  defaultfield: [],
211
222
  initres: {
@@ -311,6 +322,24 @@
311
322
  })
312
323
  this.modelval = sortModel
313
324
  console.log('选择的打印的字段', this.modelval)
325
+ },
326
+ sort (field, rule) {
327
+ // 将所有排序方式设为不排序，实现相互排斥
328
+ for (let key in this.orderFields) {
329
+ if (key === field) {
330
+ this.orderFields[key] = rule
331
+ } else {
332
+ this.orderFields[key] = 'no'
333
+ }
334
+ }
335
+ // 如果新规则不排序，还原为默认排序
336
+ if (rule === 'no') {
337
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
338
+ } else {
339
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
340
+ }
341
+
342
+ this.search()
314
343
  }
315
344
  },
316
345
  watch: {
@@ -337,7 +366,8 @@
337
366
  return {
338
367
  startDate: this.$refs.paged.$refs.cri.model.startDate,
339
368
  endDate: this.$refs.paged.$refs.cri.model.endDate,
340
- condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
369
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
370
+ orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
341
371
  },
342
372
  getfield() {
343
373
  return exportConfig.PrivilegeQuery
package/src/components/sale/businessquery/ReceiptQuery.vue CHANGED
@@ -195,11 +195,10 @@
195
195
  <tr>
196
196
  <th>
197
197
  <nobr>用户编号</nobr>
198
- </th>
198
+ <!-- <data-order field="f_userinfo_code" name="用户编号">-->
199
+ <!-- :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>-->
200
+ </th>
199
201
  <th>
200
- <!-- <nobr>客户编号</nobr>-->
201
- <!-- <data-order field="f_userinfo_code" name=""-->
202
- <!-- :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>-->
203
202
  <nobr>客户名称</nobr>
204
203
  </th>
205
204
  <th>
@@ -221,7 +220,9 @@
221
220
  <nobr>收票人</nobr>
222
221
  </th>
223
222
  <th>
224
- <nobr>操作日期</nobr>
223
+ <!-- <nobr>操作日期</nobr>-->
224
+ <data-order field="f_operate_date" name="操作日期"
225
+ :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
225
226
  </th>
226
227
  <th>
227
228
  <nobr>收费类型</nobr>
@@ -230,7 +231,9 @@
230
231
  <nobr>客户名称</nobr>
231
232
  </th>
232
233
  <th>
233
- <nobr>客户地址</nobr>
234
+ <!-- <nobr>客户地址</nobr>-->
235
+ <data-order field="f_address" name="客户地址"
236
+ :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
234
237
  </th>
235
238
  <th>
236
239
  <nobr>客户电话</nobr>