manage-client 3.2.262 → 3.2.263

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 (10) hide show
  1. package/build/dev-server.js +180 -180
  2. package/package.json +111 -111
  3. package/src/components/SellReport/ManageBusSummary.vue +2 -0
  4. package/src/filiale/wenxi/ChargeQuery.vue +26 -112
  5. package/src/filiale/wenxi/FmyGasDeviceQuery.vue +144 -17
  6. package/src/filiale/wenxi/RecordInfoQuery.vue +1 -1
  7. package/src/filiale/yuansheng/DayReportList.vue +15 -1
  8. package/node_modules.zip +0 -0
  9. package/static/newStyle/new_stretch_bottom.png +0 -0
  10. package/static/newStyle/new_stretch_top.png +0 -0
package/build/dev-server.js CHANGED
@@ -1,180 +1,180 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- // var httpProxy = require('http-proxy')
6
-
7
- var app = express()
8
- var compiler = webpack(config)
9
- // var proxy = httpProxy.createProxyServer()
10
-
11
- // Define HTTP proxies to your custom API backend
12
- // https://github.com/chimurai/http-proxy-middleware
13
- // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var shaoguan = 'http://119.146.1.106:8300/'
15
- var qtx= 'http://36.103.222.144:6300/'
16
- // var bendi = 'http://220.194.141.253:8600/'
17
- // var bendi = 'http://203.57.101.233:9001'
18
- // var bendi = 'http://172.168.1.11:9001/'
19
- // var bendi = 'http://203.57.101.233:8400/'
20
- // var bendi = 'http://121.36.106.17:8400/'
21
- // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://192.168.50.4:8400'
23
- // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://127.0.0.1:8080'
25
- // 192.168.
26
- // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
- // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
28
- var proxyTable = {
29
- '/rs/logic/exportfile': {
30
- target: bendi
31
- },
32
- '/files': {
33
- target: bendi
34
- },
35
- // 查找资源服务数据
36
- '/rs/search': {
37
- target: bendi
38
- },
39
- // 查找资源服务数据
40
- '/rs/logic/getLogin': {
41
- target: bendi
42
- },
43
- // 查找资源服务数据
44
- '/rs/logic/getInitData': {
45
- target: bendi
46
- },
47
- '/rs/logic/getSaleInitData': {
48
- target: bendi
49
- },
50
- // 用户登录服务地址
51
- '/rs/user': {
52
- target: bendi
53
- },
54
- '/rs/path/getParams': {
55
- target: bendi
56
- },
57
- '/rs/data': {
58
- target: bendi
59
- },
60
- '/rs/license': {
61
- target: bendi
62
- },
63
- '/rs/db': {
64
- target: bendi
65
- },
66
- '/excel': {
67
- target: bendi
68
- },
69
- '/rs/config': {
70
- target: bendi
71
- },
72
- '/rs/sql/getLicenseById': {
73
- target: bendi
74
- },
75
- '/rs/report': {
76
- target: bendi
77
- },
78
- '/rs/vue': {
79
- target: bendi
80
- },
81
- '/rs/file': {
82
- target: bendi
83
- },
84
- '/rs/sql/singleTable': {
85
- target: bendi
86
- },
87
- '/rs': {
88
- target: wode
89
- }
90
- }
91
-
92
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
93
- publicPath: config.output.publicPath,
94
- stats: {
95
- colors: true,
96
- chunks: false
97
- }
98
- })
99
-
100
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
101
- // force page reload when html-webpack-plugin template changes
102
- compiler.plugin('compilation', function (compilation) {
103
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
104
- hotMiddleware.publish({action: 'reload'})
105
- cb()
106
- })
107
- })
108
-
109
- // proxy api requests
110
- Object.keys(proxyTable).forEach(function (context) {
111
- var options = proxyTable[context]
112
- if (typeof options === 'string') {
113
- options = {target: options}
114
- }
115
- app.use(proxyMiddleware(context, options))
116
- })
117
-
118
- // handle fallback for HTML5 history API
119
- app.use(require('connect-history-api-fallback')())
120
- // app.use(function (req, res, next) {
121
- // res.header('Access-Control-Allow-Origin', '*')
122
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
123
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
124
- // res.header('X-Powered-By', '3,2,1')
125
- // res.header('Access-Control-Allow-Credentials', 'true')
126
- // res.header('Content-Type', 'application/json;charset=utf-8')
127
- // next()
128
- // })
129
-
130
- // serve webpack bundle output
131
- app.use(devMiddleware)
132
-
133
- // enable hot-reload and state-preserving
134
- // compilation error display
135
- app.use(hotMiddleware)
136
-
137
- // serve pure static assets
138
- app.use('/static', express.static('./static'))
139
-
140
- // app.all('/rs/*', function (req, res) {
141
- // proxy.web(req, res, {
142
- // target: 'http://127.0.0.1:8081/reports'
143
- // })
144
- // })
145
-
146
- // app.all('/rs/*', function (req, res) {
147
- // proxy.web(req, res, {
148
- // target: 'http://127.0.0.1:8081/ldap'
149
- // })
150
- // })
151
- // app.all('/excel/*', function (req, res) {
152
- // proxy.web(req, res, {
153
- // target: 'http://127.0.0.1:8081/charge'
154
- // })
155
- // })
156
-
157
- // app.all('/rs/*', function (req, res) {
158
- // proxy.web(req, res, {
159
- // target: 'http://127.0.0.1:82/charge'
160
- // })
161
- // })
162
-
163
- // app.all('/*', function (req, res) {
164
- // proxy.web(req, res, {
165
- // target: 'http://127.0.0.1:82'
166
- // })
167
- // })
168
- // app.all('/rs/user', function (req, res) {
169
- // proxy.web(req, res, {
170
- // target: 'http://127.0.0.1:82'
171
- // })
172
- // })
173
-
174
- module.exports = app.listen(8015, function (err) {
175
- if (err) {
176
- console.log(err)
177
- return
178
- }
179
- console.log('Listening at http://localhost:8015')
180
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ // var httpProxy = require('http-proxy')
6
+
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ // var proxy = httpProxy.createProxyServer()
10
+
11
+ // Define HTTP proxies to your custom API backend
12
+ // https://github.com/chimurai/http-proxy-middleware
13
+ // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
+ var shaoguan = 'http://119.146.1.106:8300/'
15
+ var qtx= 'http://36.103.222.144:6300/'
16
+ // var bendi = 'http://220.194.141.253:8600/'
17
+ // var bendi = 'http://203.57.101.233:9001'
18
+ // var bendi = 'http://172.168.1.11:9001/'
19
+ // var bendi = 'http://203.57.101.233:8400/'
20
+ // var bendi = 'http://121.36.106.17:8400/'
21
+ // var fuwu = 'http://203.57.101.233:9001'
22
+ var bendi = 'http://192.168.50.4:8400'
23
+ // var bendi = 'http://119.187.112.234:8400/'
24
+ var wode = 'http://192.168.50.4:8400'
25
+ // 192.168.
26
+ // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
+ // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
28
+ var proxyTable = {
29
+ '/rs/logic/exportfile': {
30
+ target: bendi
31
+ },
32
+ '/files': {
33
+ target: bendi
34
+ },
35
+ // 查找资源服务数据
36
+ '/rs/search': {
37
+ target: bendi
38
+ },
39
+ // 查找资源服务数据
40
+ '/rs/logic/getLogin': {
41
+ target: bendi
42
+ },
43
+ // 查找资源服务数据
44
+ '/rs/logic/getInitData': {
45
+ target: bendi
46
+ },
47
+ '/rs/logic/getSaleInitData': {
48
+ target: bendi
49
+ },
50
+ // 用户登录服务地址
51
+ '/rs/user': {
52
+ target: bendi
53
+ },
54
+ '/rs/path/getParams': {
55
+ target: bendi
56
+ },
57
+ '/rs/data': {
58
+ target: bendi
59
+ },
60
+ '/rs/license': {
61
+ target: bendi
62
+ },
63
+ '/rs/db': {
64
+ target: bendi
65
+ },
66
+ '/excel': {
67
+ target: bendi
68
+ },
69
+ '/rs/config': {
70
+ target: bendi
71
+ },
72
+ '/rs/sql/getLicenseById': {
73
+ target: bendi
74
+ },
75
+ '/rs/report': {
76
+ target: bendi
77
+ },
78
+ '/rs/vue': {
79
+ target: bendi
80
+ },
81
+ '/rs/file': {
82
+ target: bendi
83
+ },
84
+ '/rs/sql/singleTable': {
85
+ target: bendi
86
+ },
87
+ '/rs': {
88
+ target: wode
89
+ }
90
+ }
91
+
92
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
93
+ publicPath: config.output.publicPath,
94
+ stats: {
95
+ colors: true,
96
+ chunks: false
97
+ }
98
+ })
99
+
100
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
101
+ // force page reload when html-webpack-plugin template changes
102
+ compiler.plugin('compilation', function (compilation) {
103
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
104
+ hotMiddleware.publish({action: 'reload'})
105
+ cb()
106
+ })
107
+ })
108
+
109
+ // proxy api requests
110
+ Object.keys(proxyTable).forEach(function (context) {
111
+ var options = proxyTable[context]
112
+ if (typeof options === 'string') {
113
+ options = {target: options}
114
+ }
115
+ app.use(proxyMiddleware(context, options))
116
+ })
117
+
118
+ // handle fallback for HTML5 history API
119
+ app.use(require('connect-history-api-fallback')())
120
+ // app.use(function (req, res, next) {
121
+ // res.header('Access-Control-Allow-Origin', '*')
122
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
123
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
124
+ // res.header('X-Powered-By', '3,2,1')
125
+ // res.header('Access-Control-Allow-Credentials', 'true')
126
+ // res.header('Content-Type', 'application/json;charset=utf-8')
127
+ // next()
128
+ // })
129
+
130
+ // serve webpack bundle output
131
+ app.use(devMiddleware)
132
+
133
+ // enable hot-reload and state-preserving
134
+ // compilation error display
135
+ app.use(hotMiddleware)
136
+
137
+ // serve pure static assets
138
+ app.use('/static', express.static('./static'))
139
+
140
+ // app.all('/rs/*', function (req, res) {
141
+ // proxy.web(req, res, {
142
+ // target: 'http://127.0.0.1:8081/reports'
143
+ // })
144
+ // })
145
+
146
+ // app.all('/rs/*', function (req, res) {
147
+ // proxy.web(req, res, {
148
+ // target: 'http://127.0.0.1:8081/ldap'
149
+ // })
150
+ // })
151
+ // app.all('/excel/*', function (req, res) {
152
+ // proxy.web(req, res, {
153
+ // target: 'http://127.0.0.1:8081/charge'
154
+ // })
155
+ // })
156
+
157
+ // app.all('/rs/*', function (req, res) {
158
+ // proxy.web(req, res, {
159
+ // target: 'http://127.0.0.1:82/charge'
160
+ // })
161
+ // })
162
+
163
+ // app.all('/*', function (req, res) {
164
+ // proxy.web(req, res, {
165
+ // target: 'http://127.0.0.1:82'
166
+ // })
167
+ // })
168
+ // app.all('/rs/user', function (req, res) {
169
+ // proxy.web(req, res, {
170
+ // target: 'http://127.0.0.1:82'
171
+ // })
172
+ // })
173
+
174
+ module.exports = app.listen(8015, function (err) {
175
+ if (err) {
176
+ console.log(err)
177
+ return
178
+ }
179
+ console.log('Listening at http://localhost:8015')
180
+ })
package/package.json CHANGED
@@ -1,111 +1,111 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.2.262",
4
- "description": "经营管控模块前台组件",
5
- "main": "src/index.js",
6
- "directories": {
7
- "test": "test"
8
- },
9
- "dependencies": {
10
- "crypto-js": "^4.1.1",
11
- "swiper": "^5.4.5"
12
- },
13
- "devDependencies": {
14
- "axios": "0.15.3",
15
- "babel-core": "^6.0.0",
16
- "babel-loader": "^6.0.0",
17
- "babel-plugin-transform-runtime": "^6.0.0",
18
- "babel-preset-es2015": "^6.0.0",
19
- "babel-preset-stage-2": "^6.0.0",
20
- "chai": "^3.5.0",
21
- "co": "^4.6.0",
22
- "connect-history-api-fallback": "^1.1.0",
23
- "cross-env": "^1.0.7",
24
- "cross-spawn": "^2.1.5",
25
- "css-loader": "^0.23.0",
26
- "echarts": "^4.1.0",
27
- "eslint": "^2.0.0",
28
- "eslint-config-standard": "^5.1.0",
29
- "eslint-friendly-formatter": "^1.2.2",
30
- "eslint-loader": "^1.3.0",
31
- "eslint-plugin-html": "^1.3.0",
32
- "eslint-plugin-promise": "^1.0.8",
33
- "eslint-plugin-standard": "^1.3.2",
34
- "eslint-plugin-vue": "^0.1.1",
35
- "eventsource-polyfill": "^0.9.6",
36
- "express": "^4.13.3",
37
- "extract-text-webpack-plugin": "^1.0.1",
38
- "filemanager-webpack-plugin": "^2.0.5",
39
- "file-loader": "^0.8.4",
40
- "function-bind": "^1.0.2",
41
- "html-webpack-plugin": "^2.8.1",
42
- "http-proxy-middleware": "^0.11.0",
43
- "inject-loader": "^2.0.1",
44
- "isparta-loader": "^2.0.0",
45
- "jasmine-core": "^2.4.1",
46
- "jquery": "^3.3.1",
47
- "jsencrypt": "3.0.0-rc.1",
48
- "json-loader": "^0.5.4",
49
- "karma": "^1.4.1",
50
- "karma-chrome-launcher": "^2.2.0",
51
- "karma-coverage": "^1.1.1",
52
- "karma-mocha": "^1.3.0",
53
- "karma-sinon-chai": "^1.3.1",
54
- "karma-sourcemap-loader": "^0.3.7",
55
- "karma-spec-reporter": "0.0.31",
56
- "karma-webpack": "^2.0.2",
57
- "ldap-clients": "3.0.7",
58
- "less": "^2.7.3",
59
- "mkdirp": "^0.5.1",
60
- "mocha": "^3.2.0",
61
- "moment": "2.24.0",
62
- "ncp": "^2.0.0",
63
- "rimraf": "^2.5.0",
64
- "sale-client": "3.4.14",
65
- "selenium-server": "2.52.0",
66
- "sinon": "^2.1.0",
67
- "sinon-chai": "^2.8.0",
68
- "style": "0.0.3",
69
- "style-loader": "^0.20.3",
70
- "swiper": "^5.4.5",
71
- "system-clients": "3.2.55",
72
- "url-loader": "^0.5.7",
73
- "vue-amap": "0.5.10",
74
- "vue-client": "1.24.80",
75
- "vue-hot-reload-api": "^1.2.0",
76
- "vue-html-loader": "^1.0.0",
77
- "vue-loader": "8.2.1",
78
- "vue-resource": "^1.5.0",
79
- "vue-router": "^0.7.13",
80
- "vue-strap": "^1.0.9",
81
- "vue-style-loader": "^1.0.0",
82
- "vue-validator": "2.1.7",
83
- "webpack": "1.12.2",
84
- "webpack-dev-middleware": "^1.4.0",
85
- "webpack-hot-middleware": "^2.6.0",
86
- "webpack-merge": "^0.8.3",
87
- "webpack-parallel-uglify-plugin": "^1.0.0"
88
- },
89
- "scripts": {
90
- "unit": "karma start test/unit/karma.conf.js --single-run",
91
- "example": "node build/example-server.js",
92
- "dev": "node build/dev-server.js",
93
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
- "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
- "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
- "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
- "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
- "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
- "e2e": "node test/e2e/runner.js",
100
- "release": "bash build/release.sh"
101
- },
102
- "repository": {
103
- "type": "git",
104
- "url": "https://gitee.com/aote/management_modules.git"
105
- },
106
- "keywords": [
107
- "manage"
108
- ],
109
- "author": "liuxudong",
110
- "license": "ISC"
111
- }
1
+ {
2
+ "name": "manage-client",
3
+ "version": "3.2.263",
4
+ "description": "经营管控模块前台组件",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "test": "test"
8
+ },
9
+ "dependencies": {
10
+ "crypto-js": "^4.1.1",
11
+ "swiper": "^5.4.5"
12
+ },
13
+ "devDependencies": {
14
+ "axios": "0.15.3",
15
+ "babel-core": "^6.0.0",
16
+ "babel-loader": "^6.0.0",
17
+ "babel-plugin-transform-runtime": "^6.0.0",
18
+ "babel-preset-es2015": "^6.0.0",
19
+ "babel-preset-stage-2": "^6.0.0",
20
+ "chai": "^3.5.0",
21
+ "co": "^4.6.0",
22
+ "connect-history-api-fallback": "^1.1.0",
23
+ "cross-env": "^1.0.7",
24
+ "cross-spawn": "^2.1.5",
25
+ "css-loader": "^0.23.0",
26
+ "echarts": "^4.1.0",
27
+ "eslint": "^2.0.0",
28
+ "eslint-config-standard": "^5.1.0",
29
+ "eslint-friendly-formatter": "^1.2.2",
30
+ "eslint-loader": "^1.3.0",
31
+ "eslint-plugin-html": "^1.3.0",
32
+ "eslint-plugin-promise": "^1.0.8",
33
+ "eslint-plugin-standard": "^1.3.2",
34
+ "eslint-plugin-vue": "^0.1.1",
35
+ "eventsource-polyfill": "^0.9.6",
36
+ "express": "^4.13.3",
37
+ "extract-text-webpack-plugin": "^1.0.1",
38
+ "filemanager-webpack-plugin": "^2.0.5",
39
+ "file-loader": "^0.8.4",
40
+ "function-bind": "^1.0.2",
41
+ "html-webpack-plugin": "^2.8.1",
42
+ "http-proxy-middleware": "^0.11.0",
43
+ "inject-loader": "^2.0.1",
44
+ "isparta-loader": "^2.0.0",
45
+ "jasmine-core": "^2.4.1",
46
+ "jquery": "^3.3.1",
47
+ "jsencrypt": "3.0.0-rc.1",
48
+ "json-loader": "^0.5.4",
49
+ "karma": "^1.4.1",
50
+ "karma-chrome-launcher": "^2.2.0",
51
+ "karma-coverage": "^1.1.1",
52
+ "karma-mocha": "^1.3.0",
53
+ "karma-sinon-chai": "^1.3.1",
54
+ "karma-sourcemap-loader": "^0.3.7",
55
+ "karma-spec-reporter": "0.0.31",
56
+ "karma-webpack": "^2.0.2",
57
+ "ldap-clients": "3.0.7",
58
+ "less": "^2.7.3",
59
+ "mkdirp": "^0.5.1",
60
+ "mocha": "^3.2.0",
61
+ "moment": "2.24.0",
62
+ "ncp": "^2.0.0",
63
+ "rimraf": "^2.5.0",
64
+ "sale-client": "3.4.14",
65
+ "selenium-server": "2.52.0",
66
+ "sinon": "^2.1.0",
67
+ "sinon-chai": "^2.8.0",
68
+ "style": "0.0.3",
69
+ "style-loader": "^0.20.3",
70
+ "swiper": "^5.4.5",
71
+ "system-clients": "3.2.55",
72
+ "url-loader": "^0.5.7",
73
+ "vue-amap": "0.5.10",
74
+ "vue-client": "1.24.80",
75
+ "vue-hot-reload-api": "^1.2.0",
76
+ "vue-html-loader": "^1.0.0",
77
+ "vue-loader": "8.2.1",
78
+ "vue-resource": "^1.5.0",
79
+ "vue-router": "^0.7.13",
80
+ "vue-strap": "^1.0.9",
81
+ "vue-style-loader": "^1.0.0",
82
+ "vue-validator": "2.1.7",
83
+ "webpack": "1.12.2",
84
+ "webpack-dev-middleware": "^1.4.0",
85
+ "webpack-hot-middleware": "^2.6.0",
86
+ "webpack-merge": "^0.8.3",
87
+ "webpack-parallel-uglify-plugin": "^1.0.0"
88
+ },
89
+ "scripts": {
90
+ "unit": "karma start test/unit/karma.conf.js --single-run",
91
+ "example": "node build/example-server.js",
92
+ "dev": "node build/dev-server.js",
93
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
+ "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
+ "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
+ "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
+ "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
+ "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
+ "e2e": "node test/e2e/runner.js",
100
+ "release": "bash build/release.sh"
101
+ },
102
+ "repository": {
103
+ "type": "git",
104
+ "url": "https://gitee.com/aote/management_modules.git"
105
+ },
106
+ "keywords": [
107
+ "manage"
108
+ ],
109
+ "author": "liuxudong",
110
+ "license": "ISC"
111
+ }
package/src/components/SellReport/ManageBusSummary.vue CHANGED
@@ -197,6 +197,8 @@ export default {
197
197
  this.orgCondtionStr = condition
198
198
  this.orgname = obj.orgnames[0]
199
199
  this.depname = obj.depnames[0]
200
+ console.log(obj,"========")
201
+ this.operatorname = obj.operatornames[0]
200
202
  },
