manage-client 3.3.146 → 3.3.147

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,188 +1,192 @@
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://113.219.193.157:8100/#'
23
- // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://localhost:8488/'
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
- '/api/af-revenue/sql/': {
88
- pathRewrite: {'^/api/af-revenue/sql': '/rs/sql'},
89
- target: bendi
90
- },
91
- '/api/af-revenue/report/': {
92
- pathRewrite: {'^/api/af-revenue/report': '/rs/report'},
93
- target: bendi
94
- },
95
- '/rs': {
96
- target: bendi
97
- }
98
- }
99
-
100
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
101
- publicPath: config.output.publicPath,
102
- stats: {
103
- colors: true,
104
- chunks: false
105
- }
106
- })
107
-
108
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
109
- // force page reload when html-webpack-plugin template changes
110
- compiler.plugin('compilation', function (compilation) {
111
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
112
- hotMiddleware.publish({action: 'reload'})
113
- cb()
114
- })
115
- })
116
-
117
- // proxy api requests
118
- Object.keys(proxyTable).forEach(function (context) {
119
- var options = proxyTable[context]
120
- if (typeof options === 'string') {
121
- options = {target: options}
122
- }
123
- app.use(proxyMiddleware(context, options))
124
- })
125
-
126
- // handle fallback for HTML5 history API
127
- app.use(require('connect-history-api-fallback')())
128
- // app.use(function (req, res, next) {
129
- // res.header('Access-Control-Allow-Origin', '*')
130
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
131
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
132
- // res.header('X-Powered-By', '3,2,1')
133
- // res.header('Access-Control-Allow-Credentials', 'true')
134
- // res.header('Content-Type', 'application/json;charset=utf-8')
135
- // next()
136
- // })
137
-
138
- // serve webpack bundle output
139
- app.use(devMiddleware)
140
-
141
- // enable hot-reload and state-preserving
142
- // compilation error display
143
- app.use(hotMiddleware)
144
-
145
- // serve pure static assets
146
- app.use('/static', express.static('./static'))
147
-
148
- // app.all('/rs/*', function (req, res) {
149
- // proxy.web(req, res, {
150
- // target: 'http://127.0.0.1:8081/reports'
151
- // })
152
- // })
153
-
154
- // app.all('/rs/*', function (req, res) {
155
- // proxy.web(req, res, {
156
- // target: 'http://127.0.0.1:8081/ldap'
157
- // })
158
- // })
159
- // app.all('/excel/*', function (req, res) {
160
- // proxy.web(req, res, {
161
- // target: 'http://127.0.0.1:8081/charge'
162
- // })
163
- // })
164
-
165
- // app.all('/rs/*', function (req, res) {
166
- // proxy.web(req, res, {
167
- // target: 'http://127.0.0.1:82/charge'
168
- // })
169
- // })
170
-
171
- // app.all('/*', function (req, res) {
172
- // proxy.web(req, res, {
173
- // target: 'http://127.0.0.1:82'
174
- // })
175
- // })
176
- // app.all('/rs/user', function (req, res) {
177
- // proxy.web(req, res, {
178
- // target: 'http://127.0.0.1:82'
179
- // })
180
- // })
181
-
182
- module.exports = app.listen(8015, function (err) {
183
- if (err) {
184
- console.log(err)
185
- return
186
- }
187
- console.log('Listening at http://localhost:8015')
188
- })
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://121.36.106.17:8400/'
23
+ // var bendi = 'http://119.187.112.234:8400/'
24
+ var wode = 'http://121.36.106.17: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
+ '/api': {
33
+ target: bendi
34
+ },
35
+ '/rs/sql/chargeQuery_by_gasproperties': {
36
+ target: 'http://localhost:8084/'
37
+ },
38
+ '/rs/logic/chargeQuery_by_gasproperties_line': {
39
+ target: 'http://localhost:8084/'
40
+ },
41
+ '/files': {
42
+ target: bendi
43
+ },
44
+ // 查找资源服务数据
45
+ '/rs/search': {
46
+ target: bendi
47
+ },
48
+ // 查找资源服务数据
49
+ '/rs/logic/getLogin': {
50
+ target: bendi
51
+ },
52
+ // 查找资源服务数据
53
+ '/rs/logic/getInitData': {
54
+ target: bendi
55
+ },
56
+ '/rs/logic/getSaleInitData': {
57
+ target: bendi
58
+ },
59
+ // 用户登录服务地址
60
+ '/rs/user': {
61
+ target: bendi
62
+ },
63
+ '/rs/path/getParams': {
64
+ target: bendi
65
+ },
66
+ '/rs/data': {
67
+ target: bendi
68
+ },
69
+ '/rs/license': {
70
+ target: bendi
71
+ },
72
+ '/rs/db': {
73
+ target: bendi
74
+ },
75
+ '/excel': {
76
+ target: bendi
77
+ },
78
+ '/rs/config': {
79
+ target: bendi
80
+ },
81
+ '/rs/sql/getLicenseById': {
82
+ target: bendi
83
+ },
84
+ '/rs/report': {
85
+ target: bendi
86
+ },
87
+ '/rs/vue': {
88
+ target: bendi
89
+ },
90
+ '/rs/file': {
91
+ target: bendi
92
+ },
93
+ '/rs/sql/singleTable': {
94
+ target: bendi
95
+ },
96
+ '/rs/sql': {
97
+ target: 'http://localhost:8084/'
98
+ },
99
+ '/rs': {
100
+ target: wode
101
+ }
102
+ }
103
+
104
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
105
+ publicPath: config.output.publicPath,
106
+ stats: {
107
+ colors: true,
108
+ chunks: false
109
+ }
110
+ })
111
+
112
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
113
+ // force page reload when html-webpack-plugin template changes
114
+ compiler.plugin('compilation', function (compilation) {
115
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
116
+ hotMiddleware.publish({action: 'reload'})
117
+ cb()
118
+ })
119
+ })
120
+
121
+ // proxy api requests
122
+ Object.keys(proxyTable).forEach(function (context) {
123
+ var options = proxyTable[context]
124
+ if (typeof options === 'string') {
125
+ options = {target: options}
126
+ }
127
+ app.use(proxyMiddleware(context, options))
128
+ })
129
+
130
+ // handle fallback for HTML5 history API
131
+ app.use(require('connect-history-api-fallback')())
132
+ // app.use(function (req, res, next) {
133
+ // res.header('Access-Control-Allow-Origin', '*')
134
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
135
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
136
+ // res.header('X-Powered-By', '3,2,1')
137
+ // res.header('Access-Control-Allow-Credentials', 'true')
138
+ // res.header('Content-Type', 'application/json;charset=utf-8')
139
+ // next()
140
+ // })
141
+
142
+ // serve webpack bundle output
143
+ app.use(devMiddleware)
144
+
145
+ // enable hot-reload and state-preserving
146
+ // compilation error display
147
+ app.use(hotMiddleware)
148
+
149
+ // serve pure static assets
150
+ app.use('/static', express.static('./static'))
151
+
152
+ // app.all('/rs/*', function (req, res) {
153
+ // proxy.web(req, res, {
154
+ // target: 'http://127.0.0.1:8081/reports'
155
+ // })
156
+ // })
157
+
158
+ // app.all('/rs/*', function (req, res) {
159
+ // proxy.web(req, res, {
160
+ // target: 'http://127.0.0.1:8081/ldap'
161
+ // })
162
+ // })
163
+ // app.all('/excel/*', function (req, res) {
164
+ // proxy.web(req, res, {
165
+ // target: 'http://127.0.0.1:8081/charge'
166
+ // })
167
+ // })
168
+
169
+ // app.all('/rs/*', function (req, res) {
170
+ // proxy.web(req, res, {
171
+ // target: 'http://127.0.0.1:82/charge'
172
+ // })
173
+ // })
174
+
175
+ // app.all('/*', function (req, res) {
176
+ // proxy.web(req, res, {
177
+ // target: 'http://127.0.0.1:82'
178
+ // })
179
+ // })
180
+ // app.all('/rs/user', function (req, res) {
181
+ // proxy.web(req, res, {
182
+ // target: 'http://127.0.0.1:82'
183
+ // })
184
+ // })
185
+
186
+ module.exports = app.listen(8015, function (err) {
187
+ if (err) {
188
+ console.log(err)
189
+ return
190
+ }
191
+ console.log('Listening at http://localhost:8015')
192
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.146",
3
+ "version": "3.3.147",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -124,6 +124,9 @@
124
124
  <tabs header="开关阀记录查询" v-if="permission('开关阀记录查询')">
125
125
  <operation-value-record ></operation-value-record>
126
126
  </tabs>
127
+ <tabs header="收费记录维护查询" v-if="permission('收费记录维护查询')">
128
+ <charge-record-maintenance-query v-if="show.includes('收费记录维护查询')" ></charge-record-maintenance-query>
129
+ </tabs>
127
130
  </tab-button>
128
131
  <!-- </div>-->
129
132
  <!-- <div v-if="!listpage">-->
@@ -0,0 +1,353 @@
1
+ <template>
2
+ <div id="unit" class="flex-row">
3
+ <div class="basic-main" @keyup.enter="search">
4
+ <div class="flex" v-if="!show">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
+ <div class="row">
9
+ <div class="col-sm-2 form-group">
10
+ <label for="startDate" class="font_normal_body">开始日期</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width:60%"
12
+ v-model="$parent.$parent.startDate"
13
+ :value.sync="$parent.$parent.startDate"
14
+ :format="'yyyy-MM-dd'"
15
+ condition="modifitime >= '{} 00:00:00'"
16
+ :show-reset-button="true">
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-2 form-group">
20
+ <label for="endDate" class="font_normal_body">结束日期</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width:60%"
22
+ v-model="$parent.$parent.endDate"
23
+ :value.sync="$parent.$parent.endDate"
24
+ :format="'yyyy-MM-dd'"
25
+ condition="modifitime <= '{} 23:59: 59'"
26
+ :show-reset-button="true">
27
+ </datepicker>
28
+ </div>
29
+ <div class="col-sm-2 form-group ">
30
+ <label class="font_normal_body">客户编号</label>
31
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
32
+ condition="f_userinfo_code = '{}' " placeholder="客户编号">
33
+ </div>
34
+ <div class="col-sm-2 form-group">
35
+ <label class="font_normal_body">客户名称</label>
36
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
37
+ condition="f_user_name = '{}'" placeholder="客户名称">
38
+ </div>
39
+ <div class="span" style="float:right;">
40
+ <button class="button_search button_spacing" @click="search()">查询</button>
41
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
42
+ <export-excel :data="$parent.$parent.getCondition"
43
+ :field="$parent.$parent.getfield"
44
+ sqlurl="rs/logic/exportfile"
45
+ sql-name="manage_chargeRecordMaintenanceQuery"
46
+ template-name='收费记录维护查询'
47
+ :choose-col="true"></export-excel>
48
+ <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model"
49
+ :field="$parent.$parent.getfield"
50
+ titletable="收费记录维护查询" :starthead="$parent.$parent.startDate"
51
+ :defaultfield="$parent.$parent.defaultfield"
52
+ :sumsmodel="$parent.$parent.sumsmodel"></print-data>
53
+ <div
54
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
55
+ @click="$parent.$parent.hidden()"
56
+ class="button_spacing"
57
+ style="float: right"></div>
58
+ </div>
59
+ </div>
60
+ <div class="row" v-if="$parent.$parent.criteriaShow">
61
+ <res-select-group
62
+ :show-component="['company','department','operator']"
63
+ :initres="$parent.$parent.initres"
64
+ @re-res="$parent.$parent.getRes"
65
+ :specialquery="true"
66
+ v-ref:sel
67
+ ></res-select-group>
68
+ </div>
69
+ </div>
70
+ </criteria>
71
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
72
+ <template partial='head'>
73
+ <tr>
74
+ <th>
75
+ <nobr>客户编号</nobr>
76
+ </th>
77
+ <th>
78
+ <nobr>客户名称</nobr>
79
+ </th>
80
+ <th>
81
+ <nobr>维护内容</nobr>
82
+ </th>
83
+ <th>
84
+ <nobr>更改前</nobr>
85
+ </th>
86
+ <th>
87
+ <nobr>更改后</nobr>
88
+ </th>
89
+ <th>
90
+ <nobr>操作人</nobr>
91
+ </th>
92
+ <th>
93
+ <nobr>操作时间</nobr>
94
+ </th>
95
+ <th>
96
+ <nobr>收费记录状态</nobr>
97
+ </th>
98
+ </tr>
99
+ </template>
100
+ <template partial='body'>
101
+ <td style="text-align: center;">
102
+ <nobr>{{ row.f_userinfo_code }}</nobr>
103
+ </td>
104
+ <td style="text-align: center;">
105
+ <nobr>{{ row.f_user_name }}</nobr>
106
+ </td>
107
+ <td style="text-align: center;">
108
+ <nobr>{{ row.chinesename }}</nobr>
109
+ </td>
110
+ <td style="text-align: center;">
111
+ <nobr>{{ row.oldvalue }}</nobr>
112
+ </td>
113
+ <td style="text-align: center;">
114
+ <nobr>{{ row.newvalue }}</nobr>
115
+ </td>
116
+ <td style="text-align: center;">
117
+ <nobr>{{ row.operator }}</nobr>
118
+ </td>
119
+ <td style="text-align: center;">
120
+ <nobr>{{ row.modifitime }}</nobr>
121
+ </td>
122
+ <td style="text-align: center;">
123
+ <nobr>{{ row.f_state }}</nobr>
124
+ </td>
125
+ </template>
126
+ <template partial='foot'></template>
127
+ </data-grid>
128
+ </criteria-paged>
129
+ </div>
130
+ </div>
131
+ </div>
132
+ </template>
133
+ <script>
134
+ import {PagedList, HttpResetClass} from 'vue-client'
135
+ import defaultPrint from '../config/DefaultPrint'
136
+ import exportConfig from '../config/exportConfig'
137
+
138
+ let readySomething = async function (self) {
139
+ self.startDate = self.$login.toStandardDateString()
140
+ self.endDate = self.$login.toStandardDateString()
141
+ }
142
+ export default {
143
+ title: '收费记录维查询',
144
+ data() {
145
+ return {
146
+ condition: '',
147
+ condition2: '',
148
+ orgConditionStr: '',
149
+ criteriaShow: false,
150
+ model: new PagedList('api/af-revenue/sql/manage_chargeRecordMaintenanceQuery', 20, {
151
+ startDate: 'this.model.startDate',
152
+ endDate: 'this.model.endDate',}),
153
+ gasproperties: [],
154
+ show: false,
155
+ rowdata: {},
156
+ areaList: [],
157
+ modelval: [],
158
+ startDate: '',
159
+ endDate: '',
160
+ inputtouPerson: [],
161
+ printshow: false,
162
+ all: false,
163
+ fields: {},
164
+ thead: '',
165
+ tfoot: '',
166
+ defaultfield: [],
167
+ sumsmodel: {
168
+ f_start_count: 0 ,
169
+ f_add_count: 0 ,
170
+ f_end_count: 0 ,
171
+ },
172
+ initres: {
173
+ org: [this.$login.f.orgid],
174
+ dep:[],
175
+ user:[]
176
+ },
177
+ }
178
+ },
179
+ ready() {
180
+ readySomething(this).then(() => {
181
+ this.$emit('ready')
182
+ }).catch((error) => {
183
+ this.$emit('error', error)
184
+ })
185
+ },
186
+ methods: {
187
+ getAreaList (searchText) {
188
+ let condition = ' 1 = 1 '
189
+ if (searchText) {
190
+ condition = ` f_residential_area like '%${searchText}%' `
191
+ }
192
+ let HttpReset = new HttpResetClass()
193
+ HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
194
+ data: {
195
+ items: 'f_residential_area, id',
196
+ tablename: 't_area',
197
+ orderitem: 'id desc',
198
+ condition: condition
199
+ }
200
+ }, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
201
+ let redata = []
202
+ req.data.forEach((row, n) => {
203
+ redata[n] = {
204
+ label: row.f_residential_area,
205
+ value: row.id
206
+ }
207
+ })
208
+ this.areaList = [{label: '全部', value: ''}, ...redata]
209
+ })
210
+ },
211
+ clear() {
212
+ //清空部门和人员
213
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
214
+ //部门和人员变为全选
215
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
216
+ this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
217
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
218
+ this.$refs.paged.$refs.cri.model[key] = []
219
+ })
220
+ },
221
+ hidden() {
222
+ this.criteriaShow = !this.criteriaShow
223
+ },
224
+ getotherfooter() {
225
+ this.other = []
226
+ this.footer = []
227
+ let exportdata = this.getCondition
228
+ let otherInData = []
229
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
230
+ let footerData = [], exportfield = this.getfield
231
+ footerData.push('合计')
232
+ let self = this
233
+ for (var field in self.sumsmodel) {
234
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
235
+ }
236
+ this.footer.push(footerData)
237
+ this.other.push(otherInData)
238
+ },
239
+ search() {
240
+ this.$refs.paged.$refs.cri.search()
241
+ },
242
+ appendCondition(data) {
243
+ console.log('data=====>', data)
244
+ let stringValue = ''
245
+ for (var i = 0; i < data.length; i++) {
246
+ if (data[i]) {
247
+ if (i === data.length - 1) {
248
+ stringValue = stringValue + "'" + data[i] + "'"
249
+ } else {
250
+ stringValue = stringValue + "'" + data[i] + "',"
251
+ }
252
+ }
253
+ }
254
+ return stringValue
255
+ },
256
+ async selfSearch(args) {
257
+ this.condition2 = args.condition + ' and f_orgid = ' + this.$login.f.orgid
258
+ if (!this.orgConditionStr) {
259
+ args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
260
+ } else {
261
+ args.condition = `${args.condition}` + this.orgConditionStr
262
+ }
263
+ this.$refs.paged.$refs.cri.model.startDate = this.startDate
264
+ this.$refs.paged.$refs.cri.model.endDate = this.endDate
265
+ this.condition = args.condition
266
+ console.log("查看条件", this.condition)
267
+ await this.model.search(args.condition, args.model)
268
+ },
269
+ getRes(obj) {
270
+ this.orgConditionStr = obj
271
+ },
272
+ stamp() {
273
+ this.all = false
274
+ //默认选择要打印的列
275
+ this.modelval = defaultPrint.config
276
+ this.fields = this.getfield
277
+ console.log('所有打印字段', this.fields)
278
+ this.printshow = true
279
+ this.put()
280
+ },
281
+ put() {
282
+ // 对Modelval进行排序
283
+ this.sortModelval()
284
+ this.thead = `<tr><th colspan=${this.modelval.length}>用户查询</th></tr><tr>`
285
+ for (let key of this.modelval) {
286
+ this.thead += '<th>' + this.fields[key] + '</th>'
287
+ }
288
+ this.thead += '</tr>'
289
+ },
290
+ print() {
291
+ this.$refs.print.PrintAsFile()
292
+ this.printshow = false
293
+ },
294
+ dealmsg(val) {
295
+ console.log('---------------dealmsg')
296
+ this.rowdata = val
297
+ this.show = true
298
+ val.model = this.model.model
299
+ this.$dispatch('deal-msg', val)
300
+ },
301
+ close() {
302
+ this.printshow = false
303
+ this.all = false
304
+ },
305
+ // 对选择的列进行排序
306
+ sortModelval() {
307
+ let sortModel = []
308
+ Object.keys(this.fields).forEach((key) => {
309
+ if (this.modelval.includes(key)) {
310
+ sortModel.push(key)
311
+ }
312
+ })
313
+ this.modelval = sortModel
314
+ console.log('选择的打印的字段', this.modelval)
315
+ }
316
+ },
317
+ watch: {
318
+ 'all'(val) {
319
+ if (val) {
320
+ this.modelval = this.bodyData
321
+ } else {
322
+ this.modelval = defaultPrint.config
323
+ this.put()
324
+ }
325
+ },
326
+ sumsmodel: {
327
+ handler: function (val) {
328
+ this.getotherfooter()
329
+ },
330
+ deep: true
331
+ },
332
+ 'modelval.length'() {
333
+ this.put()
334
+ }
335
+ },
336
+ computed: {
337
+ getCondition() {
338
+ return {
339
+ condition: this.condition,
340
+ startDate: this.$refs.paged.$refs.cri.model.startDate,
341
+ endDate: this.$refs.paged.$refs.cri.model.endDate
342
+ }
343
+ },
344
+ getfield() {
345
+ return exportConfig.chargeRecordMaintenanceQuery
346
+ },
347
+ // metertypes() {
348
+ // return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
349
+ // }
350
+ }
351
+ }
352
+ </script>
353
+
@@ -1204,6 +1204,16 @@ export default{
1204
1204
  'f_limit_value': '单次限购量',
1205
1205
  'f_start_date': '执行时间',
1206
1206
  'f_operate_reason': '限购原因'
1207
+ },
1208
+ chargeRecordMaintenanceQuery: {
1209
+ 'f_userinfo_code': '用户编号',
1210
+ 'f_user_name': '用户名称',
1211
+ 'chinesename': '维护内容',
1212
+ 'oldvalue': '变更前',
1213
+ 'newvalue': '变更后',
1214
+ 'operator': '操作人',
1215
+ 'modifitime': '操作时间',
1216
+ 'f_state': '收费记录状态'
1207
1217
  }
