manage-client 3.3.200 → 3.3.202

package/src/filiale/meihekou/UserSellHeadDetail.vue

@@ -110,15 +110,15 @@
                 <th>
                   <nobr>气表类型</nobr>
                 </th>
-                <th>
-                  <nobr>用气量</nobr>
-                </th>
-                <th>
-                  <nobr>单价</nobr>
-                </th>
-                <th>
-                  <nobr>用气金额</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>用气量</nobr>-->
+<!--                </th>-->
+<!--                <th>-->
+<!--                  <nobr>单价</nobr>-->
+<!--                </th>-->
+<!--                <th>-->
+<!--                  <nobr>用气金额</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>应收</nobr>
                 </th>
@@ -158,15 +158,15 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_classify}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_price}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_money}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_gas}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_price}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_money}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_preamount}}</nobr>
               </td>

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

@@ -266,10 +266,9 @@ export default{
     'f_userinfo_code': '用户编号','f_user_name': '用户姓名','f_user_type': '用户类型','f_meter_classify': '气表类型','f_gas': '用气量','f_price': '单价','f_money': '用气金额','f_preamount': '应收','f_collection': '实收','f_operate_date': '收费时间','f_balance': '上期结余','f_curbalance': '本期结余','f_user_phone': '电话','f_address': '地址','f_user_state': '用户状态'
   },
   UserSellHeadDetailConfig: {
-    'f_userinfo_code': '用户编号','f_user_name':'用户名称','f_address':'用户地址', 'f_balance': '期初余额',
-    'f_collection':'实收金额','f_m_fee':'免交金额','f_t_fee':'退费','f_b_fee':'补费','f_k_fee':'扣费',
-    'f_oughtamount':'应收气费','f_debt_money':'已收气费','f_w_money':'未收气费','f_delaypay':'已收违约金',
-    'f_reduction_fee':'违约金减免','f_h_fee':'超用收费','f_curbalance':'期末余额','f_x_balance':'最新余额'
+    'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名', 'f_user_type': '用户类型', 'f_meter_classify': '气表类型',
+    'f_preamount': '应收', 'f_collection': '实收', 'f_operate_date': '收费时间', 'f_balance': '上期结余', 'f_curbalance': '本期结余',
+    'f_user_phone': '电话', 'f_address': '地址', 'f_user_state': '用户状态'
   },
   TransactionSummaryConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_type': '类型', 'f_price': '气价',

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/yangchun/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/ningjin/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 }
+})
+