manage-client 3.2.104 → 3.2.105

package/src/filiale/qianneng/sale.js

@@ -5,7 +5,11 @@ let specialComp = {
   'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
   'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
   // 表具查询
-  'meter-query': (resolve) => { require(['./MeterQuery'], resolve) }
+  'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
+  // 用户查询
+  'user-query': (resolve) => { require(['./UserQuery'], resolve) },
+  'business-manage': (resolve) => { require(['./BusinessManage'], resolve) }
+
 }
 exports.specialComp = specialComp
 

package/src/filiale/shaoguan/TransferQuery.vue

@@ -231,7 +231,7 @@
         footer:[],
         show:false,
         rowdata:{},
-        model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0}),
+        model: new PagedList('rs/sql/transferQuery', 20,  {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{f_transfer_fees: 0}),
         criteriaShow: false,
         initres: {
           org:[this.$login.f.orgid],
@@ -249,7 +249,10 @@
         tfoot: '',
         showupload:false,
         selected:{},
-
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         transferstate: this.$appdata.getParam('过户状态') ? [{
           label: '全部',
           value: ''
@@ -393,7 +396,9 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: `'f_operate_date desc'` }
       },
       getfield() {
         return exportConfig.transferConfig

package/src/main.js

@@ -1,66 +1,66 @@
-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 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 }
+})
+

package/src/webmeterManage.js

