sale-client 3.5.72 → 3.5.73
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.
- package/build/dev-server.js +164 -164
- package/package.json +1 -1
- package/src/filiale/qianneng/sale.js +3 -1
- package/src/filiale/rongchuang/IOTMeterCenter.vue +14 -14
package/build/dev-server.js
CHANGED
|
@@ -1,164 +1,164 @@
|
|
|
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 bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
|
-
// 公司测试服务
|
|
15
|
-
var fuwu = 'http://
|
|
16
|
-
// var fuwu = 'http://121.36.106.17:8400/'
|
|
17
|
-
// 铜川正式
|
|
18
|
-
// var fuwu = 'http://61.134.55.234:9999/'
|
|
19
|
-
// 铜川测试
|
|
20
|
-
// var fuwu = 'http://61.134.55.234:9999/'
|
|
21
|
-
// var fuwu = 'http://60.222.250.39:8300/'
|
|
22
|
-
// 韶关
|
|
23
|
-
// var fuwu = 'http://119.146.1.106:8300/'
|
|
24
|
-
// 巩义测试服务
|
|
25
|
-
// var fuwu = 'http://192.168.0.227:8400'
|
|
26
|
-
// 燎原测试服务
|
|
27
|
-
// var fuwu = 'http://121.41.19.238:8400 '
|
|
28
|
-
// var fuwu = 'http://121.41.19.238:9001/'
|
|
29
|
-
|
|
30
|
-
// var fuwu = 'http://139.214.92.34:8301/'
|
|
31
|
-
|
|
32
|
-
var proxyTable = {
|
|
33
|
-
'/rs/logic/saleExport': {
|
|
34
|
-
target: fuwu
|
|
35
|
-
},
|
|
36
|
-
'/rs/logic/saleGetExportProgress': {
|
|
37
|
-
target: fuwu
|
|
38
|
-
},
|
|
39
|
-
'/rs/file': {
|
|
40
|
-
target: fuwu
|
|
41
|
-
},
|
|
42
|
-
'/files': {
|
|
43
|
-
target: fuwu
|
|
44
|
-
},
|
|
45
|
-
// 查找资源服务数据
|
|
46
|
-
'/rs/search': {
|
|
47
|
-
target: fuwu
|
|
48
|
-
},
|
|
49
|
-
// 查找资源服务数据
|
|
50
|
-
'/rs/logic/getLogin': {
|
|
51
|
-
target: fuwu
|
|
52
|
-
},
|
|
53
|
-
// 查找资源服务数据
|
|
54
|
-
'/rs/logic/getInitData': {
|
|
55
|
-
target: fuwu
|
|
56
|
-
},
|
|
57
|
-
'/rs/logic/getSaleInitData': {
|
|
58
|
-
target: fuwu
|
|
59
|
-
},
|
|
60
|
-
'/invoice': {
|
|
61
|
-
target: fuwu
|
|
62
|
-
},
|
|
63
|
-
// 用户登录服务地址
|
|
64
|
-
'/rs/user': {
|
|
65
|
-
target: fuwu
|
|
66
|
-
},
|
|
67
|
-
'/rs/path/getParams': {
|
|
68
|
-
target: fuwu
|
|
69
|
-
},
|
|
70
|
-
'/rs/data': {
|
|
71
|
-
target: fuwu
|
|
72
|
-
},
|
|
73
|
-
'/rs/license': {
|
|
74
|
-
target: fuwu
|
|
75
|
-
},
|
|
76
|
-
'/rs/db': {
|
|
77
|
-
target: fuwu
|
|
78
|
-
},
|
|
79
|
-
'/excel': {
|
|
80
|
-
target: fuwu
|
|
81
|
-
},
|
|
82
|
-
'/rs/config': {
|
|
83
|
-
target: fuwu
|
|
84
|
-
},
|
|
85
|
-
'/rs/sql/getLicenseById': {
|
|
86
|
-
target: fuwu
|
|
87
|
-
},
|
|
88
|
-
'/rs/sql/manage_getarealist': {
|
|
89
|
-
target: fuwu
|
|
90
|
-
},
|
|
91
|
-
'/rs/sql/manage_getstreetlist': {
|
|
92
|
-
target: fuwu
|
|
93
|
-
},
|
|
94
|
-
'/rs/report': {
|
|
95
|
-
target: 'http://121.36.106.17:8400/'
|
|
96
|
-
},
|
|
97
|
-
'/rs/vue': {
|
|
98
|
-
target: fuwu
|
|
99
|
-
},
|
|
100
|
-
'/webmeter': {
|
|
101
|
-
target: 'http://
|
|
102
|
-
},
|
|
103
|
-
'/rs': {
|
|
104
|
-
// target: 'http://192.168.30.63:8081/'
|
|
105
|
-
// target: 'http://121.36.106.17:8400/'
|
|
106
|
-
target: fuwu
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
111
|
-
publicPath: config.output.publicPath,
|
|
112
|
-
stats: {
|
|
113
|
-
colors: true,
|
|
114
|
-
chunks: false
|
|
115
|
-
}
|
|
116
|
-
})
|
|
117
|
-
|
|
118
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
119
|
-
// force page reload when html-webpack-plugin template changes
|
|
120
|
-
compiler.plugin('compilation', function (compilation) {
|
|
121
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
122
|
-
hotMiddleware.publish({action: 'reload'})
|
|
123
|
-
cb()
|
|
124
|
-
})
|
|
125
|
-
})
|
|
126
|
-
|
|
127
|
-
// proxy api requests
|
|
128
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
129
|
-
var options = proxyTable[context]
|
|
130
|
-
if (typeof options === 'string') {
|
|
131
|
-
options = {target: options}
|
|
132
|
-
}
|
|
133
|
-
app.use(proxyMiddleware(context, options))
|
|
134
|
-
})
|
|
135
|
-
|
|
136
|
-
// handle fallback for HTML5 history API
|
|
137
|
-
app.use(require('connect-history-api-fallback')())
|
|
138
|
-
// app.use(function (req, res, next) {
|
|
139
|
-
// res.header('Access-Control-Allow-Origin', '*')
|
|
140
|
-
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
141
|
-
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
142
|
-
// res.header('X-Powered-By', '3,2,1')
|
|
143
|
-
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
144
|
-
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
145
|
-
// next()
|
|
146
|
-
// })
|
|
147
|
-
|
|
148
|
-
// serve webpack bundle output
|
|
149
|
-
app.use(devMiddleware)
|
|
150
|
-
|
|
151
|
-
// enable hot-reload and state-preserving
|
|
152
|
-
// compilation error display
|
|
153
|
-
app.use(hotMiddleware)
|
|
154
|
-
|
|
155
|
-
// serve pure static assets
|
|
156
|
-
app.use('/static', express.static('./static'))
|
|
157
|
-
|
|
158
|
-
module.exports = app.listen(8085, function (err) {
|
|
159
|
-
if (err) {
|
|
160
|
-
console.log(err)
|
|
161
|
-
return
|
|
162
|
-
}
|
|
163
|
-
console.log('Listening at http://localhost:8089')
|
|
164
|
-
})
|
|
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 bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
|
+
// 公司测试服务
|
|
15
|
+
var fuwu = 'http://121.36.106.17:8400'
|
|
16
|
+
// var fuwu = 'http://121.36.106.17:8400/'
|
|
17
|
+
// 铜川正式
|
|
18
|
+
// var fuwu = 'http://61.134.55.234:9999/'
|
|
19
|
+
// 铜川测试
|
|
20
|
+
// var fuwu = 'http://61.134.55.234:9999/'
|
|
21
|
+
// var fuwu = 'http://60.222.250.39:8300/'
|
|
22
|
+
// 韶关
|
|
23
|
+
// var fuwu = 'http://119.146.1.106:8300/'
|
|
24
|
+
// 巩义测试服务
|
|
25
|
+
// var fuwu = 'http://192.168.0.227:8400'
|
|
26
|
+
// 燎原测试服务
|
|
27
|
+
// var fuwu = 'http://121.41.19.238:8400 '
|
|
28
|
+
// var fuwu = 'http://121.41.19.238:9001/'
|
|
29
|
+
|
|
30
|
+
// var fuwu = 'http://139.214.92.34:8301/'
|
|
31
|
+
|
|
32
|
+
var proxyTable = {
|
|
33
|
+
'/rs/logic/saleExport': {
|
|
34
|
+
target: fuwu
|
|
35
|
+
},
|
|
36
|
+
'/rs/logic/saleGetExportProgress': {
|
|
37
|
+
target: fuwu
|
|
38
|
+
},
|
|
39
|
+
'/rs/file': {
|
|
40
|
+
target: fuwu
|
|
41
|
+
},
|
|
42
|
+
'/files': {
|
|
43
|
+
target: fuwu
|
|
44
|
+
},
|
|
45
|
+
// 查找资源服务数据
|
|
46
|
+
'/rs/search': {
|
|
47
|
+
target: fuwu
|
|
48
|
+
},
|
|
49
|
+
// 查找资源服务数据
|
|
50
|
+
'/rs/logic/getLogin': {
|
|
51
|
+
target: fuwu
|
|
52
|
+
},
|
|
53
|
+
// 查找资源服务数据
|
|
54
|
+
'/rs/logic/getInitData': {
|
|
55
|
+
target: fuwu
|
|
56
|
+
},
|
|
57
|
+
'/rs/logic/getSaleInitData': {
|
|
58
|
+
target: fuwu
|
|
59
|
+
},
|
|
60
|
+
'/invoice': {
|
|
61
|
+
target: fuwu
|
|
62
|
+
},
|
|
63
|
+
// 用户登录服务地址
|
|
64
|
+
'/rs/user': {
|
|
65
|
+
target: fuwu
|
|
66
|
+
},
|
|
67
|
+
'/rs/path/getParams': {
|
|
68
|
+
target: fuwu
|
|
69
|
+
},
|
|
70
|
+
'/rs/data': {
|
|
71
|
+
target: fuwu
|
|
72
|
+
},
|
|
73
|
+
'/rs/license': {
|
|
74
|
+
target: fuwu
|
|
75
|
+
},
|
|
76
|
+
'/rs/db': {
|
|
77
|
+
target: fuwu
|
|
78
|
+
},
|
|
79
|
+
'/excel': {
|
|
80
|
+
target: fuwu
|
|
81
|
+
},
|
|
82
|
+
'/rs/config': {
|
|
83
|
+
target: fuwu
|
|
84
|
+
},
|
|
85
|
+
'/rs/sql/getLicenseById': {
|
|
86
|
+
target: fuwu
|
|
87
|
+
},
|
|
88
|
+
'/rs/sql/manage_getarealist': {
|
|
89
|
+
target: fuwu
|
|
90
|
+
},
|
|
91
|
+
'/rs/sql/manage_getstreetlist': {
|
|
92
|
+
target: fuwu
|
|
93
|
+
},
|
|
94
|
+
'/rs/report': {
|
|
95
|
+
target: 'http://121.36.106.17:8400/'
|
|
96
|
+
},
|
|
97
|
+
'/rs/vue': {
|
|
98
|
+
target: fuwu
|
|
99
|
+
},
|
|
100
|
+
'/webmeter': {
|
|
101
|
+
target: 'http://192.168.50.4:8450'
|
|
102
|
+
},
|
|
103
|
+
'/rs': {
|
|
104
|
+
// target: 'http://192.168.30.63:8081/'
|
|
105
|
+
// target: 'http://121.36.106.17:8400/'
|
|
106
|
+
target: fuwu
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
111
|
+
publicPath: config.output.publicPath,
|
|
112
|
+
stats: {
|
|
113
|
+
colors: true,
|
|
114
|
+
chunks: false
|
|
115
|
+
}
|
|
116
|
+
})
|
|
117
|
+
|
|
118
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
119
|
+
// force page reload when html-webpack-plugin template changes
|
|
120
|
+
compiler.plugin('compilation', function (compilation) {
|
|
121
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
122
|
+
hotMiddleware.publish({action: 'reload'})
|
|
123
|
+
cb()
|
|
124
|
+
})
|
|
125
|
+
})
|
|
126
|
+
|
|
127
|
+
// proxy api requests
|
|
128
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
129
|
+
var options = proxyTable[context]
|
|
130
|
+
if (typeof options === 'string') {
|
|
131
|
+
options = {target: options}
|
|
132
|
+
}
|
|
133
|
+
app.use(proxyMiddleware(context, options))
|
|
134
|
+
})
|
|
135
|
+
|
|
136
|
+
// handle fallback for HTML5 history API
|
|
137
|
+
app.use(require('connect-history-api-fallback')())
|
|
138
|
+
// app.use(function (req, res, next) {
|
|
139
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
140
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
141
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
142
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
143
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
144
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
145
|
+
// next()
|
|
146
|
+
// })
|
|
147
|
+
|
|
148
|
+
// serve webpack bundle output
|
|
149
|
+
app.use(devMiddleware)
|
|
150
|
+
|
|
151
|
+
// enable hot-reload and state-preserving
|
|
152
|
+
// compilation error display
|
|
153
|
+
app.use(hotMiddleware)
|
|
154
|
+
|
|
155
|
+
// serve pure static assets
|
|
156
|
+
app.use('/static', express.static('./static'))
|
|
157
|
+
|
|
158
|
+
module.exports = app.listen(8085, function (err) {
|
|
159
|
+
if (err) {
|
|
160
|
+
console.log(err)
|
|
161
|
+
return
|
|
162
|
+
}
|
|
163
|
+
console.log('Listening at http://localhost:8089')
|
|
164
|
+
})
|
package/package.json
CHANGED
|
@@ -51,7 +51,9 @@ let specialComp = {
|
|
|
51
51
|
'file-user-essential-info-new': (resolve) => { require(['./FilesManageNew/UserEssentialInfoTest'], resolve) },
|
|
52
52
|
// 机表抄表
|
|
53
53
|
'machine-hand': (resolve) => { require(['./revenue/machineHandManage/machineHand'], resolve) },
|
|
54
|
-
|
|
54
|
+
// 下发计划
|
|
55
|
+
'machine-down': (resolve) => { require(['./revenue/machineHandManage/machineDown'], resolve) },
|
|
56
|
+
// 抄表审核
|
|
55
57
|
'machine-hand-audit': (resolve) => { require(['./revenue/machineHandManage/machineHandAudit'], resolve) },
|
|
56
58
|
|
|
57
59
|
// 用户综合信息
|
|
@@ -85,20 +85,20 @@
|
|
|
85
85
|
v-scale="[model.f_curbalance, 2]" placeholder="本期结余" disabled>
|
|
86
86
|
</div>
|
|
87
87
|
|
|
88
|
-
<div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气'"
|
|
89
|
-
:class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']"
|
|
90
|
-
<label for="f_collection" class=" font_normal_body"> 收款 </label
|
|
91
|
-
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
92
|
-
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
|
|
93
|
-
v-el:sk v-scale="[model.f_totalcost, 2]"
|
|
94
|
-
</div
|
|
95
|
-
<div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气'"
|
|
96
|
-
:class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']"
|
|
97
|
-
<label for="f_collection" class=" font_normal_body"> 收款 </label
|
|
98
|
-
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
99
|
-
v-el:sk v-scale="[model.f_totalcost, 2]"
|
|
100
|
-
</div
|
|
101
|
-
<div class="col-sm-4 form-group"
|
|
88
|
+
<!-- <div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气'"-->
|
|
89
|
+
<!-- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">-->
|
|
90
|
+
<!-- <label for="f_collection" class=" font_normal_body"> 收款 </label>-->
|
|
91
|
+
<!-- <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"-->
|
|
92
|
+
<!-- v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'-->
|
|
93
|
+
<!-- v-el:sk v-scale="[model.f_totalcost, 2]">-->
|
|
94
|
+
<!-- </div>-->
|
|
95
|
+
<!-- <div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气'"-->
|
|
96
|
+
<!-- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">-->
|
|
97
|
+
<!-- <label for="f_collection" class=" font_normal_body"> 收款 </label>-->
|
|
98
|
+
<!-- <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"-->
|
|
99
|
+
<!-- v-el:sk v-scale="[model.f_totalcost, 2]">-->
|
|
100
|
+
<!-- </div>-->
|
|
101
|
+
<div class="col-sm-4 form-group">
|
|
102
102
|
<label for="f_collection" class=" font_normal_body"> 收款 </label>
|
|
103
103
|
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
104
104
|
v-el:sk v-scale="[model.f_collection, 2]" disabled>
|