sale-client 3.5.225 → 3.5.227

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 (14) hide show
  1. package/build/dev-server.js +81 -97
  2. package/package.json +2 -2
  3. package/src/components/charge/business/CardMeterCenter.vue +2 -3
  4. package/src/components/revenue/machineHandManage/HandplanQuery.vue +251 -213
  5. package/src/filiale/liaoyuan/CardList.vue +552 -0
  6. package/src/filiale/liaoyuan/sale.js +2 -0
  7. package/src/filiale/qianneng/FilesManage/UserGeneralInfoTest.vue +697 -0
  8. package/src/filiale/qianneng/sale.js +2 -0
  9. package/src/filiale/rizhao/replaceMentList.vue +411 -0
  10. package/src/filiale/rizhao/sale.js +2 -0
  11. package/src/filiale/rongcheng/sale.js +2 -0
  12. package/src/filiale/tongchuan/WebMeterList.vue +11 -11
  13. package/src/filiale/wenxi/CardMeterCenter.vue +7 -6
  14. package/src/filiale/wenxi/ShowCardSellGas.vue +1 -1
package/build/dev-server.js CHANGED
@@ -1,97 +1,81 @@
1
- var webpack = require('webpack')
2
- var config = require('./webpack.dev.conf')
3
- var path = require('path')
4
- var webpackDevServer = require('webpack-dev-server')
5
- var compiler = webpack(config)
6
- // 自己改了这里不要提交 来回覆盖挺麻烦的
7
- const [localUrl, serverRul] = ['http://192.168.50.4:8400', 'http://192.168.50.4:8400']
8
- const port = 8089
9
-
10
- // eslint-disable-next-line new-cap
11
- var server = new webpackDevServer(compiler, {
12
- contentBase: path.join(__dirname, 'src'),
13
- hot: true,
14
- publicPath: config.output.publicPath,
15
- historyApiFallback: true,
16
- open: true,
17
- stats: {
18
- all: false, // 关闭全部日志
19
- colors: true, // 配置控制台输出彩色日志
20
- errors: true, // 输出构建错误日志
21
- warnings: true, // 输出构建警告日志
22
- moduleTrace: true, // 显示 module 路径信息
23
- errorDetails: true, // 显示构建错误的详细信息
24
- chunks: false, // 不输出构建 chunk 信息
25
- entrypoints: false, // 不输出入口文件信息
26
- children: false, // 不输出子模块构建信息
27
- performance: true // 输出性能提示
28
- },
29
- proxy: {
30
- '/rs/file': {
31
- target: serverRul
32
- },
33
- // 查找资源服务数据
34
- '/rs/search': {
35
- target: serverRul
36
- },
37
- // 查找资源服务数据
38
- '/rs/logic/getLogin': {
39
- target: serverRul
40
- },
41
- // 查找资源服务数据
42
- '/rs/logic/getInitData': {
43
- target: serverRul
44
- },
45
- '/rs/logic/getSaleInitData': {
46
- target: serverRul
47
- },
48
- // 用户登录服务地址
49
- '/rs/user': {
50
- target: serverRul
51
- },
52
- '/rs/path': {
53
- target: serverRul
54
- },
55
- '/rs/data': {
56
- target: serverRul
57
- },
58
- '/rs/license': {
59
- target: serverRul
60
- },
61
- '/rs/db': {
62
- target: serverRul
63
- },
64
- '/excel': {
65
- target: serverRul
66
- },
67
- '/rs/config': {
68
- target: serverRul
69
- },
70
- '/rs/report': {
71
- target: serverRul
72
- },
73
- '/rs/vue': {
74
- target: serverRul
75
- },
76
- '/rs/logic': {
77
- target: localUrl
78
- },
79
- '/rs/sql': {
80
- target: localUrl
81
- },
82
- '/webmeter': {
83
- target: serverRul
84
- },
85
- '/rs': {
86
- target: serverRul
87
- // changeOrigin: true
88
- }
89
- }
90
- })
91
- server.listen(port, 'localhost', function (err) {
92
- if (err) {
93
- console.log(err)
94
- return
95
- }
96
- console.log('Listening at http://localhost:' + port)
97
- })
1
+ var path = require('path')
2
+ const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
3
+ var merge = require('webpack-merge')
4
+ var baseConfig = require('./webpack.dev.conf')
5
+ var devConfig = {
6
+ devServer: {
7
+ contentBase: path.join(__dirname, 'src'),
8
+ hot: true,
9
+ publicPath: baseConfig.output.publicPath,
10
+ historyApiFallback: true,
11
+ port: 8089,
12
+ open: true,
13
+ stats: {
14
+ colors: false, // 配置控制台输出彩色日志
15
+ chunks: false, // 不输出构建 chunk 信息
16
+ children: false // 不输出子模块构建信息
17
+ },
18
+ proxy: {
19
+ '/rs/file': {
20
+ target: serverRul
21
+ },
22
+ // 查找资源服务数据
23
+ '/rs/search': {
24
+ target: serverRul
25
+ },
26
+ // 查找资源服务数据
27
+ '/rs/logic/getLogin': {
28
+ target: serverRul
29
+ },
30
+ // 查找资源服务数据
31
+ '/rs/logic/getInitData': {
32
+ target: serverRul
33
+ },
34
+ '/rs/logic/getSaleInitData': {
35
+ target: serverRul
36
+ },
37
+ // 用户登录服务地址
38
+ '/rs/user': {
39
+ target: serverRul
40
+ },
41
+ '/rs/path': {
42
+ target: serverRul
43
+ },
44
+ '/rs/data': {
45
+ target: serverRul
46
+ },
47
+ '/rs/license': {
48
+ target: serverRul
49
+ },
50
+ '/rs/db': {
51
+ target: serverRul
52
+ },
53
+ '/excel': {
54
+ target: serverRul
55
+ },
56
+ '/rs/config': {
57
+ target: serverRul
58
+ },
59
+ '/rs/report': {
60
+ target: serverRul
61
+ },
62
+ '/rs/vue': {
63
+ target: serverRul
64
+ },
65
+ '/rs/logic': {
66
+ target: localUrl
67
+ },
68
+ '/rs/sql': {
69
+ target: localUrl
70
+ },
71
+ '/webmeter': {
72
+ target: serverRul
73
+ },
74
+ '/rs': {
75
+ target: serverRul
76
+ // changeOrigin: true
77
+ }
78
+ }
79
+ }
80
+ }
81
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.225",
3
+ "version": "3.5.227",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
7
7
  "example": "node build/example-server.js",
8
- "dev": "node build/dev-server.js",
8
+ "dev": "webpack-dev-server --config ./build/dev-server.js",
9
9
  "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
10
10
  "unit": "karma start test/unit/karma.conf.js",
11
11
  "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
package/src/components/charge/business/CardMeterCenter.vue CHANGED
@@ -29,13 +29,12 @@
29
29
  v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
30
30
  </div>
31
31
  <div class="col-sm-4"
32
- :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
32
+ :class="[$v.f_preamount.required || $v.f_preamount.dctest || model.f_preamount === 0 ? 'has-error' : 'has-success']">
33
33
  <label for="f_pregas" class=" font_normal_body">*预购金额</label>
34
34
  <input class="input_search" style="width:60%" type="number"
35
35
  @blur="preamount()" v-model="model.f_preamount"
36
36
  :disabled="config.calculatePreByCollection"
37
- v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ],dctest: [0, ">"]}' placeholder="预购金额"
38
- v-next-el='fcollection'>
37
+ v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额">
39
38
  </div><!--
40
39
  <div class="col-sm-4" v-if="row.f_collection_type == '按气量'">
41
40
  <label for="f_preamount" class=" font_normal_body">&nbsp;预购金额</label>