sale-client 3.6.259 → 3.6.260

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,97 +1,94 @@
1
- var path = require('path')
2
- const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', '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
- host: '127.0.0.1',
12
- port: 8089,
13
- open: false,
14
- stats: {
15
- colors: false, // 配置控制台输出彩色日志
16
- chunks: false, // 不输出构建 chunk 信息
17
- children: false // 不输出子模块构建信息
18
- },
19
- proxy: {
20
- '/invoice/rs/logic/getInvoice': {
21
- target: serverRul
22
- },
23
- '/rs/file': {
24
- target: serverRul
25
- },
26
- '/webapps': {
27
- target: serverRul
28
- },
29
- '/rs/sql/singleTable': {
30
- target: serverRul
31
- },
32
- '/invoice': {
33
- target: serverRul
34
- },
35
- // 查找资源服务数据
36
- '/rs/search': {
37
- target: serverRul
38
- },
39
- // 查找资源服务数据
40
- '/rs/logic/getLogin': {
41
- target: serverRul
42
- },
43
- // 查找资源服务数据
44
- '/rs/logic/getInitData': {
45
- target: serverRul
46
- },
47
- '/rs/logic/getSaleInitData': {
48
- target: serverRul
49
- },
50
- // 用户登录服务地址
51
- '/rs/user': {
52
- target: serverRul
53
- },
54
- '/rs/path': {
55
- target: serverRul
56
- },
57
- '/rs/data': {
58
- target: serverRul
59
- },
60
- '/rs/license': {
61
- target: serverRul
62
- },
63
- '/rs/db': {
64
- target: serverRul
65
- },
66
- '/excel': {
67
- target: serverRul
68
- },
69
- '/rs/config': {
70
- target: serverRul
71
- },
72
- '/rs/report': {
73
- target: serverRul
74
- },
75
- '/rs/vue': {
76
- target: serverRul
77
- },
78
- '/rs/logic/webHandReverse': {
79
- target: 'http://localhost:8085'
80
- },
81
- '/rs/logic': {
82
- target: localUrl
83
- },
84
- '/rs/sql': {
85
- target: localUrl
86
- },
87
- '/webmeter': {
88
- target: serverRul
89
- },
90
- '/rs': {
91
- target: serverRul
92
- // changeOrigin: true
93
- }
94
- }
95
- }
96
- }
97
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
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
+ host: '127.0.0.1',
12
+ port: 8089,
13
+ open: false,
14
+ stats: {
15
+ colors: false, // 配置控制台输出彩色日志
16
+ chunks: false, // 不输出构建 chunk 信息
17
+ children: false // 不输出子模块构建信息
18
+ },
19
+ proxy: {
20
+ '/invoice/rs/logic/getInvoice': {
21
+ target: serverRul
22
+ },
23
+ '/rs/file': {
24
+ target: serverRul
25
+ },
26
+ '/webapps': {
27
+ target: serverRul
28
+ },
29
+ '/rs/sql/singleTable': {
30
+ target: serverRul
31
+ },
32
+ '/invoice': {
33
+ target: serverRul
34
+ },
35
+ // 查找资源服务数据
36
+ '/rs/search': {
37
+ target: serverRul
38
+ },
39
+ // 查找资源服务数据
40
+ '/rs/logic/getLogin': {
41
+ target: serverRul
42
+ },
43
+ // 查找资源服务数据
44
+ '/rs/logic/getInitData': {
45
+ target: serverRul
46
+ },
47
+ '/rs/logic/getSaleInitData': {
48
+ target: serverRul
49
+ },
50
+ // 用户登录服务地址
51
+ '/rs/user': {
52
+ target: serverRul
53
+ },
54
+ '/rs/path': {
55
+ target: serverRul
56
+ },
57
+ '/rs/data': {
58
+ target: serverRul
59
+ },
60
+ '/rs/license': {
61
+ target: serverRul
62
+ },
63
+ '/rs/db': {
64
+ target: serverRul
65
+ },
66
+ '/excel': {
67
+ target: serverRul
68
+ },
69
+ '/rs/config': {
70
+ target: serverRul
71
+ },
72
+ '/rs/report': {
73
+ target: serverRul
74
+ },
75
+ '/rs/vue': {
76
+ target: serverRul
77
+ },
78
+ '/rs/logic/getWarningMsg': {
79
+ target: localUrl
80
+ },
81
+ '/rs/sql': {
82
+ target: serverRul
83
+ },
84
+ '/webmeter': {
85
+ target: serverRul
86
+ },
87
+ '/rs': {
88
+ target: serverRul
89
+ // changeOrigin: true
90
+ }
91
+ }
92
+ }
93
+ }
94
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,120 +1,120 @@
1
- {
2
- "name": "sale-client",
3
- "version": "3.6.259",
4
- "description": "收费模块前台组件",
5
- "main": "src/index.js",
6
- "scripts": {
7
- "example": "node build/example-server.js",
8
- "dev": "webpack-dev-server --config ./build/dev-server.js",
9
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
10
- "unit": "karma start test/unit/karma.conf.js",
11
- "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
12
- "e2e": "node test/e2e/runner.js",
13
- "release": "bash build/release.sh"
14
- },
15
- "repository": {
16
- "type": "git",
17
- "url": "https://gitee.com/aote/product.git"
18
- },
19
- "dependencies": {
20
- "crypto-js": "^4.1.1",
21
- "examples": "^0.1.0",
22
- "js-file-download": "0.4.12",
23
- "less-loader": "^2.2.3",
24
- "qrcodejs2": "0.0.2",
25
- "vue": "^1.0.17",
26
- "webpack-dev-server": "^2.11.5",
27
- "vue-client": "1.24.137",
28
- "yarn": "^1.22.10"
29
- },
30
- "devDependencies": {
31
- "address-client": "3.2.56",
32
- "axios": "0.15.3",
33
- "babel-core": "^6.0.0",
34
- "babel-loader": "^6.0.0",
35
- "babel-plugin-transform-runtime": "^6.0.0",
36
- "babel-preset-es2015": "^6.0.0",
37
- "babel-preset-stage-2": "^6.0.0",
38
- "chai": "^3.5.0",
39
- "co": "^4.6.0",
40
- "compression-webpack-plugin": "1.1.2",
41
- "connect-history-api-fallback": "^1.1.0",
42
- "cross-env": "^1.0.7",
43
- "cross-spawn": "^2.1.5",
44
- "css-loader": "^0.23.0",
45
- "echarts": "^4.1.0",
46
- "eslint": "^3.19.0",
47
- "eslint-config-standard": "^10.2.1",
48
- "eslint-friendly-formatter": "^3.0.0",
49
- "eslint-loader": "^1.7.1",
50
- "eslint-plugin-html": "^3.0.0",
51
- "eslint-plugin-import": "^2.7.0",
52
- "eslint-plugin-node": "^5.2.0",
53
- "eslint-plugin-promise": "^3.4.0",
54
- "eslint-plugin-standard": "^3.0.1",
55
- "eventsource-polyfill": "^0.9.6",
56
- "express": "^4.13.3",
57
- "extract-text-webpack-plugin": "^3.0.2",
58
- "terser-webpack-plugin-legacy": "^1.2.5",
59
- "file-loader": "^0.8.4",
60
- "filemanager-webpack-plugin": "^2.0.5",
61
- "function-bind": "^1.0.2",
62
- "html-webpack-plugin": "^2.8.1",
63
- "http-proxy-middleware": "^0.11.0",
64
- "inject-loader": "^2.0.1",
65
- "isparta-loader": "^2.0.0",
66
- "jasmine-core": "^2.4.1",
67
- "jquery": "^3.3.1",
68
- "jsencrypt": "3.0.0-rc.1",
69
- "json-loader": "^0.5.4",
70
- "karma": "^1.4.1",
71
- "karma-chrome-launcher": "^2.2.0",
72
- "karma-coverage": "^1.1.1",
73
- "karma-mocha": "^1.3.0",
74
- "karma-sinon-chai": "^1.3.1",
75
- "karma-sourcemap-loader": "^0.3.7",
76
- "karma-spec-reporter": "0.0.31",
77
- "karma-webpack": "^2.0.2",
78
- "ldap-clients": "3.0.62",
79
- "less": "^2.7.3",
80
- "manage-client": "3.1.8-88",
81
- "mkdirp": "^0.5.1",
82
- "mocha": "^3.2.0",
83
- "moment": "2.24.0",
84
- "ncp": "^2.0.0",
85
- "nightwatch": "^0.8.18",
86
- "qrcodejs2": "0.0.2",
87
- "rimraf": "^2.5.0",
88
- "selenium-server": "2.52.0",
89
- "sinon": "^2.1.0",
90
- "sinon-chai": "^2.8.0",
91
- "style": "0.0.3",
92
- "style-loader": "^0.20.3",
93
- "system-clients": "3.2.61",
94
- "url-loader": "^0.5.7",
95
- "vue-clipboard2": "0.3.1",
96
- "vue-hot-reload-api": "^1.2.0",
97
- "vue-html-loader": "^1.0.0",
98
- "vue-loader": "^8.2.1",
99
- "vue-resource": "^1.5.0",
100
- "vue-router": "^0.7.13",
101
- "vue-strap": "^1.0.9",
102
- "vue-style-loader": "^1.0.0",
103
- "vue-validator": "2.1.7",
104
- "webpack": "^3.12.0",
105
- "webpack-dev-middleware": "^1.4.0",
106
- "webpack-hot-middleware": "^2.6.0",
107
- "webpack-merge": "^0.8.3",
108
- "webpack-parallel-uglify-plugin": "^1.0.0",
109
- "weixin-js-sdk": "^1.2.0"
110
- },
111
- "keywords": [
112
- "selling-clients"
113
- ],
114
- "author": "张桥",
115
- "license": "ISC",
116
- "directories": {
117
- "example": "examples",
118
- "test": "test"
119
- }
120
- }
1
+ {
2
+ "name": "sale-client",
3
+ "version": "3.6.260",
4
+ "description": "收费模块前台组件",
5
+ "main": "src/index.js",
6
+ "scripts": {
7
+ "example": "node build/example-server.js",
8
+ "dev": "webpack-dev-server --config ./build/dev-server.js",
9
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
10
+ "unit": "karma start test/unit/karma.conf.js",
11
+ "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
12
+ "e2e": "node test/e2e/runner.js",
13
+ "release": "bash build/release.sh"
14
+ },
15
+ "repository": {
16
+ "type": "git",
17
+ "url": "https://gitee.com/aote/product.git"
18
+ },
19
+ "dependencies": {
20
+ "crypto-js": "^4.1.1",
21
+ "examples": "^0.1.0",
22
+ "js-file-download": "0.4.12",
23
+ "less-loader": "^2.2.3",
24
+ "qrcodejs2": "0.0.2",
25
+ "vue": "^1.0.17",
26
+ "webpack-dev-server": "^2.11.5",
27
+ "vue-client": "1.24.137",
28
+ "yarn": "^1.22.10"
29
+ },
30
+ "devDependencies": {
31
+ "address-client": "3.2.56",
32
+ "axios": "0.15.3",
33
+ "babel-core": "^6.0.0",
34
+ "babel-loader": "^6.0.0",
35
+ "babel-plugin-transform-runtime": "^6.0.0",
36
+ "babel-preset-es2015": "^6.0.0",
37
+ "babel-preset-stage-2": "^6.0.0",
38
+ "chai": "^3.5.0",
39
+ "co": "^4.6.0",
40
+ "compression-webpack-plugin": "1.1.2",
41
+ "connect-history-api-fallback": "^1.1.0",
42
+ "cross-env": "^1.0.7",
43
+ "cross-spawn": "^2.1.5",
44
+ "css-loader": "^0.23.0",
45
+ "echarts": "^4.1.0",
46
+ "eslint": "^3.19.0",
47
+ "eslint-config-standard": "^10.2.1",
48
+ "eslint-friendly-formatter": "^3.0.0",
49
+ "eslint-loader": "^1.7.1",
50
+ "eslint-plugin-html": "^3.0.0",
51
+ "eslint-plugin-import": "^2.7.0",
52
+ "eslint-plugin-node": "^5.2.0",
53
+ "eslint-plugin-promise": "^3.4.0",
54
+ "eslint-plugin-standard": "^3.0.1",
55
+ "eventsource-polyfill": "^0.9.6",
56
+ "express": "^4.13.3",
57
+ "extract-text-webpack-plugin": "^3.0.2",
58
+ "terser-webpack-plugin-legacy": "^1.2.5",
59
+ "file-loader": "^0.8.4",
60
+ "filemanager-webpack-plugin": "^2.0.5",
61
+ "function-bind": "^1.0.2",
62
+ "html-webpack-plugin": "^2.8.1",
63
+ "http-proxy-middleware": "^0.11.0",
64
+ "inject-loader": "^2.0.1",
65
+ "isparta-loader": "^2.0.0",
66
+ "jasmine-core": "^2.4.1",
67
+ "jquery": "^3.3.1",
68
+ "jsencrypt": "3.0.0-rc.1",
69
+ "json-loader": "^0.5.4",
70
+ "karma": "^1.4.1",
71
+ "karma-chrome-launcher": "^2.2.0",
72
+ "karma-coverage": "^1.1.1",
73
+ "karma-mocha": "^1.3.0",
74
+ "karma-sinon-chai": "^1.3.1",
75
+ "karma-sourcemap-loader": "^0.3.7",
76
+ "karma-spec-reporter": "0.0.31",
77
+ "karma-webpack": "^2.0.2",
78
+ "ldap-clients": "3.0.62",
79
+ "less": "^2.7.3",
80
+ "manage-client": "3.1.8-88",
81
+ "mkdirp": "^0.5.1",
82
+ "mocha": "^3.2.0",
83
+ "moment": "2.24.0",
84
+ "ncp": "^2.0.0",
85
+ "nightwatch": "^0.8.18",
86
+ "qrcodejs2": "0.0.2",
87
+ "rimraf": "^2.5.0",
88
+ "selenium-server": "2.52.0",
89
+ "sinon": "^2.1.0",
90
+ "sinon-chai": "^2.8.0",
91
+ "style": "0.0.3",
92
+ "style-loader": "^0.20.3",
93
+ "system-clients": "3.2.61",
94
+ "url-loader": "^0.5.7",
95
+ "vue-clipboard2": "0.3.1",
96
+ "vue-hot-reload-api": "^1.2.0",
97
+ "vue-html-loader": "^1.0.0",
98
+ "vue-loader": "^8.2.1",
99
+ "vue-resource": "^1.5.0",
100
+ "vue-router": "^0.7.13",
101
+ "vue-strap": "^1.0.9",
102
+ "vue-style-loader": "^1.0.0",
103
+ "vue-validator": "2.1.7",
104
+ "webpack": "^3.12.0",
105
+ "webpack-dev-middleware": "^1.4.0",
106
+ "webpack-hot-middleware": "^2.6.0",
107
+ "webpack-merge": "^0.8.3",
108
+ "webpack-parallel-uglify-plugin": "^1.0.0",
109
+ "weixin-js-sdk": "^1.2.0"
110
+ },
111
+ "keywords": [
112
+ "selling-clients"
113
+ ],
114
+ "author": "张桥",
115
+ "license": "ISC",
116
+ "directories": {
117
+ "example": "examples",
118
+ "test": "test"
119
+ }
120
+ }
@@ -83,6 +83,18 @@
83
83
  <label class="col-sm-5">旧客户编号</label>
84
84
  <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
85
85
  </div>
86
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
87
+ <label class="col-sm-5">开关阀状态</label>
88
+ <span class="col-sm-7">{{ data ? data.f_valve_state : '' }}</span>
89
+ </div>
90
+ <div class="row" v-if="data.f_meter_type.includes('机表')">
91
+ <label class="col-sm-5">开关阀状态</label>
92
+ <span class="col-sm-7">{{ data ? data.f_bqf_state : '' }}</span>
93
+ </div>
94
+ <div class="row" v-if="!data.f_meter_type.includes('卡表')">
95
+ <label class="col-sm-5">开关阀原因</label>
96
+ <span class="col-sm-7">{{ data ? data.f_off_valve_reason : '' }}</span>
97
+ </div>
86
98
  <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
87
99
  v-ref:modal large backdrop="false">
88
100
  <article slot="modal-body" class="modal-body">