sale-client 3.6.305 → 3.6.306
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/.npmignore +12 -0
- package/package.json +120 -120
- package/src/.npmignore +1 -0
- package/src/components/common/userinfo_detail/UserBaseInfoNew.vue +3 -3
- package/src/components/common/userinfo_detail/ic_detail/ChargeRecordQuery.vue +2 -2
- package/src/components/revenue/machineHandManage/HandplanQuery.vue +0 -7
- package/src/filiale/gehua/machineHandManage/HandplanQuery.vue +1 -7
- package/src/filiale/ningjin/HandplanQuery.vue +1 -7
- package/src/filiale/shaoguan/HandplanQuery.vue +0 -7
- package/src/filiale/wenxi/cardsHand.vue +18 -2
- package/src/filiale/yangchun/CardMeterCenter.vue +2 -2
- package/src/filiale/yangchun/EticketModal.vue +95 -0
- package/src/filiale/yangchun/EticketV4/CustQueryEticket.vue +3 -4
- package/src/filiale/yangchun/EticketV4/EticketOpenCard.vue +4 -5
- package/src/filiale/yangchun/EticketV4/EticketOpenJBPage.vue +4 -5
- package/src/filiale/yangchun/EticketV4/EticketOpenPage.vue +7 -10
- package/src/filiale/yangchun/FilesManage/UserGeneralInfoTest.vue +810 -0
- package/src/filiale/yangchun/FilesManage/UserPaperInfoTest.vue +63 -0
- package/src/filiale/yangchun/sale.js +4 -0
- package/src/filiale/yuncheng/HandplanQuery.vue +0 -7
- package/src/filiale/zhongyi/HandplanQuery.vue +1 -7
- package/yarn.lock +12035 -0
- package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
- package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
package/.npmignore
ADDED
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.146",
|
|
28
|
-
"yarn": "^1.22.10"
|
|
29
|
-
},
|
|
30
|
-
"devDependencies": {
|
|
31
|
-
"address-client": "3.2.105-yangchun",
|
|
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.306",
|
|
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.146",
|
|
28
|
+
"yarn": "^1.22.10"
|
|
29
|
+
},
|
|
30
|
+
"devDependencies": {
|
|
31
|
+
"address-client": "3.2.105-yangchun",
|
|
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
|
+
}
|
package/src/.npmignore
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
|
|
@@ -169,8 +169,9 @@
|
|
|
169
169
|
<button v-if="row.f_meter_type.includes('物联网表')"
|
|
170
170
|
class="button_search" type="button" @click="openUser">开户
|
|
171
171
|
</button>
|
|
172
|
-
<button v-if="row.f_meter_type.includes('物联网表') && valveLimit && row.f_network_valve === '1'"
|
|
173
|
-
class="button_search" type="button" @click="valvecontrol"
|
|
172
|
+
<button v-if="row.f_meter_type.includes('物联网表') && valveLimit && (row.f_network_valve === '1' || (row.f_table_state === '停用' && row.f_network_valve === null))"
|
|
173
|
+
class="button_search" type="button" @click="valvecontrol">
|
|
174
|
+
开关阀
|
|
174
175
|
</button>
|
|
175
176
|
<button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"
|
|
176
177
|
class="button_search" type="button" @click="zdfk">开关自动阀控
|
|
@@ -524,7 +525,6 @@ export default {
|
|
|
524
525
|
this.operateReason = ''
|
|
525
526
|
},
|
|
526
527
|
// 开关阀操作
|
|
527
|
-
// 开关阀操作
|
|
528
528
|
async valveoperate(oper) {
|
|
529
529
|
let msg = oper ? '开阀' : '关阀';
|
|
530
530
|
let delaySeconds = 0; // 初始化 delaySeconds 变量
|
|
@@ -11,10 +11,10 @@
|
|
|
11
11
|
<th><nobr>收款</nobr></th>
|
|
12
12
|
<th><nobr>本期结余</nobr></th>
|
|
13
13
|
<th><nobr>操作类型</nobr></th>
|
|
14
|
-
<th><nobr>写卡状态</nobr></th>
|
|
15
14
|
<th><nobr>操作时间 </nobr></th>
|
|
16
15
|
<th><nobr>操作员 </nobr></th>
|
|
17
16
|
<th><nobr>备注</nobr></th>
|
|
17
|
+
<th><nobr>写卡状态</nobr></th>
|
|
18
18
|
</tr>
|
|
19
19
|
</template>
|
|
20
20
|
<template partial='body' >
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
<td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
|
|
29
29
|
<td style="text-align:center;white-space:nowrap;">{{row.f_curbalance}}</td>
|
|
30
30
|
<td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
|
|
31
|
-
<td style="text-align:center;white-space:nowrap;">{{row.f_write_card}}</td>
|
|
32
31
|
<td style="text-align:center;white-space:nowrap;">{{row.operate_date}}</td>
|
|
33
32
|
<td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
|
|
34
33
|
<td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
|
|
34
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_write_card}}</td>
|
|
35
35
|
</tr>
|
|
36
36
|
</template>
|
|
37
37
|
</data-grid>
|
|
@@ -332,9 +332,6 @@
|
|
|
332
332
|
<th>
|
|
333
333
|
<nobr>用气量</nobr>
|
|
334
334
|
</th>
|
|
335
|
-
<th>
|
|
336
|
-
<nobr>违约金</nobr>
|
|
337
|
-
</th>
|
|
338
335
|
<th>
|
|
339
336
|
<nobr>用气金额</nobr>
|
|
340
337
|
</th>
|
|
@@ -489,9 +486,6 @@
|
|
|
489
486
|
<td style="text-align: center;">
|
|
490
487
|
<nobr>{{row.f_oughtamount}}</nobr>
|
|
491
488
|
</td>
|
|
492
|
-
<td style="text-align: center;">
|
|
493
|
-
<nobr>{{row.overdue}}</nobr>
|
|
494
|
-
</td>
|
|
495
489
|
<td style="text-align: center;">
|
|
496
490
|
<nobr>{{row.f_oughtfee}}</nobr>
|
|
497
491
|
</td>
|
|
@@ -799,7 +793,6 @@
|
|
|
799
793
|
'f_last_tablebase': '上期底数',
|
|
800
794
|
'f_tablebase': '本期底数',
|
|
801
795
|
'f_oughtamount': '用气量',
|
|
802
|
-
'overdue': '违约金',
|
|
803
796
|
'f_oughtfee': '用气金额',
|
|
804
797
|
'f_debt_money': '已交金额',
|
|
805
798
|
'f_actual_arrears': '欠费金额',
|
|
@@ -317,9 +317,6 @@
|
|
|
317
317
|
<th>
|
|
318
318
|
<nobr>用气量</nobr>
|
|
319
319
|
</th>
|
|
320
|
-
<th>
|
|
321
|
-
<nobr>违约金</nobr>
|
|
322
|
-
</th>
|
|
323
320
|
<th>
|
|
324
321
|
<nobr>用气金额</nobr>
|
|
325
322
|
</th>
|
|
@@ -459,9 +456,6 @@
|
|
|
459
456
|
<td style="text-align: center;">
|
|
460
457
|
<nobr>{{row.f_oughtamount}}</nobr>
|
|
461
458
|
</td>
|
|
462
|
-
<td style="text-align: center;">
|
|
463
|
-
<nobr>{{row.overdue}}</nobr>
|
|
464
|
-
</td>
|
|
465
459
|
<td style="text-align: center;">
|
|
466
460
|
<nobr>{{row.f_oughtfee}}</nobr>
|
|
467
461
|
</td>
|
|
@@ -753,7 +747,7 @@
|
|
|
753
747
|
],
|
|
754
748
|
defaultPrint: ['f_userinfo_code', 'f_address', 'f_user_name', 'f_meternumber'],
|
|
755
749
|
excelHeaders:{'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_zones': '片区','phone': '客户手机', 'f_meternumber': '表号','ym_data': '数据年月',
|
|
756
|
-
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', '
|
|
750
|
+
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
|
|
757
751
|
'f_actual_arrears': '欠费金额','f_balance': '上期余额','f_curbalance': '本期余额',
|
|
758
752
|
'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
|
|
759
753
|
'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
|
|
@@ -317,9 +317,6 @@
|
|
|
317
317
|
<th>
|
|
318
318
|
<nobr>用气量</nobr>
|
|
319
319
|
</th>
|
|
320
|
-
<th>
|
|
321
|
-
<nobr>违约金</nobr>
|
|
322
|
-
</th>
|
|
323
320
|
<th>
|
|
324
321
|
<nobr>用气金额</nobr>
|
|
325
322
|
</th>
|
|
@@ -459,9 +456,6 @@
|
|
|
459
456
|
<td style="text-align: center;">
|
|
460
457
|
<nobr>{{row.f_oughtamount}}</nobr>
|
|
461
458
|
</td>
|
|
462
|
-
<td style="text-align: center;">
|
|
463
|
-
<nobr>{{row.overdue}}</nobr>
|
|
464
|
-
</td>
|
|
465
459
|
<td style="text-align: center;">
|
|
466
460
|
<nobr>{{row.f_oughtfee}}</nobr>
|
|
467
461
|
</td>
|
|
@@ -708,7 +702,7 @@
|
|
|
708
702
|
],
|
|
709
703
|
defaultPrint: ['f_userinfo_code', 'f_address', 'f_user_name', 'f_meternumber'],
|
|
710
704
|
excelHeaders:{'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_zones': '片区','phone': '客户手机', 'f_meternumber': '表号','ym_data': '数据年月',
|
|
711
|
-
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量',
|
|
705
|
+
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
|
|
712
706
|
'f_actual_arrears': '欠费金额','f_balance': '上期余额','f_curbalance': '本期余额',
|
|
713
707
|
'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
|
|
714
708
|
'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
|
|
@@ -329,9 +329,6 @@
|
|
|
329
329
|
<th>
|
|
330
330
|
<nobr>用气量</nobr>
|
|
331
331
|
</th>
|
|
332
|
-
<th>
|
|
333
|
-
<nobr>违约金</nobr>
|
|
334
|
-
</th>
|
|
335
332
|
<th>
|
|
336
333
|
<nobr>用气金额</nobr>
|
|
337
334
|
</th>
|
|
@@ -486,9 +483,6 @@
|
|
|
486
483
|
<td style="text-align: center;">
|
|
487
484
|
<nobr>{{row.f_oughtamount}}</nobr>
|
|
488
485
|
</td>
|
|
489
|
-
<td style="text-align: center;">
|
|
490
|
-
<nobr>{{row.overdue}}</nobr>
|
|
491
|
-
</td>
|
|
492
486
|
<td style="text-align: center;">
|
|
493
487
|
<nobr>{{row.f_oughtfee}}</nobr>
|
|
494
488
|
</td>
|
|
@@ -794,7 +788,6 @@
|
|
|
794
788
|
'f_last_tablebase': '上期底数',
|
|
795
789
|
'f_tablebase': '本期底数',
|
|
796
790
|
'f_oughtamount': '用气量',
|
|
797
|
-
'overdue': '违约金',
|
|
798
791
|
'f_oughtfee': '用气金额',
|
|
799
792
|
'f_debt_money': '已交金额',
|
|
800
793
|
'f_actual_arrears': '欠费金额',
|
|
@@ -326,7 +326,23 @@
|
|
|
326
326
|
{{ row.f_input_date }}
|
|
327
327
|
</div>
|
|
328
328
|
</td>
|
|
329
|
-
<td style="text-align: center;">
|
|
329
|
+
<td style="text-align: center;">
|
|
330
|
+
<div v-if="!(row.f_user_type==='非民用')">
|
|
331
|
+
{{ row.f_last_tablebase }}
|
|
332
|
+
</div>
|
|
333
|
+
<div v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0">
|
|
334
|
+
<input type="text" class="form-control" v-model="row.f_last_tablebase"
|
|
335
|
+
@blur="$parent.$parent.$parent.enter(row)"
|
|
336
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
337
|
+
:disabled="row.state === '开始'"
|
|
338
|
+
@change="row.f_card_reason = '替换表抄表'"
|
|
339
|
+
@focus="$parent.$parent.$parent.clearError(row)">
|
|
340
|
+
</div>
|
|
341
|
+
<div v-if="row.f_user_type==='非民用' && (row.f_meter_state !== '未抄表' || row.states === 0)">
|
|
342
|
+
{{ row.f_last_tablebase }}
|
|
343
|
+
</div>
|
|
344
|
+
|
|
345
|
+
</td>
|
|
330
346
|
<td style="text-align: center;">
|
|
331
347
|
<div class="form-group" style="margin-bottom:0px;" :class="{
|
|
332
348
|
'has-success has-feedback': row.f_tablebase ? ((row.f_last_tablebase-0) <= (row.f_tablebase -0)) : false,
|
|
@@ -362,7 +378,7 @@
|
|
|
362
378
|
</td>
|
|
363
379
|
|
|
364
380
|
|
|
365
|
-
<td style="text-align: center;">{{ row.
|
|
381
|
+
<td style="text-align: center;">{{row.f_tablebase - row.f_last_tablebase}}</td>
|
|
366
382
|
<td style="text-align: center;">{{ row.total_gas - (row.f_tablebase - row.f_initial_base) }}</td>
|
|
367
383
|
<td style="text-align: center;">
|
|
368
384
|
<div class="form-group" style="margin-bottom:0px;"
|
|
@@ -393,7 +393,7 @@
|
|
|
393
393
|
self.eticket_show = true
|
|
394
394
|
self.row.f_print = self.model.f_print[0]
|
|
395
395
|
// 应铜川需要卡表显示
|
|
396
|
-
await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费')
|
|
396
|
+
await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费', self.row.f_print)
|
|
397
397
|
// await self.$CommonService.openEticket(res, '售气收费')
|
|
398
398
|
// self.print = true
|
|
399
399
|
}
|
|
@@ -573,7 +573,7 @@
|
|
|
573
573
|
// 下拉框值
|
|
574
574
|
paytype: [],
|
|
575
575
|
printstyle: this.$appdata.getParam('打印格式'),
|
|
576
|
-
printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '
|
|
576
|
+
printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '数电普票',
|
|
577
577
|
privilegeList: [{label: '无优惠', value: '0'}],
|
|
578
578
|
BankTransfer: false,
|
|
579
579
|
// 小数是否支持,导致划价产生的多余气量,金额
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto form-horizontal">
|
|
3
|
+
<modal :show.sync="show" v-ref:modal large backdrop="false" :width="900">
|
|
4
|
+
<header slot="modal-header" class="modal-header">
|
|
5
|
+
<button type="button" class="close" @click="closeShow"><span>×</span></button>
|
|
6
|
+
<h4 class="modal-title">发票信息</h4>
|
|
7
|
+
</header>
|
|
8
|
+
<article slot="modal-body" class="modal-body">
|
|
9
|
+
<div class="auto select-overspread form-horizontal">
|
|
10
|
+
<div class="row auto">
|
|
11
|
+
<div class="col-sm-12 form-group " :class="[!row.f_paper_name ? 'has-error' : '']">
|
|
12
|
+
<label class="control-label col-sm-3">开票名称:</label>
|
|
13
|
+
<input class="form-control "
|
|
14
|
+
v-model="row.f_paper_name" placeholder="开票名称" :disabled="true">
|
|
15
|
+
</div>
|
|
16
|
+
<div class="col-sm-12 form-group " :class="[ row.invoice_is_pax.length < 1 ? 'has-error' : '']">
|
|
17
|
+
<label class="control-label col-sm-3">是否征税:</label>
|
|
18
|
+
<v-select v-model="row.invoice_is_pax"
|
|
19
|
+
placeholder='请选择'
|
|
20
|
+
:value.sync="row.invoice_is_pax"
|
|
21
|
+
close-on-select
|
|
22
|
+
:width="60"
|
|
23
|
+
:value-single="true"
|
|
24
|
+
:search="false"
|
|
25
|
+
:options='is_pax' clear-button>
|
|
26
|
+
</v-select>
|
|
27
|
+
</div>
|
|
28
|
+
<div class="col-sm-12 form-group ">
|
|
29
|
+
<label class="control-label col-sm-3">开户行及账号:</label>
|
|
30
|
+
<input class="form-control col-sm-2"
|
|
31
|
+
v-model="row.f_paper_account" placeholder="购方开户行及账号">
|
|
32
|
+
</div>
|
|
33
|
+
<div class="col-sm-12 form-group "
|
|
34
|
+
:class="[ row.f_taxpayer_id.length<16 || row.f_taxpayer_id.length>18 ? 'has-error' : '']">
|
|
35
|
+
<label class="control-label col-sm-3">纳税人识别号:</label>
|
|
36
|
+
<input class="form-control col-sm-2"
|
|
37
|
+
v-model="row.f_taxpayer_id" placeholder="纳税人识别号(16至18位)">
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-12 form-group " :class="[!row.f_address_phone ? 'has-error' : '']">
|
|
40
|
+
<label class="control-label col-sm-3">开票地址电话:</label>
|
|
41
|
+
<input class="form-control col-sm-2"
|
|
42
|
+
v-model="row.f_address_phone" placeholder="开票地址">
|
|
43
|
+
</div>
|
|
44
|
+
<div class="col-sm-12 form-group " >
|
|
45
|
+
<label class="control-label col-sm-3">发票备注:</label>
|
|
46
|
+
<input class="form-control col-sm-2"
|
|
47
|
+
v-model="row.f_eticket_reason" placeholder="发票备注">
|
|
48
|
+
</div>
|
|
49
|
+
<div class="col-sm-12 form-group ">
|
|
50
|
+
<label class="control-label col-sm-3">邮箱推送:</label>
|
|
51
|
+
<input class="form-control col-sm-2"
|
|
52
|
+
v-model="row.f_email" placeholder="邮箱推送">
|
|
53
|
+
</div>
|
|
54
|
+
</div>
|
|
55
|
+
</div>
|
|
56
|
+
</article>
|
|
57
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
58
|
+
<button type="button" class="btn button_search"
|
|
59
|
+
:disabled="!(row.f_paper_name&&row.f_address_phone&&row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18&&row.invoice_is_pax.length >0)"
|
|
60
|
+
@click='confirm'>确认收费
|
|
61
|
+
</button>
|
|
62
|
+
</footer>
|
|
63
|
+
</modal>
|
|
64
|
+
</div>
|
|
65
|
+
</template>
|
|
66
|
+
<script>
|
|
67
|
+
|
|
68
|
+
export default {
|
|
69
|
+
title: '电子发票',
|
|
70
|
+
data () {
|
|
71
|
+
return {
|
|
72
|
+
is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
props: ['row', 'show'],
|
|
76
|
+
ready () {
|
|
77
|
+
},
|
|
78
|
+
methods: {
|
|
79
|
+
confirm () {
|
|
80
|
+
this.$dispatch('confirm')
|
|
81
|
+
},
|
|
82
|
+
closeShow () {
|
|
83
|
+
this.$dispatch('closemodalshow')
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
watch: {
|
|
87
|
+
'row' () {
|
|
88
|
+
this.row.invoice_is_pax = '征税'
|
|
89
|
+
}
|
|
90
|
+
},
|
|
91
|
+
events: {}
|
|
92
|
+
}
|
|
93
|
+
</script>
|
|
94
|
+
<style>
|
|
95
|
+
</style>
|
|
@@ -231,10 +231,9 @@
|
|
|
231
231
|
if (!this.row.f_taxpayer_id) {
|
|
232
232
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
233
233
|
}
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
// }
|
|
234
|
+
if (!this.row.f_paper_name) {
|
|
235
|
+
this.row.f_paper_name = this.row.f_user_name
|
|
236
|
+
}
|
|
238
237
|
if (!this.row.f_address_phone) {
|
|
239
238
|
this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
|
|
240
239
|
}
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
<th>收款人</th>
|
|
73
73
|
<th>收款部门</th>
|
|
74
74
|
<th>是否开过票</th>
|
|
75
|
-
<th
|
|
75
|
+
<th>结算时间</th>
|
|
76
76
|
<th>操作</th>
|
|
77
77
|
</tr>
|
|
78
78
|
</template>
|
|
@@ -240,10 +240,9 @@ export default {
|
|
|
240
240
|
if (!this.row.f_taxpayer_id) {
|
|
241
241
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
242
242
|
}
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
// }
|
|
243
|
+
if (!this.row.f_paper_name) {
|
|
244
|
+
this.row.f_paper_name = this.row.f_user_name
|
|
245
|
+
}
|
|
247
246
|
if (!this.row.f_address_phone) {
|
|
248
247
|
this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
|
|
249
248
|
}
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
<th>上期底数</th>
|
|
73
73
|
<th>本期底数</th>
|
|
74
74
|
<th>是否开过票</th>
|
|
75
|
-
<th
|
|
75
|
+
<th>结算时间</th>
|
|
76
76
|
<th>操作</th>
|
|
77
77
|
</tr>
|
|
78
78
|
</template>
|
|
@@ -276,10 +276,9 @@ export default {
|
|
|
276
276
|
if (!this.row.f_taxpayer_id) {
|
|
277
277
|
this.row.f_taxpayer_id = this.row.f_idnumber
|
|
278
278
|
}
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
// }
|
|
279
|
+
if (!this.row.f_paper_name) {
|
|
280
|
+
this.row.f_paper_name = this.row.f_user_name
|
|
281
|
+
}
|
|
283
282
|
if (!this.row.f_address_phone) {
|
|
284
283
|
this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
|
|
285
284
|
}
|