manage-client 3.3.39 → 3.3.42-1

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

@@ -6,9 +6,11 @@ import { all } from 'vue-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 webmeterManageQianNeng from './filiale/qianneng/webmeterManage'
+import reportManageQianNeng from './filiale/qianneng/reportManage'
+import saleManageQianNeng from './filiale/qianneng/sale'
 import newmanage from './newmanage'
 import ManageHome from './ManageHome'
 import echarts from 'echarts'
@@ -46,11 +48,13 @@ ldap()
 system(false)
 
 saleManage()
-ShanXianSaleManage()
 webmeterManage()
 ManageHome()
 newmanage()
 reportManage()
+webmeterManageQianNeng()
+reportManageQianNeng()
+saleManageQianNeng()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')

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)
+  })
 }