1208
1218
  }
1209
1219
 
@@ -81,6 +81,9 @@
81
81
  <tabs header="壁挂炉用户查询" v-if="permission('壁挂炉用户查询')">
82
82
  <manage-wall-hanging-furnace-user-query v-if="show.includes('壁挂炉用户查询')"></manage-wall-hanging-furnace-user-query>
83
83
  </tabs>
84
+ <tabs header="收费记录维护查询" v-if="permission('收费记录维护查询')">
85
+ <charge-record-maintenance-query v-if="show.includes('收费记录维护查询')"></charge-record-maintenance-query>
86
+ </tabs>
84
87
  </tab-button>
85
88
  <!-- </div>-->
86
89
  <!-- <div v-if="!listpage">-->
package/src/main.js CHANGED
@@ -1,72 +1,68 @@
1
- import Vue from 'vue'
2
- import App from './App'
3
- import { all } from 'vue-client'
4
-
5
- // import { sale } from 'sale-client'
6
- import { system } from 'system-clients'
7
- import { ldap } from 'ldap-clients'
8
- import saleManage from './saleManage'
9
- import FilialeSaleManage from './filiale/WEINAN/sale'
10
- // import webmeterManage from './webmeterManage'
11
- // import FilialeWebmeterManage from './filiale/yuncheng/webmeterManage'
12
- // import reportManage from './reportManage'
13
- // import FilialeReportManage from './filiale/lixianV3/reportManage'
14
- // import newmanage from './newmanage'
15
- // import ManageHome from './ManageHome'
16
- import echarts from 'echarts'
17
- import AMap from 'vue-amap'
18
-
19
- Vue.config.silent = true
20
- // Vue.mmType = 'AES'
21
-
22
- Vue.use(AMap);
23
-
24
- // 初始化vue-amap
25
- AMap.initAMapApiLoader({
26
- // 高德key
27
- key: '3cec9ae8e2349207f7ac29279e3f4abe',
28
- // 插件集合 (插件按需引入)
29
- plugin: [
30
- "AMap.Autocomplete", //输入提示插件
31
- "AMap.PlaceSearch", //POI搜索插件
32
- "AMap.Scale", //右下角缩略图插件 比例尺
33
- "AMap.OverView", //地图鹰眼插件
34
- "AMap.ToolBar", //地图工具条0
35
- "AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
36
- "AMap.PolyEditor", //编辑 折线多,边形
37
- "AMap.CircleEditor", //圆形编辑器插件
38
- "AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
39
- ],
40
- uiVersion: "1.0"
41
- });
42
- /** **************************通用组件******************************/
43
-
44
- Vue.prototype.$echarts = echarts
45
- all()
46
- // sale()
47
- ldap()
48
- system(false)
49
-
50
- saleManage()
51
- FilialeSaleManage()
52
- // webmeterManage()
53
- // FilialeWebmeterManage()
54
- // ManageHome()
55
- // newmanage()
56
- // reportManage()
57
- // FilialeReportManage()
58
- require('system-clients/src/styles/less/bootstrap.less')
59
- require('./components/qinhua/Style/qinhuaStyle.less')
60
- // require('./bootstrap/less/manageStyle/manageChile.less')
61
- // require('./bootstrap/less/manageStyle/safeStyle.less')
62
-
63
- //大屏展示要放开的样式
64
- // require('system-clients/src/styles/less/manageStyle/manageChile.less')
65
- // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
66
- // require('system-clients/src/styles/less/manageStyle/manageStyle.less')
67
-
68
- new Vue({
69
- el: 'body',
70
- components: { App }
71
- })
72
-
1
+ import Vue from 'vue'
2
+ import App from './App'
3
+ import { all } from 'vue-client'
4
+
5
+ // import { sale } from 'sale-client'
6
+ import { system } from 'system-clients'
7
+ import { ldap } from 'ldap-clients'
8
+ import saleManage from './saleManage'
9
+ import ShanXianSaleManage from './filiale/shexian/sale'
10
+ import webmeterManage from './webmeterManage'
11
+ import reportManage from './reportManage'
12
+ import newmanage from './newmanage'
13
+ import ManageHome from './ManageHome'
14
+ import echarts from 'echarts'
15
+ import AMap from 'vue-amap'
16
+
17
+ Vue.config.silent = true
18
+ // Vue.mmType = 'AES'
19
+
20
+ Vue.use(AMap);
21
+
22
+ // 初始化vue-amap
23
+ AMap.initAMapApiLoader({
24
+ // 高德key
25
+ key: '3cec9ae8e2349207f7ac29279e3f4abe',
26
+ // 插件集合 (插件按需引入)
27
+ plugin: [
28
+ "AMap.Autocomplete", //输入提示插件
29
+ "AMap.PlaceSearch", //POI搜索插件
30
+ "AMap.Scale", //右下角缩略图插件 比例尺
31
+ "AMap.OverView", //地图鹰眼插件
32
+ "AMap.ToolBar", //地图工具条0
33
+ "AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
34
+ "AMap.PolyEditor", //编辑 折线多,边形
35
+ "AMap.CircleEditor", //圆形编辑器插件
36
+ "AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
37
+ ],
38
+ uiVersion: "1.0"
39
+ });
40
+ /** **************************通用组件******************************/
41
+
42
+ Vue.prototype.$echarts = echarts
43
+ all()
44
+ // sale()
45
+ ldap()
46
+ system(false)
47
+
48
+ saleManage()
49
+ ShanXianSaleManage()
50
+ webmeterManage()
51
+ ManageHome()
52
+ newmanage()
53
+ reportManage()
54
+ require('system-clients/src/styles/less/bootstrap.less')
55
+ require('./components/qinhua/Style/qinhuaStyle.less')
56
+ // require('./bootstrap/less/manageStyle/manageChile.less')
57
+ // require('./bootstrap/less/manageStyle/safeStyle.less')
58
+
59
+ //大屏展示要放开的样式
60
+ // require('system-clients/src/styles/less/manageStyle/manageChile.less')
61
+ // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
62
+ // require('system-clients/src/styles/less/manageStyle/manageStyle.less')
63
+
64
+ new Vue({
65
+ el: 'body',
66
+ components: { App }
67
+ })
68
+
package/src/saleManage.js CHANGED
@@ -343,6 +343,10 @@ export default function () {
343
343
  Vue.component('error-handplan-query', (resolve) => {
344
344
  require(['./components/sale/businessquery/errorHandplanQuery'], resolve)
345
345
  })
346
+ // 收费记录维护查询
347
+ Vue.component('charge-record-maintenance-query', (resolve) => {
348
+ require(['./components/sale/businessquery/chargeRecordMaintenanceQuery'], resolve)
349
+ })
346
350
 
347
351
  // 综合分析
348
352
  Vue.component('new-echarts-all', (resolve) => {