sale-client 3.6.240 → 3.6.242
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/package.json
CHANGED
|
@@ -1,120 +1,120 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "sale-client",
|
|
3
|
-
"version": "3.6.
|
|
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.116",
|
|
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.242",
|
|
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.116",
|
|
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
|
+
}
|
|
@@ -110,7 +110,7 @@ export default {
|
|
|
110
110
|
showDevices (index, row) {
|
|
111
111
|
this.devicesinfo = []
|
|
112
112
|
this.devicesinfo = row.devicesinfo
|
|
113
|
-
if (row.f_install_person[0]) {
|
|
113
|
+
if (row.f_install_person && row.f_install_person[0]) {
|
|
114
114
|
this.f_input_person = row.f_install_person[0]
|
|
115
115
|
}
|
|
116
116
|
this.devicesinfo.forEach((row) => {
|
|
@@ -102,6 +102,7 @@
|
|
|
102
102
|
this.timer = setInterval(async () => {
|
|
103
103
|
times++
|
|
104
104
|
let res1 = await self.$resetpost('rs/logic/WeiXinPayStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
|
|
105
|
+
this.paymentCodeReturnData = res1.data
|
|
105
106
|
res1 = res1.data
|
|
106
107
|
// 支付成功关闭定时器
|
|
107
108
|
if (res1.result_msg == '支付确认成功') {
|
|
@@ -433,12 +433,12 @@
|
|
|
433
433
|
<th>
|
|
434
434
|
<nobr>审核时间</nobr>
|
|
435
435
|
</th>
|
|
436
|
-
<th
|
|
437
|
-
<nobr>审核状态</nobr
|
|
438
|
-
</th
|
|
439
|
-
<th
|
|
440
|
-
<nobr>审核备注</nobr
|
|
441
|
-
</th
|
|
436
|
+
<!-- <th>-->
|
|
437
|
+
<!-- <nobr>审核状态</nobr>-->
|
|
438
|
+
<!-- </th>-->
|
|
439
|
+
<!-- <th>-->
|
|
440
|
+
<!-- <nobr>审核备注</nobr>-->
|
|
441
|
+
<!-- </th>-->
|
|
442
442
|
<th>
|
|
443
443
|
<nobr>部门</nobr>
|
|
444
444
|
</th>
|
|
@@ -606,12 +606,12 @@
|
|
|
606
606
|
<td style="text-align: center;">
|
|
607
607
|
<nobr>{{row.f_audit_date}}</nobr>
|
|
608
608
|
</td>
|
|
609
|
-
<td style="text-align: center;"
|
|
610
|
-
<nobr>{{row.f_audit_state}}</nobr
|
|
611
|
-
</td
|
|
612
|
-
<td style="text-align: center;"
|
|
613
|
-
<nobr>{{row.f_examinereason}}</nobr
|
|
614
|
-
</td
|
|
609
|
+
<!-- <td style="text-align: center;">-->
|
|
610
|
+
<!-- <nobr>{{row.f_audit_state}}</nobr>-->
|
|
611
|
+
<!-- </td>-->
|
|
612
|
+
<!-- <td style="text-align: center;">-->
|
|
613
|
+
<!-- <nobr>{{row.f_examinereason}}</nobr>-->
|
|
614
|
+
<!-- </td>-->
|
|
615
615
|
<td style="text-align: center;">
|
|
616
616
|
<nobr>{{row.f_depname}}</nobr>
|
|
617
617
|
</td>
|
|
@@ -737,6 +737,7 @@
|
|
|
737
737
|
f_tablebase: row.f_tablebase,
|
|
738
738
|
f_userinfo_id: row.f_userinfo_id,
|
|
739
739
|
f_audit_person: Vue.$login.f.name,
|
|
740
|
+
f_audit_date: Util.toStandardTimeString(),
|
|
740
741
|
f_adjustment_volume: row.f_adjustment_volume
|
|
741
742
|
}
|
|
742
743
|
this.$resetpost('rs/logic/sale_commonEnter', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
@@ -777,7 +778,8 @@
|
|
|
777
778
|
f_input_date: null,
|
|
778
779
|
f_meter_state: '未抄表',
|
|
779
780
|
f_meter_source: null,
|
|
780
|
-
f_audit_person: Vue.$login.f.name
|
|
781
|
+
f_audit_person: Vue.$login.f.name,
|
|
782
|
+
f_audit_date: Util.toStandardTimeString()
|
|
781
783
|
}
|
|
782
784
|
this.$resetpost('rs/entity/t_handplan', handplan, {
|
|
783
785
|
resolveMsg: null,
|