manage-client 3.2.229 → 3.2.231

package/src/filiale/WEINAN/sale.js

@@ -30,6 +30,8 @@ let specialComp = {
   'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
   // 停用查询
   'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
+  // 客户查询
+  'user-query':(resolve) => {require(['./UserQuery.vue'], resolve)},
   // 销户查询
   'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
   // 汇总查询

package/src/filiale/wuhai/ReportList.vue

@@ -176,12 +176,12 @@
                 <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
-                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionTotal}}</nobr></th>
-                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeTotalForDay}}</nobr></th>
-                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionFlow}}</nobr></th>
-                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeFlow}}</nobr></th>
-                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterTemperatureState}}</nobr></th>
-                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterPressureState}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardconditiontotal}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingmodetotalforday}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardconditionflow}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingmodeflow}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmetertemperaturestate}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterpressurestate}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>
 
 

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("wuhai")
-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("WEINAN")
+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/reportManage.js

@@ -688,6 +688,10 @@ export default function (filiale) {
   Vue.component('apply-Hunum', (resolve) => {
     require(['./components/SellReport/applyHunum'], resolve)
   })
+  // 乌海区域商业报表
+  Vue.component('shangye-num', (resolve) => {
+    require(['./components/SellReport/shangyenum'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale