manage-client 3.2.205 → 3.2.207

package/build/dev-server.js

@@ -1,190 +1,190 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://119.146.1.106:8300/'
-var qtx= 'http://36.103.222.144:6300/'
-// var bendi = 'http://220.194.141.253:8600/'
-// var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
-var bendi = 'http://172.168.1.11:8400/#'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var system = 'http://192.168.50.4:8400'
-// 192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: bendi
-  },
-  // '/rs/sql/otherChargeQuery': {
-  //   target: 'http://localhost:8080/'
-  // },
-  // '/rs/sql/BusinessType': {
-  //   target: 'http://localhost:8080/'
-  // },
-  // '/rs/logic/getBatchOperaPro': {
-  //   target: 'http://localhost:8080/'
-  // },
-  // '/rs/customExport/areaChargeExportExcel': {
-  //   target: 'http://localhost:8080/'
-  // },
-  '/files': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: bendi
-  },
-  '/rs/logic/getSaleInitData': {
-    target: bendi
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: bendi
-  },
-  '/rs/path/getParams': {
-    target: bendi
-  },
-  '/rs/data': {
-    target: bendi
-  },
-  '/rs/license': {
-    target: bendi
-  },
-  '/rs/db': {
-    target: bendi
-  },
-  '/excel': {
-    target: bendi
-  },
-  '/rs/config': {
-    target: bendi
-  },
-  '/rs/sql/getLicenseById': {
-    target: bendi
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: bendi
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
+var shaoguan = 'http://119.146.1.106:8300/'
+var qtx= 'http://36.103.222.144:6300/'
+// var bendi = 'http://220.194.141.253:8600/'
+// var bendi = 'http://203.57.101.233:9001'
+// var bendi = 'http://172.168.1.11:9001/'
+var bendi = 'http://203.57.101.233:8400/'
+// var bendi = 'http://121.36.106.17:8400/'
+// var fuwu = 'http://203.57.101.233:9001'
+var system = 'http://192.168.50.4:8400'
+// 192.168.
+//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
+// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  // '/rs/sql/otherChargeQuery': {
+  //   target: 'http://localhost:8080/'
+  // },
+  // '/rs/sql/BusinessType': {
+  //   target: 'http://localhost:8080/'
+  // },
+  // '/rs/logic/getBatchOperaPro': {
+  //   target: 'http://localhost:8080/'
+  // },
+  // '/rs/customExport/areaChargeExportExcel': {
+  //   target: 'http://localhost:8080/'
+  // },
+  '/files': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: bendi
+  },
+  '/rs/logic/getSaleInitData': {
+    target: bendi
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: bendi
+  },
+  '/rs/path/getParams': {
+    target: bendi
+  },
+  '/rs/data': {
+    target: bendi
+  },
+  '/rs/license': {
+    target: bendi
+  },
+  '/rs/db': {
+    target: bendi
+  },
+  '/excel': {
+    target: bendi
+  },
+  '/rs/config': {
+    target: bendi
+  },
+  '/rs/sql/getLicenseById': {
+    target: bendi
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: bendi
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.205",
+  "version": "3.2.207",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/config/exportConfig.js

@@ -207,24 +207,26 @@ export default{
   },
   compreConfig: {
     'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
-    'f_residential_area': '小区名称', 'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_usetype': '使用类型',
-    'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '气表类型', 'f_meter_brand': '气表品牌',
-    'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '左右表', 'f_install_date': '安装日期', 'f_meter_base': '气表底数',
+    'f_residential_area': '小区名称', 'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号', 'f_address': '详细地址',
+    'f_user_phone': '联系电话', 'f_usetype': '使用类型',
+    'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
+    'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '表向', 'f_install_date': '气表安装日期', 'f_meter_base': '气表底数',
     'f_balance': '账户余额', 'f_hand_date': '最后抄表日期', 'f_whether_hairpin': '是否发卡',
     'f_valve_state': '阀门状态', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'value': '气价详情',
-    'f_open_date': '开户时间', 'f_credentials': '证件类型', 'f_idnumber': '证件号码', 'f_people_num': '人口数', 'f_ins_stop_date': '保险结束日期',
+    'f_open_date': '开户时间', 'f_credentials': '证件类型', 'f_idnumber': '身份证号', 'f_people_num': '人口数', 'f_ins_stop_date': '保险结束日期',
     'f_createfile_date': '建档日期', 'f_createfile_person': '建档人', 'f_depname': '所属营业厅', 'f_comments': '备注信息',
     'f_used_name': '曾用名', 'f_rent_phone': '备用电话', 'f_rent_name': '租户姓名', 'f_zuhu_phone': '租户电话',
-    'f_contract_id': '发票编码', 'f_is_mgq': '是否煤改气', 'f_send_usegas_card': '是否发放天然气使用证',
-    'f_meter_style': '气表型号', 'f_table_state': '表状态', 'f_initial_base': '初始气表底数',
+    'f_contract_id': '供气合同编号', 'f_is_mgq': '是否煤改气', 'f_send_usegas_card': '是否发放天然气使用证',
+    'f_meter_style': '型号', 'f_table_state': '表具状态', 'f_initial_base': '初始气表底数',
     'f_total_usegas_amount': '累计用气金额', 'f_total_gas': '表累购气量', 'f_total_fee': '表累购金额', 'f_inputtor': '档案抄表员',
     'f_book_inputtor': '表册抄表员',
-    'f_userfiles_address': '安装地址', 'f_install_person': '安装人', 'f_gas_person': '通气人',
+    'f_userfiles_address': '安装地址', 'f_install_person': '安装人', 'f_gas_person': '通气人员',
     'f_meter_book_num': '抄表册编号', 'f_meter_book_sort': '抄表册顺序',
     'f_balance_amount': '表剩余金额', 'f_times': '写卡次数',
-    'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
-    , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
-    'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控'
+    'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型',
+    'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
+    'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控',
+    'f_defendcard': '防盗卡号', 'f_factory_date': '生产年月'
   },
 
   compreConfigGY: {