manage-client 3.3.162 → 3.3.164

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.162",
3
+ "version": "3.3.164",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -435,6 +435,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
435
435
  'f_tablebase':'本期底数',
436
436
  'f_oughtamount':'用气量(m³)',
437
437
  'f_oughtfee':'用气金额(元)',
438
+ 'f_total_gas':'累购气量',
439
+ 'f_total_fee':'累购金额',
440
+ 'f_balance_amount':'账号结余',
438
441
  'f_curbalance':'期末结余(元)'
439
442
 
440
443
  }
@@ -1049,7 +1049,7 @@ export default {
1049
1049
  "f_stair2fee": "二阶气费",
1050
1050
  "f_stairamount3": "三阶气量",
1051
1051
  "f_stair3fee": "三阶气费",
1052
- "f_createfile_date": "建档日期",
1052
+ "f_gas_date": "通气日期",
1053
1053
  "f_price_value": "气价详情",
1054
1054
  "f_balance": "账户余额",
1055
1055
  "f_pregas": "预购气量",
@@ -1249,6 +1249,7 @@
1249
1249
  startDate: this.$refs.paged.$refs.cri.model.startDate,
1250
1250
  endDate: this.$refs.paged.$refs.cri.model.endDate,
1251
1251
  condition: `${this.condition}` + this.orgCondtionStr,
1252
+ f_user_name: this.$refs.paged.$refs.cri.model.f_user_name,
1252
1253
  orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
1253
1254
  }
1254
1255
  },
@@ -639,9 +639,39 @@
639
639
  <th>
640
640
  <nobr>防盗卡号2</nobr>
641
641
  </th>
642
+ <th>
643
+ <nobr>纳税人识别号</nobr>
644
+ </th>
645
+ <th>
646
+ <nobr>纳税人名称</nobr>
647
+ </th>
648
+ <th>
649
+ <nobr>地址电话</nobr>
650
+ </th>
651
+ <th>
652
+ <nobr>票据类型</nobr>
653
+ </th>
654
+ <th>
655
+ <nobr>开户行及账号</nobr>
656
+ </th>
657
+ <th>
658
+ <nobr>推送票据邮箱</nobr>
659
+ </th>
642
660
  <th>
643
661
  <nobr>备注</nobr>
644
662
  </th>
663
+ <th>
664
+ <nobr>团缴号</nobr>
665
+ </th>
666
+ <th>
667
+ <nobr>团缴名称</nobr>
668
+ </th>
669
+ <th>
670
+ <nobr>最后安检时间</nobr>
671
+ </th>
672
+ <th>
673
+ <nobr>安检情况</nobr>
674
+ </th>
645
675
  </tr>
646
676
  </template>
647
677
  <template partial='body'>
@@ -766,7 +796,17 @@
766
796
  <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
767
797
  <td style="text-align: center;"><nobr>{{row.f_defendcard}}</nobr></td>
768
798
  <td style="text-align: center;"><nobr>{{row.f_defendcard_two}}</nobr></td>
799
+ <td style="text-align: center;"><nobr>{{row.f_taxpayer_id}}</nobr></td>
800
+ <td style="text-align: center;"><nobr>{{row.f_address_phone}}</nobr></td>
801
+ <td style="text-align: center;"><nobr>{{row.f_paper_name}}</nobr></td>
802
+ <td style="text-align: center;"><nobr>{{row.f_paper_account}}</nobr></td>
803
+ <td style="text-align: center;"><nobr>{{row.f_paper_type}}</nobr></td>
804
+ <td style="text-align: center;"><nobr>{{row.f_email}}</nobr></td>
769
805
  <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
806
+ <td style="text-align: center;"><nobr>{{row.f_customer}}</nobr></td>
807
+ <td style="text-align: center;"><nobr>{{row.f_unit_name}}</nobr></td>
808
+ <td style="text-align: center;"><nobr>{{row.f_last_check_date}}</nobr></td>
809
+ <td style="text-align: center;"><nobr>{{row.f_last_check_result}}</nobr></td>
770
810
  </template>
771
811
  <template partial='foot'>
772
812
 
@@ -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" @sort="sort" v-ref:paged>
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">
@@ -267,7 +267,8 @@
267
267
  <nobr>所属年月</nobr>
268
268
  </th>
269
269
  <th>
270
- <nobr>录入日期</nobr>
270
+ <data-order field="f_input_date" name="录入日期"
271
+ :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
271
272
  </th>
272
273
  <th>
273
274
  <nobr>客户类型</nobr>
@@ -514,7 +515,12 @@
514
515
  other:[],
515
516
  footer:[],
516
517
  data: {},
517
- model: new PagedList('api/af-revenue/sql/webhandplanQuery', 20, {startDate: 'this.model.handStartDate', endDate: 'this.model.handEndDate'}, {
518
+ orderitem:'f_input_date desc',
519
+ model: new PagedList('api/af-revenue/sql/webhandplanQuery', 20, {
520
+ startDate: 'this.model.handStartDate',
521
+ endDate: 'this.model.handEndDate',
522
+ orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_input_date desc'`
523
+ }, {
518
524
  f_oughtamount: 0,
519
525
  f_oughtfee: 0
520
526
  }),
@@ -523,6 +529,9 @@
523
529
  dep:[],
524
530
  user:[],
525
531
  },
532
+ orderFields: {
533
+ f_input_date: 'no'
534
+ },
526
535
  show:false,
527
536
  rowdata:{},
528
537
  criteriaShow: false,
@@ -573,6 +582,23 @@
573
582
  })
574
583
  },
575
584
  methods: {
585
+ sort (field, rule) {
586
+ // 将所有排序方式设为不排序,实现相互排斥
587
+ for (let key in this.orderFields) {
588
+ if (key === field) {
589
+ this.orderFields[key] = rule
590
+ } else {
591
+ this.orderFields[key] = 'no'
592
+ }
593
+ }
594
+ // 如果新规则不排序,还原为默认排序
595
+ if (rule === 'no') {
596
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
597
+ } else {
598
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
599
+ }
600
+ this.search()
601
+ },
576
602
  getuuid(){
577
603
  let uuidA = '';
578
604
  var s = [];
@@ -919,7 +945,9 @@
919
945
  return {
920
946
  startDate: this.$refs.paged.$refs.cri.model.startDate,
921
947
  endDate: this.$refs.paged.$refs.cri.model.endDate,
922
- condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr }
948
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
949
+ orderitem: this.orderitem ? `${this.orderitem}` : " f_input_date desc"
950
+ }
923
951
  },
924
952
  getfield() {
925
953
  return exportConfig.webhandplanConfig
@@ -37,7 +37,9 @@ export default{
37
37
  'f_balance_amount': '表剩余金额', 'f_times': '写卡次数', 'f_defendcard': '防盗卡号1', 'f_defendcard_two': '防盗卡号2',
38
38
  'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
39
39
  , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
40
- 'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控'
40
+ 'f_customer': '团缴号', 'f_unit_name': '团缴名称', 'f_last_check_date': '最后安检时间', 'f_last_check_result': '安检情况',
41
+ 'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控',
42
+ 'f_taxpayer_id': '纳税人识别号', 'f_paper_name': '纳税人名称', 'f_address_phone': '地址电话', 'f_paper_account': '开户行及账号', 'f_paper_type': '票据类型', 'f_email': '推送票据邮箱'
41
43
  },
42
44
  chargeConfig: {
43
45
  'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',