manage-client 3.2.282 → 3.2.283

package/src/filiale/xinkang/reportManage.js

@@ -8,4 +8,7 @@ export default function () {
   Vue.component('data-acquisition-type', (resolve) => { require(['./DataAcquisitionType'], resolve) })
   // 首页图表
   Vue.component('echarts-box', (resolve) => { require(['./EchartsBox'], resolve) })
+  // 新增用户散列图
+  Vue.component('bank-manager', (resolve) => { require(['./BankManager'], resolve) })
+
 }

package/src/filiale/xinkang/sale.js

@@ -8,4 +8,6 @@ export default function () {
   // 综合档案查询
   Vue.component('record-info-query', (resolve) => { require(['./RecordInfoQuery'], resolve) })
   Vue.component('user-query', (resolve) => { require(['./UserQuery'], resolve) })
+  // 表品牌户数统计
+  Vue.component('brand-house-count', (resolve) => { require(['./ManageBrandHouseCount'], resolve) })
 }

package/src/filiale/yuansheng/DayReportList.vue

@@ -291,7 +291,7 @@ export default {
       depname: '',
       criteriaShow: false,
       operates: [{label: '全部', value: ''}, {label: '发卡售气', value: "发卡售气"},{label: '卡表收费', value: "卡表收费"},{label: '补气', value: "补气"},{label: '补卡', value: "补卡"},{label: '换表', value: "换表"},{label: '冲正', value: "冲正"},{label: '物联网收费', value: "物联网收费"}],
-      paymentchannels: [{label: '全部', value: ''},{label: '营业厅', value: "not in ('支付宝','微信公众号')"},{label: '支付宝', value: " = '支付宝'"},{label: '微信公众号', value: "= '微信公众号'"}],
+      paymentchannels: [{label: '全部', value: ''},{label: '营业厅', value: "not in ('支付宝','微信支付')"},{label: '支付宝', value: " = '支付宝'"},{label: '微信支付', value: "= '微信支付'"}],
       // hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
       totalCount: 0
     }
@@ -301,6 +301,7 @@ export default {
     this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
     this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
     this.$refs.paged.$refs.cri.model.f_type = ['卡表收费','物联网收费','发卡售气']
+    this.$refs.paged.$refs.cri.model.f_state = ['有效']
     this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
     this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
     // this.search()