address-client 3.2.41 → 3.2.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,162 +1,162 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- var httpProxy = require('http-proxy')
6
-
7
- var app = express()
8
- var compiler = webpack(config)
9
- var proxy = httpProxy.createProxyServer()
10
-
11
- // Define HTTP proxies to your custom API backend
12
- // https://github.com/chimurai/http-proxy-middleware
13
- var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
14
- var str3= 'https://qnjtkf.cn:7400'
15
- var proxyTable = {
16
- '/rs/sql':{
17
- target: str3,
18
- secure:true,
19
- changeOrigin:true
20
- // target: 'http://127.0.0.1:8080'
21
- },
22
- '/webapps':{
23
- target: str3,
24
- secure:true,
25
- changeOrigin:true
26
- // target: 'http://127.0.0.1:8080'
27
- },
28
- '/rs/logic/getLogin': {
29
- target: str3,
30
- secure:true,
31
- changeOrigin:true
32
- },
33
- '/rs/logic/getInitData': {
34
- target: str3,
35
- secure:true,
36
- changeOrigin:true,
37
- },
38
- '/rs/logic/getSaleInitData': {
39
- target: str3,
40
- secure:true,
41
- changeOrigin:true
42
- },
43
- '/rs/logic':{
44
- target: str3,
45
- secure:true,
46
- changeOrigin:true
47
- // target: 'http://127.0.0.1:8080'
48
- },
49
- '/rs/vue': {
50
- target: str3,
51
- secure:true,
52
- changeOrigin:true
53
- },
54
- '/rs/user': {
55
- target: str3,
56
- secure:true,
57
- changeOrigin:true
58
- },
59
- '/rs/db': {
60
- target: str3,
61
- secure:true,
62
- changeOrigin:true
63
- },
64
- '/rs/search': {
65
- target: str3,
66
- secure:true,
67
- changeOrigin:true
68
- // target: 'http://127.0.0.1:8080'
69
- },
70
- '/rs/data': {
71
- target: str3,
72
- secure:true,
73
- changeOrigin:true
74
- },
75
- '/rs': {
76
- // target: 'http://192.168.50.199:8300'
77
- target: str3,
78
- secure:true,
79
- changeOrigin:true
80
- }
81
- }
82
-
83
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
84
- publicPath: config.output.publicPath,
85
- stats: {
86
- colors: true,
87
- chunks: false
88
- }
89
- })
90
-
91
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
92
- // force page reload when html-webpack-plugin template changes
93
- compiler.plugin('compilation', function (compilation) {
94
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
95
- hotMiddleware.publish({ action: 'reload' })
96
- cb()
97
- })
98
- })
99
-
100
- // proxy api requests
101
- Object.keys(proxyTable).forEach(function (context) {
102
- var options = proxyTable[context]
103
- if (typeof options === 'string') {
104
- options = { target: options }
105
- }
106
- app.use(proxyMiddleware(context, options))
107
- })
108
-
109
- // handle fallback for HTML5 history API
110
- app.use(require('connect-history-api-fallback')())
111
-
112
- // serve webpack bundle output
113
- app.use(devMiddleware)
114
-
115
- // enable hot-reload and state-preserving
116
- // compilation error display
117
- app.use(hotMiddleware)
118
-
119
- // serve pure static assets
120
- app.use('/static', express.static('./static'))
121
-
122
- // app.all('/rs/*', function (req, res) {
123
- // proxy.web(req, res, {
124
- // target: 'http://127.0.0.1:8081/reports'
125
- // })
126
- // })
127
-
128
- // app.all('/rs/*', function (req, res) {
129
- // proxy.web(req, res, {
130
- // target: 'http://127.0.0.1:8081/ldap'
131
- // })
132
- // })
133
- // app.all('/excel/*', function (req, res) {
134
- // proxy.web(req, res, {
135
- // target: 'http://127.0.0.1:8081/charge'
136
- // })
137
- // })
138
-
139
- // app.all('/rs/*', function (req, res) {
140
- // proxy.web(req, res, {
141
- // target: 'http://127.0.0.1:82/charge'
142
- // })
143
- // })
144
-
145
- // app.all('/*', function (req, res) {
146
- // proxy.web(req, res, {
147
- // target: 'http://127.0.0.1:82'
148
- // })
149
- // })
150
- // app.all('/rs/user', function (req, res) {
151
- // proxy.web(req, res, {
152
- // target: 'http://127.0.0.1:82'
153
- // })
154
- // })
155
-
156
- module.exports = app.listen(8085, function (err) {
157
- if (err) {
158
- console.log(err)
159
- return
160
- }
161
- console.log('Listening at http://localhost:8085')
162
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ var httpProxy = require('http-proxy')
6
+
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ var proxy = httpProxy.createProxyServer()
10
+
11
+ // Define HTTP proxies to your custom API backend
12
+ // https://github.com/chimurai/http-proxy-middleware
13
+ var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
14
+ var str3= 'http://172.168.1.11:8400'
15
+ var proxyTable = {
16
+ '/rs/sql':{
17
+ target: str3,
18
+ secure:true,
19
+ changeOrigin:true
20
+ // target: 'http://127.0.0.1:8080'
21
+ },
22
+ '/webapps':{
23
+ target: str3,
24
+ secure:true,
25
+ changeOrigin:true
26
+ // target: 'http://127.0.0.1:8080'
27
+ },
28
+ '/rs/logic/getLogin': {
29
+ target: str3,
30
+ secure:true,
31
+ changeOrigin:true
32
+ },
33
+ '/rs/logic/getInitData': {
34
+ target: str3,
35
+ secure:true,
36
+ changeOrigin:true,
37
+ },
38
+ '/rs/logic/getSaleInitData': {
39
+ target: str3,
40
+ secure:true,
41
+ changeOrigin:true
42
+ },
43
+ '/rs/logic':{
44
+ target: str3,
45
+ secure:true,
46
+ changeOrigin:true
47
+ // target: 'http://127.0.0.1:8080'
48
+ },
49
+ '/rs/vue': {
50
+ target: str3,
51
+ secure:true,
52
+ changeOrigin:true
53
+ },
54
+ '/rs/user': {
55
+ target: str3,
56
+ secure:true,
57
+ changeOrigin:true
58
+ },
59
+ '/rs/db': {
60
+ target: str3,
61
+ secure:true,
62
+ changeOrigin:true
63
+ },
64
+ '/rs/search': {
65
+ target: str3,
66
+ secure:true,
67
+ changeOrigin:true
68
+ // target: 'http://127.0.0.1:8080'
69
+ },
70
+ '/rs/data': {
71
+ target: str3,
72
+ secure:true,
73
+ changeOrigin:true
74
+ },
75
+ '/rs': {
76
+ // target: 'http://192.168.50.199:8300'
77
+ target: str3,
78
+ secure:true,
79
+ changeOrigin:true
80
+ }
81
+ }
82
+
83
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
84
+ publicPath: config.output.publicPath,
85
+ stats: {
86
+ colors: true,
87
+ chunks: false
88
+ }
89
+ })
90
+
91
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
92
+ // force page reload when html-webpack-plugin template changes
93
+ compiler.plugin('compilation', function (compilation) {
94
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
95
+ hotMiddleware.publish({ action: 'reload' })
96
+ cb()
97
+ })
98
+ })
99
+
100
+ // proxy api requests
101
+ Object.keys(proxyTable).forEach(function (context) {
102
+ var options = proxyTable[context]
103
+ if (typeof options === 'string') {
104
+ options = { target: options }
105
+ }
106
+ app.use(proxyMiddleware(context, options))
107
+ })
108
+
109
+ // handle fallback for HTML5 history API
110
+ app.use(require('connect-history-api-fallback')())
111
+
112
+ // serve webpack bundle output
113
+ app.use(devMiddleware)
114
+
115
+ // enable hot-reload and state-preserving
116
+ // compilation error display
117
+ app.use(hotMiddleware)
118
+
119
+ // serve pure static assets
120
+ app.use('/static', express.static('./static'))
121
+
122
+ // app.all('/rs/*', function (req, res) {
123
+ // proxy.web(req, res, {
124
+ // target: 'http://127.0.0.1:8081/reports'
125
+ // })
126
+ // })
127
+
128
+ // app.all('/rs/*', function (req, res) {
129
+ // proxy.web(req, res, {
130
+ // target: 'http://127.0.0.1:8081/ldap'
131
+ // })
132
+ // })
133
+ // app.all('/excel/*', function (req, res) {
134
+ // proxy.web(req, res, {
135
+ // target: 'http://127.0.0.1:8081/charge'
136
+ // })
137
+ // })
138
+
139
+ // app.all('/rs/*', function (req, res) {
140
+ // proxy.web(req, res, {
141
+ // target: 'http://127.0.0.1:82/charge'
142
+ // })
143
+ // })
144
+
145
+ // app.all('/*', function (req, res) {
146
+ // proxy.web(req, res, {
147
+ // target: 'http://127.0.0.1:82'
148
+ // })
149
+ // })
150
+ // app.all('/rs/user', function (req, res) {
151
+ // proxy.web(req, res, {
152
+ // target: 'http://127.0.0.1:82'
153
+ // })
154
+ // })
155
+
156
+ module.exports = app.listen(8085, function (err) {
157
+ if (err) {
158
+ console.log(err)
159
+ return
160
+ }
161
+ console.log('Listening at http://localhost:8085')
162
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "address-client",
3
- "version": "3.2.41",
3
+ "version": "3.2.43",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
@@ -15,7 +15,7 @@
15
15
  </res-select>
16
16
  </div>
17
17
  <div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">
18
- <label class="font_normal_body">用户编号</label>
18
+ <label class="font_normal_body">客户编号</label>
19
19
  <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
20
20
  condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
21
21
  </div>
@@ -101,7 +101,7 @@
101
101
  />
102
102
  </div>
103
103
  <div :class="$parent.$parent.style" >
104
- <label class="font_normal_body">详细地址</label>
104
+ <label class="font_normal_body">客户地址</label>
105
105
  <input type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
106
106
  condition="a.f_address like '%{}%'" placeholder="详细地址"
107
107
  :size="model.f_address ? model.f_address.length*2 : 8"/>
@@ -138,7 +138,7 @@
138
138
  <data-grid :model="model" partial='list' style="overflow: auto" class="list_area table_sy" :optional="true" v-ref:grid>
139
139
  <template partial='head'>
140
140
  <th><nobr>序号</nobr></th>
141
- <th><nobr>用户编号</nobr></th>
141
+ <th><nobr>客户编号</nobr></th>
142
142
  <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
143
143
  <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
144
144
  <th><nobr>街道/乡镇</nobr></th>
@@ -147,7 +147,7 @@
147
147
  <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>单元</nobr></th>
148
148
  <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
149
149
  <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>门牌号</nobr></th>
150
- <th><nobr>详细地址</nobr></th>
150
+ <th><nobr>客户地址</nobr></th>
151
151
  <th><nobr>地址状态</nobr></th>
152
152
  <th><nobr>状态</nobr></th>
153
153
  <th><nobr>时间</nobr></th>
@@ -114,7 +114,7 @@
114
114
  <th><nobr>街道/乡镇</nobr></th>
115
115
  <!--民用小区信息开始-->
116
116
  <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
117
- <th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
117
+ <th v-if="!$parent.$parent.$parent.f_special"><nobr>地址</nobr></th>
118
118
  <th v-if="!$parent.$parent.$parent.f_special && !$parent.$parent.$parent.$parent.areaShow"><nobr>小区备注</nobr></th>
119
119
  <!--民用小区信息结束-->
120
120
  <!--非民用单位信息开始-->
@@ -75,7 +75,7 @@
75
75
  :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
76
76
  <th><nobr>街道/乡镇</nobr></th>
77
77
  <th><nobr>街道编号</nobr></th>
78
- <th><data-order field="f_address" name="详细地址"
78
+ <th><data-order field="f_address" name="地址"
79
79
  :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
80
80
  <th><nobr>分公司</nobr></th>
81
81
  <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
@@ -317,7 +317,7 @@
317
317
  </div>
318
318
  </validator>
319
319
 
320
- <modal :show.sync="isshow" large backdrop="false" :width="900">
320
+ <modal v-if="isshow" :show.sync="isshow" large backdrop="false" :width="900">
321
321
  <header slot="modal-header" class="modal-header">
322
322
  </header>
323
323
  <article slot="modal-body" class="modal-body">