apply-clients 3.3.54 → 3.3.55

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.
Files changed (4) hide show
  1. package/build/dev-server.js +131 -130
  2. package/package.json +1 -1
  3. package/src/components/android/Process/AppServiceControl.vue +1 -1
  4. package/src/components/product/Process/Service/ServiceControl.vue +1 -1
package/build/dev-server.js CHANGED
@@ -1,130 +1,131 @@
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
- var app = express()
7
- var compiler = webpack(config)
8
- // var proxy = httpProxy.createProxyServer()
9
- // var ldap = 'http://121.36.79.201:8400'
10
- // var applyinstall = 'http://121.36.79.201:8400'
11
- // var ldap = 'http://192.168.50.4:8400'
12
- var ldap = 'http://192.168.20.28:8400'
13
- // var applyinstall = 'http://192.168.20.27:8400'
14
- var applyinstall = 'http://127.0.0.1:8080'
15
-
16
- var proxyTable = {
17
- '/wx': {
18
- target: ldap
19
- },
20
- '/rs/sql/filemanage_getUserfies/n': {
21
- target: ldap
22
- },
23
- '/rs/sql/filemanage_getUserfies': {
24
- target: ldap
25
- },
26
- '/rs/logic/saveInsInfo': {
27
- target: ldap
28
- },
29
- '/rs/logic/exportfile': {
30
- target: ldap
31
- },
32
- '/rs/logic/getBatchOperaPro': {
33
- target: ldap
34
- },
35
- '/rs/logic/insuranceguanl': {
36
- target: ldap
37
- },
38
- '/rs/logic/getSaleInitData': {
39
- target: ldap
40
- },
41
- '/rs/workflow': {
42
- target: applyinstall
43
- },
44
- '/rs/vue': {
45
- target: ldap
46
- },
47
- // 查找资源服务数据
48
- '/rs/search': {
49
- target: ldap
50
- },
51
- // 用户登录服务地址
52
- '/rs/user': {
53
- target: ldap
54
- },
55
- '/rs/logic/getInitData': {
56
- target: ldap?ldap:applyinstall
57
- },
58
- '/rs/logic/getLogin': {
59
- target: ldap
60
- },
61
- '/rs/file': { // 文件上传
62
- target: applyinstall
63
- },
64
- '/project': { // 文件回显
65
- target: applyinstall
66
- },
67
- '/rs': {
68
- target: applyinstall
69
- },
70
- '/ws': {
71
- target: applyinstall,
72
- ws: true // 代理webSocket
73
- }
74
- }
75
-
76
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
77
- publicPath: config.output.publicPath,
78
- stats: {
79
- colors: true,
80
- chunks: false
81
- }
82
- })
83
-
84
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
85
- // force page reload when html-webpack-plugin template changes
86
- compiler.plugin('compilation', function (compilation) {
87
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
88
- hotMiddleware.publish({action: 'reload'})
89
- cb()
90
- })
91
- })
92
-
93
- // proxy api requests
94
- Object.keys(proxyTable).forEach(function (context) {
95
- var options = proxyTable[context]
96
- if (typeof options === 'string') {
97
- options = {target: options}
98
- }
99
- app.use(proxyMiddleware(context, options))
100
- })
101
-
102
- // handle fallback for HTML5 history API
103
- app.use(require('connect-history-api-fallback')())
104
- // app.use(function (req, res, next) {
105
- // res.header('Access-Control-Allow-Origin', '*')
106
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
107
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
108
- // res.header('X-Powered-By', '3,2,1')
109
- // res.header('Access-Control-Allow-Credentials', 'true')
110
- // res.header('Content-Type', 'application/json;charset=utf-8')
111
- // next()
112
- // })
113
-
114
- // serve webpack bundle output
115
- app.use(devMiddleware)
116
-
117
- // enable hot-reload and state-preserving
118
- // compilation error display
119
- app.use(hotMiddleware)
120
-
121
- // serve pure static assets
122
- app.use('/static', express.static('./static'))
123
-
124
- module.exports = app.listen(8300, function (err) {
125
- if (err) {
126
- console.log(err)
127
- return
128
- }
129
- console.log('Listening at http://localhost:8300')
130
- })
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
+ var app = express()
7
+ var compiler = webpack(config)
8
+ // var proxy = httpProxy.createProxyServer()
9
+ // var ldap = 'http://121.36.79.201:8400'
10
+ // var applyinstall = 'http://121.36.79.201:8400'
11
+ // var ldap = 'http://192.168.50.4:8400'
12
+ // var ldap = 'http://192.168.20.28:8400'
13
+ var ldap = 'http://192.168.20.27:8400'
14
+ var applyinstall = 'http://192.168.20.27:8400'
15
+ // var applyinstall = 'http://127.0.0.1:8080'
16
+
17
+ var proxyTable = {
18
+ '/wx': {
19
+ target: ldap
20
+ },
21
+ '/rs/sql/filemanage_getUserfies/n': {
22
+ target: ldap
23
+ },
24
+ '/rs/sql/filemanage_getUserfies': {
25
+ target: ldap
26
+ },
27
+ '/rs/logic/saveInsInfo': {
28
+ target: ldap
29
+ },
30
+ '/rs/logic/exportfile': {
31
+ target: ldap
32
+ },
33
+ '/rs/logic/getBatchOperaPro': {
34
+ target: ldap
35
+ },
36
+ '/rs/logic/insuranceguanl': {
37
+ target: ldap
38
+ },
39
+ '/rs/logic/getSaleInitData': {
40
+ target: ldap
41
+ },
42
+ '/rs/workflow': {
43
+ target: applyinstall
44
+ },
45
+ '/rs/vue': {
46
+ target: ldap
47
+ },
48
+ // 查找资源服务数据
49
+ '/rs/search': {
50
+ target: ldap
51
+ },
52
+ // 用户登录服务地址
53
+ '/rs/user': {
54
+ target: ldap
55
+ },
56
+ '/rs/logic/getInitData': {
57
+ target: ldap?ldap:applyinstall
58
+ },
59
+ '/rs/logic/getLogin': {
60
+ target: ldap
61
+ },
62
+ '/rs/file': { // 文件上传
63
+ target: applyinstall
64
+ },
65
+ '/project': { // 文件回显
66
+ target: applyinstall
67
+ },
68
+ '/rs': {
69
+ target: applyinstall
70
+ },
71
+ '/ws': {
72
+ target: applyinstall,
73
+ ws: true // 代理webSocket
74
+ }
75
+ }
76
+
77
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
78
+ publicPath: config.output.publicPath,
79
+ stats: {
80
+ colors: true,
81
+ chunks: false
82
+ }
83
+ })
84
+
85
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
86
+ // force page reload when html-webpack-plugin template changes
87
+ compiler.plugin('compilation', function (compilation) {
88
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
89
+ hotMiddleware.publish({action: 'reload'})
90
+ cb()
91
+ })
92
+ })
93
+
94
+ // proxy api requests
95
+ Object.keys(proxyTable).forEach(function (context) {
96
+ var options = proxyTable[context]
97
+ if (typeof options === 'string') {
98
+ options = {target: options}
99
+ }
100
+ app.use(proxyMiddleware(context, options))
101
+ })
102
+
103
+ // handle fallback for HTML5 history API
104
+ app.use(require('connect-history-api-fallback')())
105
+ // app.use(function (req, res, next) {
106
+ // res.header('Access-Control-Allow-Origin', '*')
107
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
108
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
109
+ // res.header('X-Powered-By', '3,2,1')
110
+ // res.header('Access-Control-Allow-Credentials', 'true')
111
+ // res.header('Content-Type', 'application/json;charset=utf-8')
112
+ // next()
113
+ // })
114
+
115
+ // serve webpack bundle output
116
+ app.use(devMiddleware)
117
+
118
+ // enable hot-reload and state-preserving
119
+ // compilation error display
120
+ app.use(hotMiddleware)
121
+
122
+ // serve pure static assets
123
+ app.use('/static', express.static('./static'))
124
+
125
+ module.exports = app.listen(8300, function (err) {
126
+ if (err) {
127
+ console.log(err)
128
+ return
129
+ }
130
+ console.log('Listening at http://localhost:8300')
131
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.3.54",
3
+ "version": "3.3.55",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/android/Process/AppServiceControl.vue CHANGED
@@ -461,7 +461,7 @@ export default {
461
461
  }
462
462
 
463
463
  if (!isEmpty(f_price_id)) {
464
- data.condition = `sp.f_orgid = '${Vue.user.orgid}' and sp.f_price_id = ${f_price_id}`
464
+ data.condition = `sp.f_filialeid = '${Vue.user.orgid}' and sp.f_price_id = ${f_price_id}`
465
465
  }
466
466
  let http = new HttpResetClass()
467
467
  let res = await http.load(
package/src/components/product/Process/Service/ServiceControl.vue CHANGED
@@ -521,7 +521,7 @@ export default {
521
521
  }
522
522
 
523
523
  if (!isEmpty(f_price_id)) {
524
- data.condition = `sp.f_orgid = '${this.$login.f.orgid}' and sp.f_price_id = ${f_price_id}`
524
+ data.condition = `sp.f_filialeid = '${this.$login.f.orgid}' and sp.f_price_id = ${f_price_id}`
525
525
  }
526
526
  let http = new HttpResetClass()
527
527
  let res = await http.load(