manage-client 3.3.41 → 3.3.42

package/src/filiale/shexian/ChangeMeterQuery.vue

@@ -275,6 +275,12 @@
                 <th>
                   <nobr>新气表品牌</nobr>
                 </th>
+                <th>
+                  <nobr>旧气表型号</nobr>
+                </th>
+                <th>
+                  <nobr>新气表型号</nobr>
+                </th>
                 <th>
                   <nobr>补气量</nobr>
                 </th>
@@ -367,6 +373,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_style_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_style}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_remanent_gas}}</nobr>
               </td>

package/src/filiale/shexian/config/exportConfig.js

@@ -657,6 +657,8 @@ export default {
     'f_meternumber': '新表号',
     'f_meter_brand_old': '旧气表品牌',
     'f_meter_brand': '新气表品牌',
+    'f_meter_style_old': '旧气表型号',
+    'f_meter_style': '新气表型号',
     'f_remanent_gas': '补气量',
     'f_remanent_money': '补气金额',
     'f_comments': '备注',

package/src/main.js

@@ -1,68 +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 ShanXianSaleManage from './filiale/shanxian/sale'
-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()
-ShanXianSaleManage()
-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 ShanXianSaleManage from './filiale/shanxian/sale'
+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()
+ShanXianSaleManage()
+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/saleManage.js

@@ -645,4 +645,16 @@ export default function () {
   Vue.component('print-sheet-query', (resolve) => {
     require(['./components/sale/businessquery/printSheetQuery'], resolve)
   })
+  // 企业综合
+  Vue.component('enterprise-compre', (resolve) => {
+    require(['./components/sale/enterprisequery/enterpriseManage'], resolve)
+  })
+  // 企业收费查询
+  Vue.component('enterprise-charge-query', (resolve) => {
+    require(['./components/sale/enterprisequery/enterpriseChargeQuery'], resolve)
+  })
+  // 企业用气查询
+  Vue.component('enterprise-gas-query', (resolve) => {
+    require(['./components/sale/enterprisequery/enterpriseGasQuery'], resolve)
+  })
 }