manage-client 3.2.89 → 3.2.91
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 +6 -6
- package/package.json +101 -101
- package/src/components/sale/businessquery/ChangeMeterQuery.vue +15 -9
- package/src/components/sale/businessquery/ChargeQuery.vue +6 -0
- package/src/components/sale/businessquery/OtherChargeQuery.vue +1 -1
- package/src/components/sale/businessquery/sellingChargePrice.vue +126 -76
- package/src/components/sale/config/exportConfig.js +2 -2
- package/src/components/webmeter/gasStatistics/GasStatistics.vue +8 -12
- package/src/filiale/meihekou/UserQuery.vue +4 -4
- package/src/filiale/qianneng/SellDepReport.vue +42 -16
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -11,13 +11,13 @@ var compiler = webpack(config)
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
-
var shaoguan='
|
|
15
|
-
var qtx='
|
|
16
|
-
var bendi = '
|
|
14
|
+
var shaoguan='http://119.146.1.106:8300/'
|
|
15
|
+
var qtx='http://36.103.222.144:6300/'
|
|
16
|
+
var bendi = 'http://121.36.106.17:8400'
|
|
17
17
|
// var bendi = 'http://172.168.1.11:9001'
|
|
18
|
-
var fuwu = '
|
|
18
|
+
var fuwu = 'http://121.36.106.17:8400'
|
|
19
19
|
// var fuwu = 'http://172.168.1.11:9001'
|
|
20
|
-
var system = '
|
|
20
|
+
var system = 'http://192.168.50.4:8400'
|
|
21
21
|
//192.168.
|
|
22
22
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
23
23
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
@@ -78,7 +78,7 @@ var proxyTable = {
|
|
|
78
78
|
target: bendi
|
|
79
79
|
},
|
|
80
80
|
'/rs/logic/SumSettleFileImport': {
|
|
81
|
-
target:
|
|
81
|
+
target: bendi
|
|
82
82
|
},
|
|
83
83
|
'/rs': {
|
|
84
84
|
target: bendi
|
package/package.json
CHANGED
|
@@ -1,101 +1,101 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "manage-client",
|
|
3
|
-
"version": "3.2.
|
|
4
|
-
"description": "经营管控模块前台组件",
|
|
5
|
-
"main": "src/index.js",
|
|
6
|
-
"directories": {
|
|
7
|
-
"test": "test"
|
|
8
|
-
},
|
|
9
|
-
"dependencies": {},
|
|
10
|
-
"devDependencies": {
|
|
11
|
-
"axios": "0.15.3",
|
|
12
|
-
"babel-core": "^6.0.0",
|
|
13
|
-
"babel-loader": "^6.0.0",
|
|
14
|
-
"babel-plugin-transform-runtime": "^6.0.0",
|
|
15
|
-
"babel-preset-es2015": "^6.0.0",
|
|
16
|
-
"babel-preset-stage-2": "^6.0.0",
|
|
17
|
-
"chai": "^3.5.0",
|
|
18
|
-
"co": "^4.6.0",
|
|
19
|
-
"connect-history-api-fallback": "^1.1.0",
|
|
20
|
-
"cross-env": "^1.0.7",
|
|
21
|
-
"cross-spawn": "^2.1.5",
|
|
22
|
-
"css-loader": "^0.23.0",
|
|
23
|
-
"echarts": "^4.1.0",
|
|
24
|
-
"eslint": "^2.0.0",
|
|
25
|
-
"eslint-config-standard": "^5.1.0",
|
|
26
|
-
"eslint-friendly-formatter": "^1.2.2",
|
|
27
|
-
"eslint-loader": "^1.3.0",
|
|
28
|
-
"eslint-plugin-html": "^1.3.0",
|
|
29
|
-
"eslint-plugin-promise": "^1.0.8",
|
|
30
|
-
"eslint-plugin-standard": "^1.3.2",
|
|
31
|
-
"eslint-plugin-vue": "^0.1.1",
|
|
32
|
-
"eventsource-polyfill": "^0.9.6",
|
|
33
|
-
"express": "^4.13.3",
|
|
34
|
-
"extract-text-webpack-plugin": "^1.0.1",
|
|
35
|
-
"file-loader": "^0.8.4",
|
|
36
|
-
"function-bind": "^1.0.2",
|
|
37
|
-
"html-webpack-plugin": "^2.8.1",
|
|
38
|
-
"http-proxy-middleware": "^0.11.0",
|
|
39
|
-
"inject-loader": "^2.0.1",
|
|
40
|
-
"isparta-loader": "^2.0.0",
|
|
41
|
-
"jasmine-core": "^2.4.1",
|
|
42
|
-
"jquery": "^3.3.1",
|
|
43
|
-
"jsencrypt": "3.0.0-rc.1",
|
|
44
|
-
"json-loader": "^0.5.4",
|
|
45
|
-
"karma": "^1.4.1",
|
|
46
|
-
"karma-chrome-launcher": "^2.2.0",
|
|
47
|
-
"karma-coverage": "^1.1.1",
|
|
48
|
-
"karma-mocha": "^1.3.0",
|
|
49
|
-
"karma-sinon-chai": "^1.3.1",
|
|
50
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
51
|
-
"karma-spec-reporter": "0.0.31",
|
|
52
|
-
"karma-webpack": "^2.0.2",
|
|
53
|
-
"ldap-clients": "3.0.28",
|
|
54
|
-
"less": "^2.7.3",
|
|
55
|
-
"mkdirp": "^0.5.1",
|
|
56
|
-
"mocha": "^3.2.0",
|
|
57
|
-
"moment": "2.24.0",
|
|
58
|
-
"ncp": "^2.0.0",
|
|
59
|
-
"rimraf": "^2.5.0",
|
|
60
|
-
"sale-client": "3.4.14",
|
|
61
|
-
"selenium-server": "2.52.0",
|
|
62
|
-
"sinon": "^2.1.0",
|
|
63
|
-
"sinon-chai": "^2.8.0",
|
|
64
|
-
"style": "0.0.3",
|
|
65
|
-
"style-loader": "^0.20.3",
|
|
66
|
-
"system-clients": "3.1.89-20",
|
|
67
|
-
"url-loader": "^0.5.7",
|
|
68
|
-
"vue-amap": "0.5.10",
|
|
69
|
-
"vue-client": "1.24.33",
|
|
70
|
-
"vue-hot-reload-api": "^1.2.0",
|
|
71
|
-
"vue-html-loader": "^1.0.0",
|
|
72
|
-
"vue-loader": "8.2.1",
|
|
73
|
-
"vue-resource": "^1.5.0",
|
|
74
|
-
"vue-router": "^0.7.13",
|
|
75
|
-
"vue-strap": "^1.0.9",
|
|
76
|
-
"vue-style-loader": "^1.0.0",
|
|
77
|
-
"vue-validator": "2.1.7",
|
|
78
|
-
"webpack": "1.12.2",
|
|
79
|
-
"webpack-dev-middleware": "^1.4.0",
|
|
80
|
-
"webpack-hot-middleware": "^2.6.0",
|
|
81
|
-
"webpack-merge": "^0.8.3"
|
|
82
|
-
},
|
|
83
|
-
"scripts": {
|
|
84
|
-
"unit": "karma start test/unit/karma.conf.js --single-run",
|
|
85
|
-
"example": "node build/example-server.js",
|
|
86
|
-
"dev": "node build/dev-server.js",
|
|
87
|
-
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
88
|
-
"build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
89
|
-
"e2e": "node test/e2e/runner.js",
|
|
90
|
-
"release": "bash build/release.sh"
|
|
91
|
-
},
|
|
92
|
-
"repository": {
|
|
93
|
-
"type": "git",
|
|
94
|
-
"url": "https://gitee.com/aote/management_modules.git"
|
|
95
|
-
},
|
|
96
|
-
"keywords": [
|
|
97
|
-
"manage"
|
|
98
|
-
],
|
|
99
|
-
"author": "liuxudong",
|
|
100
|
-
"license": "ISC"
|
|
101
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "manage-client",
|
|
3
|
+
"version": "3.2.91",
|
|
4
|
+
"description": "经营管控模块前台组件",
|
|
5
|
+
"main": "src/index.js",
|
|
6
|
+
"directories": {
|
|
7
|
+
"test": "test"
|
|
8
|
+
},
|
|
9
|
+
"dependencies": {},
|
|
10
|
+
"devDependencies": {
|
|
11
|
+
"axios": "0.15.3",
|
|
12
|
+
"babel-core": "^6.0.0",
|
|
13
|
+
"babel-loader": "^6.0.0",
|
|
14
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
|
15
|
+
"babel-preset-es2015": "^6.0.0",
|
|
16
|
+
"babel-preset-stage-2": "^6.0.0",
|
|
17
|
+
"chai": "^3.5.0",
|
|
18
|
+
"co": "^4.6.0",
|
|
19
|
+
"connect-history-api-fallback": "^1.1.0",
|
|
20
|
+
"cross-env": "^1.0.7",
|
|
21
|
+
"cross-spawn": "^2.1.5",
|
|
22
|
+
"css-loader": "^0.23.0",
|
|
23
|
+
"echarts": "^4.1.0",
|
|
24
|
+
"eslint": "^2.0.0",
|
|
25
|
+
"eslint-config-standard": "^5.1.0",
|
|
26
|
+
"eslint-friendly-formatter": "^1.2.2",
|
|
27
|
+
"eslint-loader": "^1.3.0",
|
|
28
|
+
"eslint-plugin-html": "^1.3.0",
|
|
29
|
+
"eslint-plugin-promise": "^1.0.8",
|
|
30
|
+
"eslint-plugin-standard": "^1.3.2",
|
|
31
|
+
"eslint-plugin-vue": "^0.1.1",
|
|
32
|
+
"eventsource-polyfill": "^0.9.6",
|
|
33
|
+
"express": "^4.13.3",
|
|
34
|
+
"extract-text-webpack-plugin": "^1.0.1",
|
|
35
|
+
"file-loader": "^0.8.4",
|
|
36
|
+
"function-bind": "^1.0.2",
|
|
37
|
+
"html-webpack-plugin": "^2.8.1",
|
|
38
|
+
"http-proxy-middleware": "^0.11.0",
|
|
39
|
+
"inject-loader": "^2.0.1",
|
|
40
|
+
"isparta-loader": "^2.0.0",
|
|
41
|
+
"jasmine-core": "^2.4.1",
|
|
42
|
+
"jquery": "^3.3.1",
|
|
43
|
+
"jsencrypt": "3.0.0-rc.1",
|
|
44
|
+
"json-loader": "^0.5.4",
|
|
45
|
+
"karma": "^1.4.1",
|
|
46
|
+
"karma-chrome-launcher": "^2.2.0",
|
|
47
|
+
"karma-coverage": "^1.1.1",
|
|
48
|
+
"karma-mocha": "^1.3.0",
|
|
49
|
+
"karma-sinon-chai": "^1.3.1",
|
|
50
|
+
"karma-sourcemap-loader": "^0.3.7",
|
|
51
|
+
"karma-spec-reporter": "0.0.31",
|
|
52
|
+
"karma-webpack": "^2.0.2",
|
|
53
|
+
"ldap-clients": "3.0.28",
|
|
54
|
+
"less": "^2.7.3",
|
|
55
|
+
"mkdirp": "^0.5.1",
|
|
56
|
+
"mocha": "^3.2.0",
|
|
57
|
+
"moment": "2.24.0",
|
|
58
|
+
"ncp": "^2.0.0",
|
|
59
|
+
"rimraf": "^2.5.0",
|
|
60
|
+
"sale-client": "3.4.14",
|
|
61
|
+
"selenium-server": "2.52.0",
|
|
62
|
+
"sinon": "^2.1.0",
|
|
63
|
+
"sinon-chai": "^2.8.0",
|
|
64
|
+
"style": "0.0.3",
|
|
65
|
+
"style-loader": "^0.20.3",
|
|
66
|
+
"system-clients": "3.1.89-20",
|
|
67
|
+
"url-loader": "^0.5.7",
|
|
68
|
+
"vue-amap": "0.5.10",
|
|
69
|
+
"vue-client": "1.24.33",
|
|
70
|
+
"vue-hot-reload-api": "^1.2.0",
|
|
71
|
+
"vue-html-loader": "^1.0.0",
|
|
72
|
+
"vue-loader": "8.2.1",
|
|
73
|
+
"vue-resource": "^1.5.0",
|
|
74
|
+
"vue-router": "^0.7.13",
|
|
75
|
+
"vue-strap": "^1.0.9",
|
|
76
|
+
"vue-style-loader": "^1.0.0",
|
|
77
|
+
"vue-validator": "2.1.7",
|
|
78
|
+
"webpack": "1.12.2",
|
|
79
|
+
"webpack-dev-middleware": "^1.4.0",
|
|
80
|
+
"webpack-hot-middleware": "^2.6.0",
|
|
81
|
+
"webpack-merge": "^0.8.3"
|
|
82
|
+
},
|
|
83
|
+
"scripts": {
|
|
84
|
+
"unit": "karma start test/unit/karma.conf.js --single-run",
|
|
85
|
+
"example": "node build/example-server.js",
|
|
86
|
+
"dev": "node build/dev-server.js",
|
|
87
|
+
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
88
|
+
"build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
89
|
+
"e2e": "node test/e2e/runner.js",
|
|
90
|
+
"release": "bash build/release.sh"
|
|
91
|
+
},
|
|
92
|
+
"repository": {
|
|
93
|
+
"type": "git",
|
|
94
|
+
"url": "https://gitee.com/aote/management_modules.git"
|
|
95
|
+
},
|
|
96
|
+
"keywords": [
|
|
97
|
+
"manage"
|
|
98
|
+
],
|
|
99
|
+
"author": "liuxudong",
|
|
100
|
+
"license": "ISC"
|
|
101
|
+
}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
:value.sync="model.startDate"
|
|
14
14
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
15
15
|
:show-reset-button="true"
|
|
16
|
-
condition="
|
|
16
|
+
condition="f_install_date >= '{}'">
|
|
17
17
|
</datepicker>
|
|
18
18
|
</div>
|
|
19
19
|
<div class="col-sm-2 form-group">
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
:value.sync="model.endDate"
|
|
24
24
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
25
25
|
:show-reset-button="true"
|
|
26
|
-
condition="
|
|
26
|
+
condition="f_install_date <= '{}'">
|
|
27
27
|
</datepicker>
|
|
28
28
|
</div>
|
|
29
29
|
<div class="col-sm-2 form-group ">
|
|
@@ -240,8 +240,11 @@
|
|
|
240
240
|
</th>
|
|
241
241
|
<th>
|
|
242
242
|
<!-- <nobr>换表日期</nobr>-->
|
|
243
|
-
<data-order field="
|
|
244
|
-
:order.sync="$parent.$parent.$parent.orderFields.
|
|
243
|
+
<data-order field="f_install_date" name="换表日期"
|
|
244
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_install_date"></data-order>
|
|
245
|
+
</th>
|
|
246
|
+
<th>
|
|
247
|
+
<nobr>操作日期</nobr>
|
|
245
248
|
</th>
|
|
246
249
|
<th>
|
|
247
250
|
<nobr>人员</nobr>
|
|
@@ -314,6 +317,9 @@
|
|
|
314
317
|
<td style="text-align: center;">
|
|
315
318
|
<nobr>{{row.f_state}}</nobr>
|
|
316
319
|
</td>
|
|
320
|
+
<td style="text-align: center;">
|
|
321
|
+
<nobr>{{row.f_install_date}}</nobr>
|
|
322
|
+
</td>
|
|
317
323
|
<td style="text-align: center;">
|
|
318
324
|
<nobr>{{row.f_operate_date}}</nobr>
|
|
319
325
|
</td>
|
|
@@ -430,7 +436,7 @@
|
|
|
430
436
|
footer:[],
|
|
431
437
|
meterbrands: [],
|
|
432
438
|
pricenames: [],
|
|
433
|
-
model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'
|
|
439
|
+
model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_install_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
|
|
434
440
|
criteriaShow: false,
|
|
435
441
|
orgCondtionStr: '',
|
|
436
442
|
modelval: [],
|
|
@@ -443,12 +449,12 @@
|
|
|
443
449
|
user:[],
|
|
444
450
|
},
|
|
445
451
|
config: {
|
|
446
|
-
defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
|
|
452
|
+
defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state','f_install_date', 'f_operate_date']
|
|
447
453
|
},
|
|
448
454
|
//排序
|
|
449
|
-
orderitem:'
|
|
455
|
+
orderitem:'f_install_date desc',
|
|
450
456
|
orderFields: {
|
|
451
|
-
|
|
457
|
+
f_install_date: 'no'
|
|
452
458
|
},
|
|
453
459
|
show:false,
|
|
454
460
|
rowdata:{},
|
|
@@ -643,7 +649,7 @@
|
|
|
643
649
|
getCondition() {
|
|
644
650
|
return {
|
|
645
651
|
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
646
|
-
orderitem: this.orderitem?`${this.orderitem}`: "
|
|
652
|
+
orderitem: this.orderitem?`${this.orderitem}`: " f_install_date desc"}
|
|
647
653
|
},
|
|
648
654
|
getfield() {
|
|
649
655
|
return exportConfig.changemeterConfig
|
|
@@ -335,6 +335,9 @@
|
|
|
335
335
|
<nobr>片区</nobr>
|
|
336
336
|
</th>
|
|
337
337
|
<th>
|
|
338
|
+
<nobr>小区</nobr>
|
|
339
|
+
</th>
|
|
340
|
+
<th>
|
|
338
341
|
<!-- <nobr>客户地址</nobr>-->
|
|
339
342
|
<data-order field="f_address" name="客户地址"
|
|
340
343
|
:order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
@@ -527,6 +530,9 @@
|
|
|
527
530
|
<td style="text-align: center;">
|
|
528
531
|
<nobr>{{row.f_zones}}</nobr>
|
|
529
532
|
</td>
|
|
533
|
+
<td style="text-align: center;"><nobr>
|
|
534
|
+
<nobr>{{row.f_residential_area}}</nobr>
|
|
535
|
+
</nobr> </td>
|
|
530
536
|
<td style="text-align: center;">
|
|
531
537
|
<nobr>{{row.f_address}}</nobr>
|
|
532
538
|
</td>
|
|
@@ -425,7 +425,7 @@
|
|
|
425
425
|
data: {},
|
|
426
426
|
other:[],
|
|
427
427
|
footer:[],
|
|
428
|
-
model: new PagedList('rs/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_money: 0,hushu:0}),
|
|
428
|
+
model: new PagedList('rs/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc'"}, {f_money: 0,hushu:0}),
|
|
429
429
|
criteriaShow: false,
|
|
430
430
|
orgCondtionStr: '',
|
|
431
431
|
modelval: [],
|
|
@@ -29,8 +29,33 @@
|
|
|
29
29
|
<div class="col-sm-2 form-group">
|
|
30
30
|
<label class="font_normal_body">客户编号</label>
|
|
31
31
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
32
|
-
condition="f_userinfo_code = '{}' " placeholder="客户编号">
|
|
32
|
+
condition="u.f_userinfo_code = '{}' " placeholder="客户编号">
|
|
33
33
|
</div>
|
|
34
|
+
<div class="col-sm-2 form-group">
|
|
35
|
+
<label class="font_normal_body">气表类型</label>
|
|
36
|
+
<v-select :value.sync="model.metertypes" v-model="model.metertypes"
|
|
37
|
+
@change="$parent.$parent.metertypeschange"
|
|
38
|
+
condition="s.f_meter_type = '{}'" multiple
|
|
39
|
+
placeholder='气表类型' :options="$parent.$parent.metertypes"
|
|
40
|
+
close-on-select v-ref:type>
|
|
41
|
+
</v-select>
|
|
42
|
+
|
|
43
|
+
</div>
|
|
44
|
+
|
|
45
|
+
<div class="col-sm-2 form-group">
|
|
46
|
+
<label class="font_normal_body">收费类型</label>
|
|
47
|
+
<v-select :value.sync="model.typesss" v-model="model.typesss"
|
|
48
|
+
@change="$parent.$parent.typechangesss"
|
|
49
|
+
condition="s.f_type = '{}'"
|
|
50
|
+
placeholder='收费类型' :options="$parent.$parent.typesss"
|
|
51
|
+
close-on-select v-ref:type>
|
|
52
|
+
|
|
53
|
+
</v-select>
|
|
54
|
+
</div>
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
|
|
58
|
+
|
|
34
59
|
<div class="span" style="float:right;">
|
|
35
60
|
<button class="button_search button_spacing" v-show="false" @click="$parent.$parent.ReadIDCard()">读取身份证</button>
|
|
36
61
|
<read-card :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn" v-ref:readcard></read-card>
|
|
@@ -57,28 +82,29 @@
|
|
|
57
82
|
<div class="col-sm-2 form-group">
|
|
58
83
|
<label class="font_normal_body">客户名称</label>
|
|
59
84
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
60
|
-
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
61
|
-
</div>
|
|
62
|
-
<div class="col-sm-2 form-group">
|
|
63
|
-
<label class="font_normal_body">客户电话</label>
|
|
64
|
-
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
|
|
65
|
-
condition="f_user_phone like '%{}%'" placeholder="客户电话">
|
|
66
|
-
</div>
|
|
67
|
-
<div class="col-sm-2 form-group">
|
|
68
|
-
<label class="font_normal_body">身份证号</label>
|
|
69
|
-
<input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"
|
|
70
|
-
condition="f_idnumber like '%{}%'" placeholder="身份证号">
|
|
71
|
-
</div>
|
|
72
|
-
<div class="col-sm-2 form-group">
|
|
73
|
-
<label class="font_normal_body">客户地址</label>
|
|
74
|
-
<input type="text" style="width:60%" class="input_search" v-model="model.f_address"
|
|
75
|
-
condition="f_address like '%{}%'" placeholder='客户地址'>
|
|
85
|
+
condition="s.f_user_name like '%{}%'" placeholder="客户名称">
|
|
76
86
|
</div>
|
|
87
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
88
|
+
<!-- <label class="font_normal_body">客户电话</label>-->
|
|
89
|
+
<!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"-->
|
|
90
|
+
<!-- condition="f_user_phone like '%{}%'" placeholder="客户电话">-->
|
|
91
|
+
<!-- </div>-->
|
|
92
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
93
|
+
<!-- <label class="font_normal_body">身份证号</label>-->
|
|
94
|
+
<!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"-->
|
|
95
|
+
<!-- condition="f_idnumber like '%{}%'" placeholder="身份证号">-->
|
|
96
|
+
<!-- </div>-->
|
|
97
|
+
<!-- <div class="col-sm-2 form-group">-->
|
|
98
|
+
<!-- <label class="font_normal_body">客户地址</label>-->
|
|
99
|
+
<!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
|
|
100
|
+
<!-- condition="f_address like '%{}%'" placeholder='客户地址'>-->
|
|
101
|
+
<!-- </div>-->
|
|
77
102
|
|
|
78
103
|
<div class="col-sm-2 form-group">
|
|
79
104
|
<label class="font_normal_body">气价类型</label>
|
|
80
|
-
<v-select :value.sync="model.
|
|
105
|
+
<v-select :value.sync="model.pricetypes" v-model="model.pricetypes"
|
|
81
106
|
@change="$parent.$parent.pricetypechanged"
|
|
107
|
+
condition="sp.f_user_name like '%{}%'"
|
|
82
108
|
placeholder='气价类型' :options="$parent.$parent.pricetypes"
|
|
83
109
|
close-on-select v-ref:type>
|
|
84
110
|
</v-select>
|
|
@@ -87,13 +113,38 @@
|
|
|
87
113
|
|
|
88
114
|
<div class="col-sm-2 form-group">
|
|
89
115
|
<label class="font_normal_body">气价名称</label>
|
|
90
|
-
<v-select :value.sync="model.
|
|
91
|
-
v-model="model.
|
|
92
|
-
|
|
93
|
-
:options="$parent.$parent.
|
|
116
|
+
<v-select :value.sync="model.pricename"
|
|
117
|
+
v-model="model.pricename"
|
|
118
|
+
@change="$parent.$parent.pricenamechanged"
|
|
119
|
+
:options="$parent.$parent.pricename"
|
|
94
120
|
condition="f_price_name in {}"
|
|
95
121
|
></v-select>
|
|
96
122
|
</div>
|
|
123
|
+
<div class="col-sm-2 form-group">
|
|
124
|
+
<label class="font_normal_body">单价</label>
|
|
125
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_price"
|
|
126
|
+
condition="c.f_price = '%{}%'" placeholder='单价'>
|
|
127
|
+
</div>
|
|
128
|
+
|
|
129
|
+
<div class="col-sm-2 form-group">
|
|
130
|
+
<label class="font_normal_body">客户类型</label>
|
|
131
|
+
<v-select :value.sync="model.usertypes" v-model="model.usertypes"
|
|
132
|
+
@change="$parent.$parent.usertypechange"
|
|
133
|
+
condition="s.f_user_type = '{}'"
|
|
134
|
+
placeholder='客户类型' :options="$parent.$parent.usertypes"
|
|
135
|
+
close-on-select v-ref:type>
|
|
136
|
+
</v-select>
|
|
137
|
+
</div>
|
|
138
|
+
<div class="col-sm-2 form-group">
|
|
139
|
+
<label class="font_normal_body">用气类型</label>
|
|
140
|
+
<v-select :value.sync="model.gaspropertiestyps" v-model="model.gaspropertiestyps"
|
|
141
|
+
@change="$parent.$parent.gaspropertieschange"
|
|
142
|
+
condition="s.f_gasproperties = '{}'"
|
|
143
|
+
placeholder='用气类型' :options="$parent.$parent.gaspropertiestyps"
|
|
144
|
+
close-on-select v-ref:type>
|
|
145
|
+
</v-select>
|
|
146
|
+
</div>
|
|
147
|
+
|
|
97
148
|
|
|
98
149
|
|
|
99
150
|
|
|
@@ -114,9 +165,18 @@
|
|
|
114
165
|
<th>
|
|
115
166
|
<nobr>客户类型</nobr>
|
|
116
167
|
</th>
|
|
168
|
+
<th>
|
|
169
|
+
<nobr>用气性质</nobr>
|
|
170
|
+
</th>
|
|
171
|
+
<th>
|
|
172
|
+
<nobr>气表类型</nobr>
|
|
173
|
+
</th>
|
|
117
174
|
<th>
|
|
118
175
|
<nobr>气价名称</nobr>
|
|
119
176
|
</th>
|
|
177
|
+
<th>
|
|
178
|
+
<nobr>收费类型</nobr>
|
|
179
|
+
</th>
|
|
120
180
|
<th>
|
|
121
181
|
<nobr>单价</nobr>
|
|
122
182
|
</th>
|
|
@@ -138,9 +198,18 @@
|
|
|
138
198
|
<td style="text-align: center;">
|
|
139
199
|
<nobr>{{row.f_user_type}}</nobr>
|
|
140
200
|
</td>
|
|
201
|
+
<td style="text-align: center;">
|
|
202
|
+
<nobr>{{row.f_gasproperties}}</nobr>
|
|
203
|
+
</td>
|
|
204
|
+
<td style="text-align: center;">
|
|
205
|
+
<nobr>{{row.f_meter_type}}</nobr>
|
|
206
|
+
</td>
|
|
141
207
|
<td style="text-align: center;">
|
|
142
208
|
<nobr>{{row.f_price_name}}</nobr>
|
|
143
209
|
</td>
|
|
210
|
+
<td style="text-align: center;">
|
|
211
|
+
<nobr>{{row.f_type}}</nobr>
|
|
212
|
+
</td>
|
|
144
213
|
<td style="text-align: center;">
|
|
145
214
|
<nobr>{{row.f_price}}</nobr>
|
|
146
215
|
</td>
|
|
@@ -156,30 +225,6 @@
|
|
|
156
225
|
</data-grid>
|
|
157
226
|
</criteria-paged>
|
|
158
227
|
<table class="table-hover">
|
|
159
|
-
<!-- <tr style="position: relative" class="table-bordered">-->
|
|
160
|
-
<!-- <td-->
|
|
161
|
-
<!-- style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">-->
|
|
162
|
-
<!-- 汇总信息-->
|
|
163
|
-
<!-- </td>-->
|
|
164
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
165
|
-
<!-- 一阶气量合计: {{sumsmodel.f_stairamount1}}-->
|
|
166
|
-
<!-- </td>-->
|
|
167
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
168
|
-
<!-- 一阶气费合计: {{sumsmodel.f_stair1fee}}-->
|
|
169
|
-
<!-- </td>-->
|
|
170
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
171
|
-
<!-- 二阶气量合计: {{sumsmodel.f_stair2amount}}-->
|
|
172
|
-
<!-- </td>-->
|
|
173
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
174
|
-
<!-- 二阶气费合计: {{sumsmodel.f_stair2fee}}-->
|
|
175
|
-
<!-- </td>-->
|
|
176
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
177
|
-
<!-- 三阶气量合计: {{sumsmodel.f_stair3amount}}-->
|
|
178
|
-
<!-- </td>-->
|
|
179
|
-
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
180
|
-
<!-- 三阶气费合计: {{sumsmodel.f_stair3fee}}-->
|
|
181
|
-
<!-- </td>-->
|
|
182
|
-
<!-- </tr>-->
|
|
183
228
|
</table>
|
|
184
229
|
</div>
|
|
185
230
|
</div>
|
|
@@ -322,22 +367,25 @@
|
|
|
322
367
|
},
|
|
323
368
|
methods: {
|
|
324
369
|
pricetypechanged(){
|
|
370
|
+
this.$refs.paged.$refs.cri.model.f_price_type = []
|
|
371
|
+
},
|
|
372
|
+
usertypechange(){
|
|
373
|
+
this.$refs.paged.$refs.cri.model.f_user_type = []
|
|
374
|
+
},
|
|
375
|
+
gaspropertieschange(){
|
|
376
|
+
this.$refs.paged.$refs.cri.model.f_gasproperties = []
|
|
377
|
+
},
|
|
378
|
+
metertypeschange(){
|
|
379
|
+
this.$refs.paged.$refs.cri.model.f_meter_type = []
|
|
380
|
+
},
|
|
381
|
+
typechangesss(){
|
|
382
|
+
this.$refs.paged.$refs.cri.model.f_type = []
|
|
383
|
+
},
|
|
384
|
+
pricenamechanged(){
|
|
325
385
|
this.$refs.paged.$refs.cri.model.f_price_name = []
|
|
326
386
|
},
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
// let HttpReset = new HttpResetClass()
|
|
330
|
-
// let param = {
|
|
331
|
-
// items: 'f_terminal_name',
|
|
332
|
-
// tablename: 't_equipment',
|
|
333
|
-
// condition: `f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.$login.f.orgid}'`,
|
|
334
|
-
// orderitem: 'id'
|
|
335
|
-
// }
|
|
336
|
-
// var data = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
|
|
337
|
-
// for (let row of data.data) {
|
|
338
|
-
// this.posEquipment.push({label: row.f_terminal_name, value: row.f_terminal_name})
|
|
339
|
-
// }
|
|
340
|
-
// },
|
|
387
|
+
|
|
388
|
+
|
|
341
389
|
ReadIDCard(){
|
|
342
390
|
this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
|
|
343
391
|
console.log('======',msg)
|
|
@@ -400,21 +448,6 @@
|
|
|
400
448
|
this.footer.push(footerData);
|
|
401
449
|
this.other.push(otherInData);
|
|
402
450
|
},
|
|
403
|
-
// async getaddress(){
|
|
404
|
-
// let HttpReset = new HttpResetClass()
|
|
405
|
-
// var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
|
|
406
|
-
// data: {
|
|
407
|
-
// condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
|
|
408
|
-
// }
|
|
409
|
-
// }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
|
|
410
|
-
// console.log('小区',data)
|
|
411
|
-
// let house = [{label: '全部', value: ''}]
|
|
412
|
-
// for (let row of data.data){
|
|
413
|
-
// house.push({label: row.f_residential_area, value: row.f_residential_area})
|
|
414
|
-
// }
|
|
415
|
-
// this.residentialArea = house
|
|
416
|
-
// },
|
|
417
|
-
//把数据库查询数据转换为下拉数据
|
|
418
451
|
calculate(rows){
|
|
419
452
|
let data = []
|
|
420
453
|
rows.forEach((row, n) => {
|
|
@@ -656,7 +689,24 @@
|
|
|
656
689
|
},
|
|
657
690
|
pricetypes() {
|
|
658
691
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
659
|
-
}
|
|
692
|
+
},
|
|
693
|
+
|
|
694
|
+
pricename(){
|
|
695
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价名称')]
|
|
696
|
+
},
|
|
697
|
+
usertypes(){
|
|
698
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')]
|
|
699
|
+
},
|
|
700
|
+
gaspropertiestyps(){
|
|
701
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
|
|
702
|
+
},
|
|
703
|
+
metertypes(){
|
|
704
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
705
|
+
},
|
|
706
|
+
typesss(){
|
|
707
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
|
|
708
|
+
},
|
|
709
|
+
|
|
660
710
|
}
|
|
661
711
|
}
|
|
662
712
|
</script>
|
|
@@ -78,7 +78,7 @@ export default{
|
|
|
78
78
|
'f_delaypay': '滞纳金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
|
|
79
79
|
'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
|
|
80
80
|
'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
|
|
81
|
-
'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员'
|
|
81
|
+
'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员','f_residential_area':'小区'
|
|
82
82
|
},
|
|
83
83
|
pricetypeGasConfig: {
|
|
84
84
|
'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'
|
|
@@ -226,7 +226,7 @@ export default{
|
|
|
226
226
|
'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址',
|
|
227
227
|
'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号',
|
|
228
228
|
'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
|
|
229
|
-
'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', '
|
|
229
|
+
'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_install_date': '换表日期', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
|
|
230
230
|
'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司'
|
|
231
231
|
},
|
|
232
232
|
changemeterprintConfig: {
|
|
@@ -353,12 +353,8 @@
|
|
|
353
353
|
|
|
354
354
|
search (args) {
|
|
355
355
|
args.condition = `${args.condition}`+this.orgcondition
|
|
356
|
-
console.log(args.condition+"args.condition")
|
|
357
356
|
this.condition = args.condition
|
|
358
357
|
this.model.search(args.condition, args.model)
|
|
359
|
-
console.log(this.$refs.paged.$refs.grid.model.sums+"--this.$refs.paged.$refs.grid.model.sums")
|
|
360
|
-
console.log(this.f_gas_state)
|
|
361
|
-
|
|
362
358
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
363
359
|
// args.condition = `${args.condition}`
|
|
364
360
|
// if (this.orgcondition)
|
|
@@ -444,17 +440,17 @@
|
|
|
444
440
|
]
|
|
445
441
|
},
|
|
446
442
|
getCondition () {
|
|
447
|
-
var con = ""
|
|
448
|
-
if (this.orgCondtionStr) {
|
|
449
|
-
|
|
450
|
-
}
|
|
451
|
-
else {
|
|
452
|
-
|
|
453
|
-
}
|
|
443
|
+
// var con = ""
|
|
444
|
+
// if (this.orgCondtionStr) {
|
|
445
|
+
// con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in (${this.orgCondtionStr})`
|
|
446
|
+
// }
|
|
447
|
+
// else {
|
|
448
|
+
// con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
|
|
449
|
+
// }
|
|
454
450
|
return {
|
|
455
451
|
startDate: this.$refs.paged.$refs.criteria.model.startDate,
|
|
456
452
|
endDate: this.$refs.paged.$refs.criteria.model.endDate,
|
|
457
|
-
condition:
|
|
453
|
+
condition: this.condition
|
|
458
454
|
}
|
|
459
455
|
}
|
|
460
456
|
}
|
|
@@ -137,22 +137,22 @@
|
|
|
137
137
|
<div class="col-sm-2 form-group">
|
|
138
138
|
<label class="font_normal_body"> 楼栋 </label>
|
|
139
139
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_building"
|
|
140
|
-
condition="f_building
|
|
140
|
+
condition="f_building = '{}'" placeholder="楼栋"/>
|
|
141
141
|
</div>
|
|
142
142
|
<div class="col-sm-2 form-group">
|
|
143
143
|
<label class="font_normal_body"> 单元 </label>
|
|
144
144
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_unit"
|
|
145
|
-
condition="f_unit
|
|
145
|
+
condition="f_unit = '{}'" placeholder="单元"/>
|
|
146
146
|
</div>
|
|
147
147
|
<div class="col-sm-2 form-group">
|
|
148
148
|
<label class="font_normal_body"> 楼层 </label>
|
|
149
149
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_floor"
|
|
150
|
-
condition="f_floor
|
|
150
|
+
condition="f_floor = '{}'" placeholder="楼层"/>
|
|
151
151
|
</div>
|
|
152
152
|
<div class="col-sm-2 form-group">
|
|
153
153
|
<label class="font_normal_body"> 门牌号</label>
|
|
154
154
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_room"
|
|
155
|
-
condition="f_room
|
|
155
|
+
condition="f_room = '{}'" placeholder="门牌号">
|
|
156
156
|
</div>
|
|
157
157
|
<div class="col-sm-2 form-group">
|
|
158
158
|
<label class="font_normal_body">余额区间</label>
|
|
@@ -35,17 +35,21 @@
|
|
|
35
35
|
<!--condition="f_payment in {}"-->
|
|
36
36
|
<!--close-on-select></v-select>-->
|
|
37
37
|
<!--</div>-->
|
|
38
|
-
<res-select-group :show-component="$parent.$parent.resshow"
|
|
38
|
+
<res-select-group :show-component="$parent.$parent.resshow"
|
|
39
|
+
:selectin="true" :initres="$parent.$parent.initres"
|
|
40
|
+
@re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
39
41
|
</div>
|
|
40
42
|
<div class="span" style = "float:right;">
|
|
41
43
|
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
<report-print id='gasprice' top='
|
|
44
|
+
<!--<tie-an-account v-if="this.$login.r.includes('报表扎帐')"-->
|
|
45
|
+
<!--:org="$parent.$parent.org"-->
|
|
46
|
+
<!--@update="$parent.$parent.update"-->
|
|
47
|
+
<!--:model="$parent.$parent.data"-->
|
|
48
|
+
<!--:fee-str="$parent.model.data"-->
|
|
49
|
+
<!--:end-date="model.endDate" ></tie-an-account>-->
|
|
50
|
+
<report-print id='gasprice' top='1cm' left='0' width='100%' height='100%' :preview="true"
|
|
51
|
+
:style="styledata"
|
|
52
|
+
></report-print>
|
|
49
53
|
<report-excel id='gasprice'></report-excel>
|
|
50
54
|
</div>
|
|
51
55
|
</div>
|
|
@@ -54,18 +58,18 @@
|
|
|
54
58
|
<table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
|
|
55
59
|
<thead>
|
|
56
60
|
<tr>
|
|
57
|
-
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
|
|
61
|
+
<th :colspan='$parent.tablen+1' style="font-weight: normal; text-align: left;">
|
|
58
62
|
<h3 style="text-align: center">营业厅日结账</h3>
|
|
59
63
|
</th>
|
|
60
64
|
</tr>
|
|
61
65
|
<tr>
|
|
62
|
-
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
|
|
66
|
+
<th :colspan='$parent.tablen+1' style="font-weight: normal; text-align: center;">
|
|
63
67
|
时间区间：{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
|
|
64
68
|
打印时间：{{$parent.printTime}}
|
|
65
69
|
</th>
|
|
66
70
|
</tr>
|
|
67
71
|
<tr>
|
|
68
|
-
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
|
|
72
|
+
<th :colspan='$parent.tablen+1' style="font-weight: normal; text-align: center;">
|
|
69
73
|
<div>
|
|
70
74
|
<span v-show="$parent.orgname[0]">公司：{{$parent.orgname}}</span>
|
|
71
75
|
<span v-show="$parent.depname[0]"> 部门：{{$parent.depname}}</span>
|
|
@@ -75,15 +79,15 @@
|
|
|
75
79
|
</tr>
|
|
76
80
|
</thead>
|
|
77
81
|
<tr>
|
|
78
|
-
<td :colspan='$parent.tablen' class="noborder">
|
|
82
|
+
<td :colspan='$parent.tablen+1' class="noborder">
|
|
79
83
|
{{{ $parent.datas }}}
|
|
80
84
|
</td>
|
|
81
85
|
</tr>
|
|
82
86
|
<tfoot>
|
|
83
87
|
<tr style="text-align: left">
|
|
84
|
-
<th :colspan='Math.floor($parent.tablen/3)'>财务审核：</th>
|
|
85
|
-
<th :colspan='Math.round($parent.tablen/3)'>收款审核：</th>
|
|
86
|
-
<th :colspan='Math.round($parent.tablen/3)'>收款员：</th>
|
|
88
|
+
<th :colspan='Math.floor(($parent.tablen+1)/3)'>财务审核：</th>
|
|
89
|
+
<th :colspan='Math.round(($parent.tablen+1)/3)'>收款审核：</th>
|
|
90
|
+
<th :colspan='Math.round(($parent.tablen+1)/3)'>收款员：</th>
|
|
87
91
|
</tr>
|
|
88
92
|
</tfoot>
|
|
89
93
|
</table>
|
|
@@ -142,6 +146,7 @@
|
|
|
142
146
|
f_depid: this.$login.f.depids,
|
|
143
147
|
f_operatorid: this.$login.f.id,
|
|
144
148
|
operatorid: [],
|
|
149
|
+
styledata: '',
|
|
145
150
|
depid: [],
|
|
146
151
|
org: {
|
|
147
152
|
f_orgname:'',
|
|
@@ -169,8 +174,29 @@
|
|
|
169
174
|
}
|
|
170
175
|
},
|
|
171
176
|
ready () {
|
|
172
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
177
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
173
178
|
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardTimeString()
|
|
179
|
+
this.styledata =
|
|
180
|
+
'td {border-width: 1px;padding: 0.3px;border-style: solid; border-color:#000000;font-size: 0.375em;} \n' +
|
|
181
|
+
'table{border-collapse:collapse; border}\n' +
|
|
182
|
+
'.noborder{border-width: 0px;}\n' +
|
|
183
|
+
'.tdleft{text-align: left;}\n' +
|
|
184
|
+
'.tdright{text-align: right;} \n' +
|
|
185
|
+
'.tdcenter{text-align: center;}\n' +
|
|
186
|
+
'.fs10{font-size: 0.4em;}\n' +
|
|
187
|
+
'.fs11{font-size: 0.5em;}\n' +
|
|
188
|
+
'.fs12{font-size: 0.6em;}\n' +
|
|
189
|
+
'.fs13{font-size: 0.7em;}\n' +
|
|
190
|
+
'.fs15{font-size: 0.9em;}\n' +
|
|
191
|
+
'.fs17{font-size: 1.1em;}\n' +
|
|
192
|
+
'.fs19{font-size: 1.2em;}\n' +
|
|
193
|
+
'.fs24{font-size: 1.5em;}\n' +
|
|
194
|
+
'.fs26{font-size: 1.6em;}\n' +
|
|
195
|
+
'.b{font-weight: bold;}\n' +
|
|
196
|
+
'.td-border-right{BORDER-RIGHT: #000000 1px solid; }\n' +
|
|
197
|
+
'.td-border-top{BORDER-TOP: #000000 1px solid; }\n' +
|
|
198
|
+
'.td-border-left{BORDER-LEFT: #000000 1px solid;}\n' +
|
|
199
|
+
'.td-border-bottom{BORDER-BOTTOM: #000000 1px solid;}'
|
|
174
200
|
console.log(this.$login.f)
|
|
175
201
|
},
|
|
176
202
|
methods: {
|
package/src/main.js
CHANGED
|
@@ -48,7 +48,7 @@ saleManage('qianneng')
|
|
|
48
48
|
webmeterManage()
|
|
49
49
|
ManageHome()
|
|
50
50
|
newmanage()
|
|
51
|
-
reportManage()
|
|
51
|
+
reportManage('qianneng')
|
|
52
52
|
require('system-clients/src/styles/less/bootstrap.less')
|
|
53
53
|
require('./components/qinhua/Style/qinhuaStyle.less')
|
|
54
54
|
// require('./bootstrap/less/manageStyle/manageChile.less')
|