manage-client-xy 3.2.13 → 3.2.15

package/build/dev-server.js

@@ -1,26 +1,26 @@
-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')
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+// const httpProxy = require('http-proxy')
 
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
+const app = express()
+const compiler = webpack(config)
+// const 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 bendi = 'http://127.0.0.1:8888/'
-  , fuwu = 'http://172.16.16.163:8300/'
+// const bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
+const bendi = 'http://127.0.0.1:8888/'
+const fuwu = 'http://192.168.153.129:8300'
 // ,fuwu = 'http://172.16.16.163:8300/'
-var proxyTable = {
+const proxyTable = {
   '/resource': {
     target: 'http://192.168.13.135:31577/'
   },
 
   '/rs/logic/exportfile': {
-    target: bendi
+    target: fuwu
   },
   '/rs/logic/saleExport': {
     target: fuwu
@@ -31,8 +31,11 @@ var proxyTable = {
   '/files': {
     target: fuwu
   },
+  '/webapps': {
+    target: fuwu
+  },
   '/rs/sql': {
-    target: bendi
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/search': {
@@ -75,7 +78,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: bendi
+    target: fuwu
   },
   '/rs/vue': {
     target: fuwu
@@ -91,7 +94,7 @@ var proxyTable = {
   }
 }
 
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: config.output.publicPath,
   stats: {
     colors: true,
@@ -99,7 +102,7 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
   }
 })
 
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
+const 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) {
@@ -110,7 +113,7 @@ compiler.plugin('compilation', function (compilation) {
 
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
+  let options = proxyTable[context]
   if (typeof options === 'string') {
     options = {target: options}
   }

package/package.json

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

package/src/components/sale/businessquery/CMHGasQuery.vue

@@ -72,7 +72,7 @@
                   <v-select :value.sync="model.opType"
                             :search="false"
                             :options='$parent.$parent.opType' placeholder='请选择' v-model="model.opType"
-                            condition="f_operat_type = '{}'"
+                            condition="tsb.f_operat_type = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">

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

@@ -117,9 +117,32 @@ export default {
   },
 
   changemeterConfig: {
-    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_meternumber': '表号',
-    'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_using_base_old': '旧表底数', 'f_remanent_gas': '补气量',
-    'f_state': '状态', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
+    'f_address': '客户地址',
+    'f_meternumber': '表号',
+    'f_type': '换表类型',
+    'f_changemeter_fee': '换表费',
+    'f_using_base_old': '旧表底数',
+    'f_remanent_gas': '补气量',
+    'f_state': '状态',
+    'f_comments': '备注',
+    'f_operator': '操作员',
+    'f_depname': '部门',
+    'f_orgname': '公司',
+    'f_operate_date': '换表日期',
+    'f_meternumber_old': '旧表号',
+    'f_meter_brand_old': '旧气表品牌',
+    'f_meter_brand': '新气表品牌',
+    'f_imei': '新表识别码',
+    'f_old_imei': '旧表识别码',
+    'f_initial_base_new': '新表初始底数',
+    'f_oldodd_gas': '余气',
+    'f_remanent_money': '补气金额',
+    'f_voucher_number': '票号',
+    'f_change_operator': '换表人',
+    'f_approve_operator': '审批人',
+    'f_outlets': '网点'
   },
 
   otherchargeConfig: {

package/src/main.js

@@ -3,9 +3,9 @@ import App from './App'
 import { all } from 'vue-client'
 import { system } from 'system-clients'
 // import { sale } from 'sale-client'
-// import saleManage from './saleManage'
+import saleManage from './saleManage'
 // import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
+// import reportManage from './reportManage'
 // import newmanage from './newmanage'
 // import ManageHome from './ManageHome'
 import echarts from 'echarts'
@@ -40,11 +40,11 @@ Vue.prototype.$echarts = echarts
 all()
 // sale()
 system(false)
-// saleManage()
+saleManage()
 // webmeterManage()
 // ManageHome()
 // newmanage()
-reportManage()
+// reportManage()
 require('./bootstrap/less/bootstrap.less')
 require('./bootstrap/less/manageStyle/manageStyle.less')
 require('./bootstrap/less/manageStyle/manageChile.less')