201
203
  getdep (obj, val) {
202
204
  this.depname = val[0]
package/src/filiale/wenxi/ChargeQuery.vue CHANGED
@@ -31,11 +31,11 @@
31
31
  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
32
32
  condition="f_userinfo_code = '{}' " placeholder="客户编号">
33
33
  </div>
34
- <div class="col-sm-2 form-group">
35
- <label class="font_normal_body" title="旧客户编号">档案编号</label>
36
- <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
37
- condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
38
- </div>
34
+ <!-- <div class="col-sm-2 form-group">-->
35
+ <!-- <label class="font_normal_body" title="旧客户编号">档案编号</label>-->
36
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"-->
37
+ <!-- condition="f_olduserinfo_code = '{}' " placeholder="档案编号">-->
38
+ <!-- </div>-->
39
39
 
40
40
  <div class="span" style="float:right;">
41
41
  <button class="button_search button_spacing" v-show="false" @click="$parent.$parent.ReadIDCard()">读取身份证</button>
@@ -65,26 +65,26 @@
65
65
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
66
66
  condition="f_user_name like '%{}%'" placeholder="客户名称">
67
67
  </div>
68
- <div class="col-sm-2 form-group">
69
- <label class="font_normal_body">收费编号</label>
70
- <input type="text" style="width:60%" class="input_search" v-model="model.id"
71
- condition="id = '{}'" placeholder="收费编号">
72
- </div>
73
- <div class="col-sm-2 form-group">
74
- <label class="font_normal_body">客户电话</label>
75
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
76
- condition="f_user_phone like '%{}%'" placeholder="客户电话">
77
- </div>
78
- <div class="col-sm-2 form-group">
79
- <label class="font_normal_body">身份证号</label>
80
- <input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"
81
- condition="f_idnumber like '%{}%'" placeholder="身份证号">
82
- </div>
83
- <div class="col-sm-2 form-group">
84
- <label class="font_normal_body">客户地址</label>
85
- <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
86
- condition="f_address like '%{}%'" placeholder='客户地址'>
87
- </div>
68
+ <!-- <div class="col-sm-2 form-group">-->
69
+ <!-- <label class="font_normal_body">收费编号</label>-->
70
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.id"-->
71
+ <!-- condition="id = '{}'" placeholder="收费编号">-->
72
+ <!-- </div>-->
73
+ <!-- <div class="col-sm-2 form-group">-->
74
+ <!-- <label class="font_normal_body">客户电话</label>-->
75
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"-->
76
+ <!-- condition="f_user_phone like '%{}%'" placeholder="客户电话">-->
77
+ <!-- </div>-->
78
+ <!-- <div class="col-sm-2 form-group">-->
79
+ <!-- <label class="font_normal_body">身份证号</label>-->
80
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"-->
81
+ <!-- condition="f_idnumber like '%{}%'" placeholder="身份证号">-->
82
+ <!-- </div>-->
83
+ <!-- <div class="col-sm-2 form-group">-->
84
+ <!-- <label class="font_normal_body">客户地址</label>-->
85
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
86
+ <!-- condition="f_address like '%{}%'" placeholder='客户地址'>-->
87
+ <!-- </div>-->
88
88
  <div class="col-sm-2 form-group">
89
89
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
90
90
  <v-select :value.sync="model.f_residential_area"
@@ -159,21 +159,11 @@
159
159
  condition="f_price_name in {}"
160
160
  ></v-select>
161
161
  </div>
162
- <div class="col-sm-2 form-group">
163
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表编号</label>
164
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_id"
165
- condition="f_user_id = '{}'" placeholder='表编号'>
166
- </div>
167
162
  <div class="col-sm-2 form-group">
168
163
  <label class="font_normal_body">表&emsp;&emsp;号</label>
169
164
  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
170
165
  condition="f_meternumber = '{}'" placeholder='表号'>
171
166
  </div>
172
- <div class="col-sm-2 form-group">
173
- <label class="font_normal_body">卡&emsp;&emsp;号</label>
174
- <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
175
- condition="f_card_id = '{}'" placeholder='卡号'>
176
- </div>
177
167
  <div class="col-sm-2 form-group">
178
168
  <label class="font_normal_body">气表类型</label>
179
169
  <v-select :value.sync="model.f_meter_type" multiple
@@ -206,14 +196,6 @@
206
196
  condition="f_bank_name = '{}'"
207
197
  close-on-select></v-select>
208
198
  </div>
209
- <div class="col-sm-2 form-group">
210
- <label class="font_normal_body">是否优惠</label>
211
- <v-select :value.sync="model.f_privilege_money"
212
- v-model="model.f_privilege_money"
213
- :options='$parent.$parent.privilege_money' placeholder='请选择'
214
- condition="f_privilege_money {}"
215
- close-on-select></v-select>
216
- </div>
217
199
  <div class="col-sm-2 form-group">
218
200
  <label class="font_normal_body">收&ensp;据&ensp;号</label>
219
201
  <input type="text" style="width:30%" class="input_search" title="大于等于"
@@ -221,66 +203,11 @@
221
203
  <input type="text" style="width:30%" class="input_search" title="小于等于"
222
204
  v-model="model.f_bill_number_small" condition="f_bill_number <= {}" placeholder='小于等于'>
223
205
  </div>
224
- <div class="col-sm-2 form-group">
225
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;流水号</label>
226
- <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
227
- condition="f_serial_id = '{}'" placeholder='流水号'>
228
- </div>
206
+
229
207
  <div class="col-sm-2 form-group">
230
208
  <label class="font_normal_body">发票号码</label>
231
209
  <input type="text" style="width:60%" class="input_search" v-model="model.f_invoice_num"
232
210
  condition="f_invoice_num = '{}'" placeholder='发票号码'>
233
- </div>
234
- <div class="col-sm-2 form-group">
235
- <label class="font_normal_body" title="发票类型查询">发票类型</label>
236
- <v-select :value.sync="model.f_invoice_type"
237
- v-model="model.f_invoice_type"
238
- :options='$parent.$parent.invoiceType' placeholder='请选择'
239
- condition="f_invoice_type = '{}'"
240
- close-on-select :value-single="true" :search="false">
241
- </v-select>
242
- </div>
243
- <div class="col-sm-2 form-group">
244
- <label class="font_normal_body">开&ensp;票&ensp;人</label>
245
- <input type="text" style="width:60%" class="input_search" v-model="model.f_invoiceuse_operator"
246
- condition="f_invoiceuse_operator like '%{}%'" placeholder='开票人'>
247
- </div>
248
- <div class="col-sm-2 form-group">
249
- <label for="startDate" class="font_normal_body">开票时间</label>
250
- <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
251
- v-model="model.invoice_startDate"
252
- :value.sync="model.invoice_startDate"
253
- :format="'yyyy-MM-dd'"
254
- :show-reset-button="true"
255
- condition="f_invoice_date >= '{}'">
256
- </datepicker>
257
- </div>
258
- <div class="col-sm-2 form-group">
259
- <label for="endDate" class="font_normal_body">开票时间</label>
260
- <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
261
- v-model="model.invoice_endDate"
262
- :value.sync="model.invoice_endDate"
263
- :format="'yyyy-MM-dd'"
264
- :show-reset-button="true"
265
- condition="f_invoice_date <= '{}'">
266
- </datepicker>
267
- </div>
268
- <div class="col-sm-2 form-group">
269
- <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
270
- <v-select :value.sync="model.f_inputtor"
271
- v-model="model.f_inputtor"
272
- :options='$parent.$parent.inputtores' placeholder='请选择'
273
- condition="f_inputtor = '{}'"
274
- close-on-select :search="false">
275
- </v-select>
276
- </div>
277
- <div class="col-sm-2 form-group">
278
- <label class="font_normal_body">抄&ensp;表&ensp;册</label>
279
- <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
280
- :options='$parent.$parent.meterbooks' placeholder='抄表册'
281
- style="width:60%"
282
- close-on-select
283
- condition="f_meter_book_num = '{}'"></v-select>
284
211
  </div>
285
212
  <div class="col-sm-2 form-group">
286
213
  <label class="font_normal_body" title="参数名称:写卡状态">写卡状态</label>
@@ -290,19 +217,6 @@
290
217
  close-on-select
291
218
  condition="f_write_card = '{}'"></v-select>
292
219
  </div>
293
- <div class="col-sm-2 form-group">
294
- <label class="font_normal_body">街&ensp;&ensp;&ensp;&ensp;道</label>
295
- <input type="text" style="width:60%" class="input_search" v-model="model.f_street"
296
- condition="f_street like '%{}%'" placeholder='街道'>
297
- </div>
298
- <div class="col-sm-2 form-group">
299
- <label class="font_normal_body">数&ensp;据&ensp;包</label>
300
- <v-select :value.sync="model.f_bluetooth_package" v-model="model.f_bluetooth_package"
301
- :options='$parent.$parent.bluetoothpackage' placeholder='数据包状态'
302
- style="width:60%"
303
- close-on-select
304
- condition="f_bluetooth_package = '{}'"></v-select>
305
- </div>
306
220
  <div class="col-sm-2 form-group">
307
221
  <label class="font_normal_body">pos设备&nbsp;</label>
308
222
  <v-select :value.sync="model.f_terminal_name" multiple
package/src/filiale/wenxi/FmyGasDeviceQuery.vue CHANGED
@@ -67,11 +67,6 @@
67
67
  condition="f_devices_type = '{}'"
68
68
  close-on-select></v-select>
69
69
  </div>
70
- <!-- <div class="col-sm-2 form-group">-->
71
- <!-- <label class="font_normal_body">身份证号</label>-->
72
- <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"-->
73
- <!-- condition="f_idnumber like '%{}%'" placeholder="身份证号">-->
74
- <!-- </div>-->
75
70
  <div class="col-sm-2 form-group">
76
71
  <label class="font_normal_body">项目地址</label>
77
72
  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -134,47 +129,85 @@
134
129
  <th colspan="4"><nobr>燃气报警装置</nobr></th>
135
130
  <th colspan="4"><nobr>设备信息</nobr></th>
136
131
  <th colspan="5"><nobr>燃气连接管</nobr></th>
132
+ <th colspan="8"><nobr>燃气计量装置</nobr></th>
133
+ <th colspan="6"><nobr>控制器设备</nobr></th>
134
+ <th colspan="7"><nobr>调压设备</nobr></th>
135
+ <th colspan="6"><nobr>安检信息</nobr></th>
136
+ <th rowspan="2"><nobr>备注</nobr></th>
137
137
  </tr>
138
138
 
139
139
  <tr>
140
+ <!-- 用户信息-->
140
141
  <th><nobr>客户编号</nobr></th>
141
142
  <th><nobr>客户名称</nobr></th>
142
143
  <th><nobr>联系电话</nobr></th>
143
144
  <th><nobr>小区名称</nobr></th>
144
145
  <th><nobr>地址</nobr></th>
145
146
  <th><nobr>客户状态</nobr></th>
146
-
147
+ <!--燃气表-->
147
148
  <th><nobr>表品牌</nobr></th>
148
149
  <th><nobr>表号</nobr></th>
149
150
  <th><nobr>类型</nobr></th>
150
151
  <th><nobr>型号</nobr></th>
151
152
  <th><nobr>左右表</nobr></th>
152
153
  <th><nobr>安装位置</nobr></th>
153
- <th><nobr>表安装位置</nobr></th>
154
-
154
+ <th><nobr>表安装日期</nobr></th>
155
+ <!--建档日期-->
155
156
  <th><nobr>建档日期</nobr></th>
156
157
  <th><nobr>合同日期</nobr></th>
157
158
  <th><nobr>开户日期</nobr></th>
158
- <!--开户操作人-->
159
159
  <th><nobr>开户操作人</nobr></th>
160
160
  <th><nobr>通气日期</nobr></th>
161
161
  <th><nobr>通气人</nobr></th>
162
162
  <th><nobr>通气年限</nobr></th>
163
163
 
164
+ <!--燃气报警装置-->
164
165
  <th><nobr>报警器品牌</nobr></th>
165
166
  <th><nobr>数量</nobr></th>
166
167
  <th><nobr>生产日期</nobr></th>
167
168
  <th><nobr>超期提醒</nobr></th>
168
-
169
+ <!--设备信息-->
169
170
  <th><nobr>设备名称</nobr></th>
170
171
  <th><nobr>数量</nobr></th>
171
172
  <th><nobr>生产日期</nobr></th>
172
173
  <th><nobr>超期提醒</nobr></th>
173
-
174
+ <!--燃气连接管-->
174
175
  <th><nobr>有无不锈钢波纹管</nobr></th>
175
176
  <th><nobr>数量</nobr></th>
176
177
  <th><nobr>有无自闭阀</nobr></th>
177
178
  <th><nobr>数量</nobr></th>
179
+ <!--燃气计量装置-->
180
+ <th><nobr>品牌</nobr></th>
181
+ <th><nobr>编号</nobr></th>
182
+ <th><nobr>类型</nobr></th>
183
+ <th><nobr>型号</nobr></th>
184
+ <th><nobr>铅封号</nobr></th>
185
+ <th><nobr>生产日期</nobr></th>
186
+ <th><nobr>超期提醒</nobr></th>
187
+ <th><nobr>变更记录</nobr></th>
188
+ <!--控制器设备-->
189
+ <th><nobr>品牌</nobr></th>
190
+ <th><nobr>编号</nobr></th>
191
+ <th><nobr>型号</nobr></th>
192
+ <th><nobr>生产日期</nobr></th>
193
+ <th><nobr>超期提醒</nobr></th>
194
+ <th><nobr>变更记录</nobr></th>
195
+
196
+ <!--调压设备-->
197
+ <th><nobr>品牌</nobr></th>
198
+ <th><nobr>类型</nobr></th>
199
+ <th><nobr>型号</nobr></th>
200
+ <th><nobr>位置</nobr></th>
201
+ <th><nobr>生产日期</nobr></th>
202
+ <th><nobr>超期提醒</nobr></th>
203
+ <th><nobr>变更记录</nobr></th>
204
+ <!--安检信息-->
205
+ <th><nobr>安检日期</nobr></th>
206
+ <th><nobr>安检人员</nobr></th>
207
+ <th><nobr>用气总量</nobr></th>
208
+ <th><nobr>剩余气量</nobr></th>
209
+ <th><nobr>发现问题</nobr></th>
210
+ <th><nobr>整改日期</nobr></th>
178
211
 
179
212
  </tr>
180
213
  </template>
@@ -236,12 +269,6 @@
236
269
  <td style="text-align: center;">
237
270
  <nobr>{{row.f_gas_date}}</nobr>
238
271
  </td>
239
- <td style="text-align: center;">
240
- <nobr>{{row.f_operator}}</nobr>
241
- </td>
242
- <td style="text-align: center;">
243
- <nobr>{{row.f_createfile_date}}</nobr>
244
- </td>
245
272
  <td style="text-align: center;">
246
273
  <nobr>{{row.f_install_person}}</nobr>
247
274
  </td>
@@ -255,6 +282,7 @@
255
282
  <nobr>{{row.ventilation_years}}</nobr>
256
283
  </td>
257
284
 
285
+
258
286
  <!--燃气报警装置-->
259
287
  <td style="text-align: center;">
260
288
  <nobr>{{row.f_icgd_brand}}</nobr>
@@ -296,6 +324,105 @@
296
324
  <td style="text-align: center;">
297
325
  <nobr>{{row.f_zibifa_num}}</nobr>
298
326
  </td>
327
+
328
+ <!--燃气计量装置-->
329
+ <td style="text-align: center;">
330
+ <nobr>{{row.ranqi_brand}}</nobr>
331
+ </td>
332
+ <td style="text-align: center;">
333
+ <nobr>{{row.ranqi_devices_no}}</nobr>
334
+ </td>
335
+ <td style="text-align: center;">
336
+ <nobr>{{row.ranqi_equipment_type}}</nobr>
337
+ </td>
338
+ <td style="text-align: center;">
339
+ <nobr>{{row.ranqi_devices_model}}</nobr>
340
+ </td>
341
+ <td style="text-align: center;">
342
+ <nobr>{{row.f_gmd_lsnumber}}</nobr>
343
+ </td>
344
+ <td style="text-align: center;">
345
+ <nobr>{{row.ranqi_make_date}}</nobr>
346
+ </td>
347
+ <td style="text-align: center;" :class="$parent.$parent.$parent.formatTime(row.ranqi_exp_date).indexOf('已过期')!==-1? 'back-red' : 'back-blue'">
348
+ <nobr>{{$parent.$parent.$parent.formatTime(row.ranqi_exp_date)}}</nobr>
349
+ </td>
350
+ <td style="text-align: center;">
351
+ <nobr>
352
+ <span @click="$parent.$parent.$parent.dealmsg(row,row.ranqi_id,'燃气计量装置')"><a><b>变更记录</b></a></span>
353
+ </nobr>
354
+ </td>
355
+ <!--控制器设备-->
356
+ <td style="text-align: center;">
357
+ <nobr>{{row.control_brand}}</nobr>
358
+ </td>
359
+ <td style="text-align: center;">
360
+ <nobr>{{row.control_devices_no}}</nobr>
361
+ </td>
362
+ <td style="text-align: center;">
363
+ <nobr>{{row.control_devices_model}}</nobr>
364
+ </td>
365
+ <td style="text-align: center;">
366
+ <nobr>{{row.control_make_date}}</nobr>
367
+ </td>
368
+ <td style="text-align: center;" :class="$parent.$parent.$parent.formatTime(row.control_exp_date).indexOf('已过期')!==-1? 'back-red' : 'back-blue'">
369
+ <nobr>{{$parent.$parent.$parent.formatTime(row.control_exp_date)}}</nobr>
370
+ </td>
371
+ <td style="text-align: center;">
372
+ <nobr>
373
+ <span @click="$parent.$parent.$parent.dealmsg(row,row.control_id,'控制器设备')"><a><b>变更记录</b></a></span>
374
+ </nobr>
375
+ </td>
376
+ <!--调压设备-->
377
+ <td style="text-align: center;">
378
+ <nobr>{{row.tiaoya_brand}}</nobr>
379
+ </td>
380
+ <td style="text-align: center;">
381
+ <nobr>{{row.tiaoya_equipment_type}}</nobr>
382
+ </td>
383
+ <td style="text-align: center;">
384
+ <nobr>{{row.tiaoya_devices_model}}</nobr>
385
+ </td>
386
+ <td style="text-align: center;">
387
+ <nobr>{{row.tiaoya_install_position}}</nobr>
388
+ </td>
389
+ <td style="text-align: center;">
390
+ <nobr>{{row.tiaoya_make_date}}</nobr>
391
+ </td>
392
+ <td style="text-align: center;" :class="$parent.$parent.$parent.formatTime(row.tiaoya_exp_date).indexOf('已过期')!==-1? 'back-red' : 'back-blue'">
393
+ <nobr>{{$parent.$parent.$parent.formatTime(row.tiaoya_exp_date)}}</nobr>
394
+ </td>
395
+ <td style="text-align: center;">
396
+ <nobr>
397
+ <span @click="$parent.$parent.$parent.dealmsg(row,row.tiaoya_id,'调压设备')"><a><b>变更记录</b></a></span>
398
+ </nobr>
399
+ </td>
400
+
401
+ <!--安检信息-->
402
+ <td style="text-align: center;">
403
+ <nobr>{{row.f_upload_date}}</nobr>
404
+ </td>
405
+ <td style="text-align: center;">
406
+ <nobr>{{row.f_checker_name}}</nobr>
407
+ </td>
408
+ <td style="text-align: center;">
409
+ <nobr>{{row.f_total_gas}}</nobr>
410
+ </td>
411
+ <td style="text-align: center;">
412
+ <nobr>{{row.f_balance_gas}}</nobr>
413
+ </td>
414
+ <td style="text-align: center;">
415
+ <nobr>{{row.f_defect_content}}</nobr>
416
+ </td>
417
+ <td style="text-align: center;">
418
+ <nobr>{{row.f_repair_date}}</nobr>
419
+ </td>
420
+
421
+ <!--备注-->
422
+ <td style="text-align: center;">
423
+ <nobr>{{row.f_comments}}</nobr>
424
+ </td>
425
+
299
426
  </template>
300
427
  <template partial='foot'>
301
428
  </template>
package/src/filiale/wenxi/RecordInfoQuery.vue CHANGED
@@ -464,7 +464,7 @@
464
464
  <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
465
465
  <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
466
466
  <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
467
- <td style="text-align: center;"><nobr>{{row.f_zuhu_phone}}</nobr></td>
467
+ <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
468
468
  <!--联系电话-->
469
469
  <!-- <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>-->
470
470
  <td style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></td>
package/src/filiale/yuansheng/DayReportList.vue CHANGED
@@ -198,6 +198,20 @@
198
198
  </template>
199
199
  </data-grid>
200
200
  </criteria-paged>
201
+ <table class="table-hover">
202
+ <tr style="position: relative" class="table-bordered">
203
+ <td
204
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
205
+ 汇总信息
206
+ </td>
207
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
208
+ 气量合计:&emsp;{{sumsmodel.f_pregas}}
209
+ </td>
210
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
211
+ 实收金额合计:&emsp;{{sumsmodel.f_collection}}
212
+ </td>
213
+ </tr>
214
+ </table>
201
215
  </div>
202
216
  <div v-if="listpage">
203
217
  <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
@@ -235,7 +249,7 @@ export default {
235
249
  },
236
250
  model: new PagedList('rs/sql/aode_dayReport', 20, {orderitem: "'f_operate_date'"},{
237
251
  f_pregas: 0,
238
- // f_collection: 0,
252
+ f_collection: 0,
239
253
  // f_count_open: 0,
240
254
  // f_pregas_open: 0,
241
255
  // f_collection_open: 0,
package/node_modules.zip DELETED
Binary file
package/static/newStyle/new_stretch_top.png DELETED
Binary file