@@ -1,121 +1,121 @@
-import Vue from 'vue'
-
-import echarts from 'echarts'
-import MagLoadParams from './stores/MagLoadParams'
-import MagGetSaleParam from './stores/MagGetSaleParams'
-
-/** **************************收费组件注册******************************/
-
-export default function (filiale) {
-  Vue.prototype.$echarts = echarts
-  Vue.use(MagLoadParams)
-  Vue.use(MagGetSaleParam)
-  // 物联查询
-  Vue.component('webmeter-query', (resolve) => { require(['./components/webmeter/WebmeterQuery'], resolve) })
-  // 物联分析
-  Vue.component('webmeter-analyse', (resolve) => { require(['./components/webmeter/WebmeterAnalyse'], resolve) })
-  // 数据采集
-  Vue.component('data-collection', (resolve) => {
-    require(['./components/webmeter/dataCollection/DataCollection'], resolve)
-  })
-
-  /** **************************指标统计**********************************/
-  // 指标统计主页
-  Vue.component('indicator-statistics-main', (resolve) => { require(['./components/webmeter/indicatorStatisticsMain'], resolve) })
-  // 指标统计图表
-  Vue.component('indicator-statistics-echars', (resolve) => { require(['./components/webmeter/indicatorStatisticsEchars'], resolve) })
-
-  // 用气分析明细查询
-  Vue.component('new-webmeter-user-gas-all', (resolve) => { require(['./components/webmeter/DrillData/UserGasAll'], resolve) })
-  // 用气分析汇总查询
-  Vue.component('user-gas-eform', (resolve) => { require(['./components/webmeter/DrillData/UserGasEform'], resolve) })
-  // 用气分析图表分析
-  Vue.component('user-gas-echarts', (resolve) => { require(['./components/webmeter/DrillData/UserGasEcharts'], resolve) })
-  // 失联分析明细查询
-  Vue.component('lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysis'], resolve) })
-
-  // 失联查询页面
-  Vue.component('lost-contact-analysis-manage', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisManage'], resolve) })
-  // 用户失联
-  Vue.component('user-lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/UserLostContactAnalysis'], resolve) })
-  // 失联查询
-  Vue.component('lost-contact-analysis-list', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisList'], resolve) })
-
-  // 失联分析图表分析
-  Vue.component('lost-contact-echarts', (resolve) => { require(['./components/webmeter/DrillData/LostContactEcharts'], resolve) })
-  // 失联分析Eform
-  Vue.component('lost-contact-eform', (resolve) => { require(['./components/webmeter/DrillData/LostContactEform'], resolve) })
-
-  // 异常汇总分析
-  Vue.component('total-exception-by-meter', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/TotalExceptionByMeter'], resolve) })
-  // 异常汇总分析
-  Vue.component('meter-exception-list', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/MeterExceptionList'], resolve) })
-  // 异常汇总分析汇总
-  Vue.component('new-exception-eform-total', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEformTotal'], resolve) })
-  // 异常分析明细查询
-  Vue.component('new-meter-exception', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewMeterException'], resolve) })
-  // 异常分析明细汇总
-  Vue.component('new-exception-eform', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEform'], resolve) })
-  // 异常分析通用图表
-  Vue.component('new-exception-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEcharsTotal'], resolve) })
-
-  // 上报统计分析--抄表分析
-  Vue.component('user-gas-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasList'], resolve) })
-  // 用气分析图表分析（抄表）
-  Vue.component('user-gas-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasEchartsList'], resolve) })
-
-  // 上报统计分析--指令分析
-  Vue.component('user-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructList'], resolve) })
-  // 指令分析图表分析
-  Vue.component('user-instruct-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructEchartsList'], resolve) })
-  // 上报统计分析--指令分析
-  Vue.component('price-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructList'], resolve) })
-  // 指令分析图表分析
-  Vue.component('price-instruct-detail', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructDetail'], resolve) })
-  // 指令分析图表分析
-  Vue.component('price-instruct-manage', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructManage'], resolve) })
-  //
-  // 标记分析主表
-  Vue.component('sign-analysis-list-main', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisListMain'], resolve) })
-  // 标记分析图表
-  Vue.component('sign-analysis-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEcharts'], resolve) })
-  // 标记分析汇总
-  Vue.component('sign-analysis-eform', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEform'], resolve) })
-  // 数据采集
-  Vue.component('new-webmeter-hand-plan-main', (resolve) => { require(['./components/webmeter/handplan/NewWebmeterHandPlanMain'], resolve) })
-  // 数据采集
-  Vue.component('new-webmeter-handplan', (resolve) => { require(['./components/webmeter/handplan/NewWebMeterHandPlan'], resolve) })
-
-// 物联网表大屏分析
-  Vue.component('planned-security-inspection-analysis', (resolve) => { require(['./components/webmeter/DrillData/LargeScreenAnalysisEcharts'], resolve) })
-// 上报查询
-  Vue.component('report-list', (resolve) => { require(['./components/webmeter/report/reportList'], resolve) })
-  // =========================================物联网表==========================================================
-  // 表具查看
- //  Vue.component('web-meter-Manage', (resolve) => { require(['./components/webmeter/meterinfo/NewMeterListMain'], resolve) })
- //  Vue.component('new-meter-list', (resolve) => { require(['./components/webmeter/meterinfo/NewMeterList'], resolve) })
-  // 指令查看
-  Vue.component('instruct-manage', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstructMain'], resolve) })
-  Vue.component('new-query-instruct', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstruct'], resolve) })
-  // 物联网表上报数据查询
-  Vue.component('report-data-query', (resolve) => { require(['./components/webmeter/reportdata/ReportDataQuery'], resolve) })
-  // 充值指令查询
-  Vue.component('recharge-instruct-query', (resolve) => { require(['./components/webmeter/recharge/RechargeList'], resolve) })
-  // 物联网表用气量统计表
-  Vue.component('use-gas-statistics', (resolve) => { require(['./components/webmeter/gasStatistics/GasStatistics'], resolve) })
-  // 物联网表欠费查询
-  Vue.component('arrearage-query', (resolve) => { require(['./components/webmeter/newwebmeter/ArrearageQuery'], resolve) })
-  // 未上报查询
-  Vue.component('get-no-meteread-query', (resolve) => { require(['./components/webmeter/DrillData/GetNoMetereadData'], resolve) })
-  // 物联网表结算分析
-  Vue.component('webmeter-settlement-analysis', (resolve) => { require(['./components/webmeter/gasAnalysis/WebmeterSettlementAnalysis'], resolve) })
-
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-    Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
-
+import Vue from 'vue'
+
+import echarts from 'echarts'
+import MagLoadParams from './stores/MagLoadParams'
+import MagGetSaleParam from './stores/MagGetSaleParams'
+
+/** **************************收费组件注册******************************/
+
+export default function (filiale) {
+  Vue.prototype.$echarts = echarts
+  Vue.use(MagLoadParams)
+  Vue.use(MagGetSaleParam)
+  // 物联查询
+  Vue.component('webmeter-query', (resolve) => { require(['./components/webmeter/WebmeterQuery'], resolve) })
+  // 物联分析
+  Vue.component('webmeter-analyse', (resolve) => { require(['./components/webmeter/WebmeterAnalyse'], resolve) })
+  // 数据采集
+  Vue.component('data-collection', (resolve) => {
+    require(['./components/webmeter/dataCollection/DataCollection'], resolve)
+  })
+
+  /** **************************指标统计**********************************/
+  // 指标统计主页
+  Vue.component('indicator-statistics-main', (resolve) => { require(['./components/webmeter/indicatorStatisticsMain'], resolve) })
+  // 指标统计图表
+  Vue.component('indicator-statistics-echars', (resolve) => { require(['./components/webmeter/indicatorStatisticsEchars'], resolve) })
+
+  // 用气分析明细查询
+  Vue.component('new-webmeter-user-gas-all', (resolve) => { require(['./components/webmeter/DrillData/UserGasAll'], resolve) })
+  // 用气分析汇总查询
+  Vue.component('user-gas-eform', (resolve) => { require(['./components/webmeter/DrillData/UserGasEform'], resolve) })
+  // 用气分析图表分析
+  Vue.component('user-gas-echarts', (resolve) => { require(['./components/webmeter/DrillData/UserGasEcharts'], resolve) })
+  // 失联分析明细查询
+  Vue.component('lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysis'], resolve) })
+
+  // 失联查询页面
+  Vue.component('lost-contact-analysis-manage', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisManage'], resolve) })
+  // 用户失联
+  Vue.component('user-lost-contact-analysis', (resolve) => { require(['./components/webmeter/DrillData/UserLostContactAnalysis'], resolve) })
+  // 失联查询
+  Vue.component('lost-contact-analysis-list', (resolve) => { require(['./components/webmeter/DrillData/LostContactAnalysisList'], resolve) })
+
+  // 失联分析图表分析
+  Vue.component('lost-contact-echarts', (resolve) => { require(['./components/webmeter/DrillData/LostContactEcharts'], resolve) })
+  // 失联分析Eform
+  Vue.component('lost-contact-eform', (resolve) => { require(['./components/webmeter/DrillData/LostContactEform'], resolve) })
+
+  // 异常汇总分析
+  Vue.component('total-exception-by-meter', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/TotalExceptionByMeter'], resolve) })
+  // 异常汇总分析
+  Vue.component('meter-exception-list', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/MeterExceptionList'], resolve) })
+  // 异常汇总分析汇总
+  Vue.component('new-exception-eform-total', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEformTotal'], resolve) })
+  // 异常分析明细查询
+  Vue.component('new-meter-exception', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewMeterException'], resolve) })
+  // 异常分析明细汇总
+  Vue.component('new-exception-eform', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEform'], resolve) })
+  // 异常分析通用图表
+  Vue.component('new-exception-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/NewExceptionEcharsTotal'], resolve) })
+
+  // 上报统计分析--抄表分析
+  Vue.component('user-gas-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasList'], resolve) })
+  // 用气分析图表分析（抄表）
+  Vue.component('user-gas-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserGasEchartsList'], resolve) })
+
+  // 上报统计分析--指令分析
+  Vue.component('user-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructList'], resolve) })
+  // 指令分析图表分析
+  Vue.component('user-instruct-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructEchartsList'], resolve) })
+  // 上报统计分析--指令分析
+  Vue.component('price-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructList'], resolve) })
+  // 指令分析图表分析
+  Vue.component('price-instruct-detail', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructDetail'], resolve) })
+  // 指令分析图表分析
+  Vue.component('price-instruct-manage', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructManage'], resolve) })
+  //
+  // 标记分析主表
+  Vue.component('sign-analysis-list-main', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisListMain'], resolve) })
+  // 标记分析图表
+  Vue.component('sign-analysis-echarts', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEcharts'], resolve) })
+  // 标记分析汇总
+  Vue.component('sign-analysis-eform', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisEform'], resolve) })
+  // 数据采集
+  Vue.component('new-webmeter-hand-plan-main', (resolve) => { require(['./components/webmeter/handplan/NewWebmeterHandPlanMain'], resolve) })
+  // 数据采集
+  Vue.component('new-webmeter-handplan', (resolve) => { require(['./components/webmeter/handplan/NewWebMeterHandPlan'], resolve) })
+
+// 物联网表大屏分析
+  Vue.component('planned-security-inspection-analysis', (resolve) => { require(['./components/webmeter/DrillData/LargeScreenAnalysisEcharts'], resolve) })
+// 上报查询
+  Vue.component('report-list', (resolve) => { require(['./components/webmeter/report/reportList'], resolve) })
+  // =========================================物联网表==========================================================
+  // 表具查看
+ //  Vue.component('web-meter-Manage', (resolve) => { require(['./components/webmeter/meterinfo/NewMeterListMain'], resolve) })
+ //  Vue.component('new-meter-list', (resolve) => { require(['./components/webmeter/meterinfo/NewMeterList'], resolve) })
+  // 指令查看
+  Vue.component('instruct-manage', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstructMain'], resolve) })
+  Vue.component('new-query-instruct', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstruct'], resolve) })
+  // 物联网表上报数据查询
+  Vue.component('report-data-query', (resolve) => { require(['./components/webmeter/reportdata/ReportDataQuery'], resolve) })
+  // 充值指令查询
+  Vue.component('recharge-instruct-query', (resolve) => { require(['./components/webmeter/recharge/RechargeList'], resolve) })
+  // 物联网表用气量统计表
+  Vue.component('use-gas-statistics', (resolve) => { require(['./components/webmeter/gasStatistics/GasStatistics'], resolve) })
+  // 物联网表欠费查询
+  Vue.component('arrearage-query', (resolve) => { require(['./components/webmeter/newwebmeter/ArrearageQuery'], resolve) })
+  // 未上报查询
+  Vue.component('get-no-meteread-query', (resolve) => { require(['./components/webmeter/DrillData/GetNoMetereadData'], resolve) })
+  // 物联网表结算分析
+  Vue.component('webmeter-settlement-analysis', (resolve) => { require(['./components/webmeter/gasAnalysis/WebmeterSettlementAnalysis'], resolve) })
+
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
+    Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}
+

package/build/tmp/jar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-