manage-client 3.2.282 → 3.2.284

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()

package/src/main.js

@@ -1,66 +1,68 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import reportManageF from './filiale/xinkang/reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+reportManageF()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+