manage-client 3.2.151 → 3.2.153

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 (7) hide show
  1. package/build/dev-server.js +176 -176
  2. package/package.json +1 -1
  3. package/src/components/SellReport/tl_handgas.vue +244 -0
  4. package/src/components/SellReport/tl_handmoney.vue +244 -0
  5. package/src/filiale/macheng/WebmeterSettlementAnalysis.vue +6 -0
  6. package/src/reportManage.js +8 -1
  7. package/src/webmeterManage.js +1 -1
package/build/dev-server.js CHANGED
@@ -1,176 +1,176 @@
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 = 'https://qnjtkf.cn:7400'
17
- // var bendi = 'http://172.168.1.11:9001'
18
- var fuwu = 'https://qnjtkf.cn:7400'
19
- // var fuwu = 'http://203.57.101.233:9001'
20
- var system = 'http://192.168.50.4:8400'
21
- //192.168.
22
- // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
23
- // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
24
- var proxyTable = {
25
- '/rs/logic/exportfile': {
26
- target: fuwu
27
- },
28
- '/files': {
29
- target: fuwu
30
- },
31
- // 查找资源服务数据
32
- '/rs/search': {
33
- target: fuwu
34
- },
35
- // 查找资源服务数据
36
- '/rs/logic/getLogin': {
37
- target: fuwu
38
- },
39
- // 查找资源服务数据
40
- '/rs/logic/getInitData': {
41
- target: fuwu
42
- },
43
- '/rs/logic/getSaleInitData':{
44
- target: fuwu
45
- },
46
- // 用户登录服务地址
47
- '/rs/user': {
48
- target: fuwu
49
- },
50
- '/rs/path/getParams': {
51
- target: fuwu
52
- },
53
- '/rs/data': {
54
- target: fuwu
55
- },
56
- '/rs/license': {
57
- target: fuwu
58
- },
59
- '/rs/db': {
60
- target: fuwu
61
- },
62
- '/excel': {
63
- target: fuwu
64
- },
65
- '/rs/config': {
66
- target: fuwu
67
- },
68
- '/rs/sql/getLicenseById': {
69
- target: fuwu
70
- },
71
- '/rs/report': {
72
- target: bendi
73
- },
74
- '/rs/vue': {
75
- target: fuwu
76
- },
77
- '/rs/file': {
78
- target: bendi
79
- },
80
- '/rs/logic/SumSettleFileImport': {
81
- target: 'http://127.0.0.1:8080'
82
- },
83
- '/rs': {
84
- target: fuwu
85
- }
86
- }
87
-
88
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
89
- publicPath: config.output.publicPath,
90
- stats: {
91
- colors: true,
92
- chunks: false
93
- }
94
- })
95
-
96
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
97
- // force page reload when html-webpack-plugin template changes
98
- compiler.plugin('compilation', function (compilation) {
99
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
100
- hotMiddleware.publish({action: 'reload'})
101
- cb()
102
- })
103
- })
104
-
105
- // proxy api requests
106
- Object.keys(proxyTable).forEach(function (context) {
107
- var options = proxyTable[context]
108
- if (typeof options === 'string') {
109
- options = {target: options}
110
- }
111
- app.use(proxyMiddleware(context, options))
112
- })
113
-
114
- // handle fallback for HTML5 history API
115
- app.use(require('connect-history-api-fallback')())
116
- // app.use(function (req, res, next) {
117
- // res.header('Access-Control-Allow-Origin', '*')
118
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
119
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
120
- // res.header('X-Powered-By', '3,2,1')
121
- // res.header('Access-Control-Allow-Credentials', 'true')
122
- // res.header('Content-Type', 'application/json;charset=utf-8')
123
- // next()
124
- // })
125
-
126
- // serve webpack bundle output
127
- app.use(devMiddleware)
128
-
129
- // enable hot-reload and state-preserving
130
- // compilation error display
131
- app.use(hotMiddleware)
132
-
133
- // serve pure static assets
134
- app.use('/static', express.static('./static'))
135
-
136
- // app.all('/rs/*', function (req, res) {
137
- // proxy.web(req, res, {
138
- // target: 'http://127.0.0.1:8081/reports'
139
- // })
140
- // })
141
-
142
- // app.all('/rs/*', function (req, res) {
143
- // proxy.web(req, res, {
144
- // target: 'http://127.0.0.1:8081/ldap'
145
- // })
146
- // })
147
- // app.all('/excel/*', function (req, res) {
148
- // proxy.web(req, res, {
149
- // target: 'http://127.0.0.1:8081/charge'
150
- // })
151
- // })
152
-
153
- // app.all('/rs/*', function (req, res) {
154
- // proxy.web(req, res, {
155
- // target: 'http://127.0.0.1:82/charge'
156
- // })
157
- // })
158
-
159
- // app.all('/*', function (req, res) {
160
- // proxy.web(req, res, {
161
- // target: 'http://127.0.0.1:82'
162
- // })
163
- // })
164
- // app.all('/rs/user', function (req, res) {
165
- // proxy.web(req, res, {
166
- // target: 'http://127.0.0.1:82'
167
- // })
168
- // })
169
-
170
- module.exports = app.listen(8085, function (err) {
171
- if (err) {
172
- console.log(err)
173
- return
174
- }
175
- console.log('Listening at http://localhost:8085')
176
- })
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://192.168.50.4:8400'
17
+ // var bendi = 'http://172.168.1.11:9001'
18
+ var fuwu = 'http://121.36.106.17:8400/'
19
+ // var fuwu = 'http://203.57.101.233:9001'
20
+ var system = 'http://192.168.50.4:8400'
21
+ //192.168.
22
+ // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
23
+ // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
24
+ var proxyTable = {
25
+ '/rs/logic/exportfile': {
26
+ target: fuwu
27
+ },
28
+ '/files': {
29
+ target: fuwu
30
+ },
31
+ // 查找资源服务数据
32
+ '/rs/search': {
33
+ target: fuwu
34
+ },
35
+ // 查找资源服务数据
36
+ '/rs/logic/getLogin': {
37
+ target: fuwu
38
+ },
39
+ // 查找资源服务数据
40
+ '/rs/logic/getInitData': {
41
+ target: fuwu
42
+ },
43
+ '/rs/logic/getSaleInitData':{
44
+ target: fuwu
45
+ },
46
+ // 用户登录服务地址
47
+ '/rs/user': {
48
+ target: fuwu
49
+ },
50
+ '/rs/path/getParams': {
51
+ target: fuwu
52
+ },
53
+ '/rs/data': {
54
+ target: fuwu
55
+ },
56
+ '/rs/license': {
57
+ target: fuwu
58
+ },
59
+ '/rs/db': {
60
+ target: fuwu
61
+ },
62
+ '/excel': {
63
+ target: fuwu
64
+ },
65
+ '/rs/config': {
66
+ target: fuwu
67
+ },
68
+ '/rs/sql/getLicenseById': {
69
+ target: fuwu
70
+ },
71
+ '/rs/report': {
72
+ target: bendi
73
+ },
74
+ '/rs/vue': {
75
+ target: fuwu
76
+ },
77
+ '/rs/file': {
78
+ target: bendi
79
+ },
80
+ '/rs/logic/SumSettleFileImport': {
81
+ target: 'http://127.0.0.1:8080'
82
+ },
83
+ '/rs': {
84
+ target: fuwu
85
+ }
86
+ }
87
+
88
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
89
+ publicPath: config.output.publicPath,
90
+ stats: {
91
+ colors: true,
92
+ chunks: false
93
+ }
94
+ })
95
+
96
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
97
+ // force page reload when html-webpack-plugin template changes
98
+ compiler.plugin('compilation', function (compilation) {
99
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
100
+ hotMiddleware.publish({action: 'reload'})
101
+ cb()
102
+ })
103
+ })
104
+
105
+ // proxy api requests
106
+ Object.keys(proxyTable).forEach(function (context) {
107
+ var options = proxyTable[context]
108
+ if (typeof options === 'string') {
109
+ options = {target: options}
110
+ }
111
+ app.use(proxyMiddleware(context, options))
112
+ })
113
+
114
+ // handle fallback for HTML5 history API
115
+ app.use(require('connect-history-api-fallback')())
116
+ // app.use(function (req, res, next) {
117
+ // res.header('Access-Control-Allow-Origin', '*')
118
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
119
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
120
+ // res.header('X-Powered-By', '3,2,1')
121
+ // res.header('Access-Control-Allow-Credentials', 'true')
122
+ // res.header('Content-Type', 'application/json;charset=utf-8')
123
+ // next()
124
+ // })
125
+
126
+ // serve webpack bundle output
127
+ app.use(devMiddleware)
128
+
129
+ // enable hot-reload and state-preserving
130
+ // compilation error display
131
+ app.use(hotMiddleware)
132
+
133
+ // serve pure static assets
134
+ app.use('/static', express.static('./static'))
135
+
136
+ // app.all('/rs/*', function (req, res) {
137
+ // proxy.web(req, res, {
138
+ // target: 'http://127.0.0.1:8081/reports'
139
+ // })
140
+ // })
141
+
142
+ // app.all('/rs/*', function (req, res) {
143
+ // proxy.web(req, res, {
144
+ // target: 'http://127.0.0.1:8081/ldap'
145
+ // })
146
+ // })
147
+ // app.all('/excel/*', function (req, res) {
148
+ // proxy.web(req, res, {
149
+ // target: 'http://127.0.0.1:8081/charge'
150
+ // })
151
+ // })
152
+
153
+ // app.all('/rs/*', function (req, res) {
154
+ // proxy.web(req, res, {
155
+ // target: 'http://127.0.0.1:82/charge'
156
+ // })
157
+ // })
158
+
159
+ // app.all('/*', function (req, res) {
160
+ // proxy.web(req, res, {
161
+ // target: 'http://127.0.0.1:82'
162
+ // })
163
+ // })
164
+ // app.all('/rs/user', function (req, res) {
165
+ // proxy.web(req, res, {
166
+ // target: 'http://127.0.0.1:82'
167
+ // })
168
+ // })
169
+
170
+ module.exports = app.listen(8085, function (err) {
171
+ if (err) {
172
+ console.log(err)
173
+ return
174
+ }
175
+ console.log('Listening at http://localhost:8085')
176
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.151",
3
+ "version": "3.2.153",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/SellReport/tl_handgas.vue ADDED
@@ -0,0 +1,244 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 98%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <p class="bg-info text-center" style="padding: 8px;">抄表员情况统计表</p>
6
+ <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
+ <div class="row">
9
+ <div class="col-sm-4" >
10
+ <label class="font_normal_body" for="startDate">开始日期:</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
+ :disabled-days-of-Week="[]"
15
+ :format="'yyyy-MM-dd HH:mm:ss'"
16
+ :show-reset-button="reset">
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-4" >
20
+ <label class="font_normal_body" for="endDate">结束日期:</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
+ :disabled-days-of-Week="[]"
25
+ :format="'yyyy-MM-dd HH:mm:ss'"
26
+ :show-reset-button="reset">
27
+ </datepicker>
28
+ </div>
29
+ <div class="col-sm-4">
30
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
31
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
+ </div>
33
+ <div class="col-sm-4">
34
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
35
+ <res-select restype='department'
36
+ is-mul="false"
37
+ @res-select="$parent.$parent.getdep"
38
+ :parentresid="$parent.$parent.depresid"
39
+ :initresid='$parent.$parent.depid'>
40
+ </res-select>
41
+
42
+ </div>
43
+ <div class="col-sm-4">
44
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
45
+ <res-select restype='user'
46
+ is-mul="false"
47
+ @res-select="$parent.$parent.getuser"
48
+ :parentresid="$parent.$parent.userresid"
49
+ :initresid='$parent.$parent.operatorid'>
50
+ </res-select>
51
+ </div>
52
+ </div>
53
+ <div class="span" style = "float:right;">
54
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
55
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
56
+ <report-excel id='gasprice'></report-excel>
57
+ </div>
58
+ </div>
59
+ </criteria>
60
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
61
+ <table class='tableprint' style="margin: 0px auto;">
62
+ <thead>
63
+ <tr>
64
+ <th colspan='18' style="font-weight: normal; text-align: left;">
65
+ <h3 style="text-align: center">抄表员情况统计表</h3>
66
+ </th>
67
+ </tr>
68
+ <tr>
69
+ <th colspan='18' style="font-weight: normal; text-align: center;">
70
+ 开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
71
+ 结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
72
+ 打印时间：{{{$parent.printTime}}}
73
+ </th>
74
+ </tr>
75
+ <tr>
76
+ <th colspan='18' style="font-weight: normal; text-align: center;">
77
+ <div>
78
+ <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
79
+ <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
80
+ <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
81
+ </div>
82
+ </th>
83
+ </tr>
84
+ </thead>
85
+ <tr>
86
+ <td colspan='18'>
87
+ {{{ model.data.substring(26,model.data.length-8) }}}
88
+ </td>
89
+ </tr>
90
+ <tfoot>
91
+ <tr style="text-align: left">
92
+ <th colspan='6'>财务审核：</th>
93
+ <th colspan='6'>收款审核：</th>
94
+ <th colspan='6'>收款员：</th>
95
+ </tr>
96
+ </tfoot>
97
+ </table>
98
+ {{{ $parent.reportStr}}}
99
+ </div>
100
+ </criteria-paged>
101
+ <modal :show.sync="show" v-ref:modal small backdrop="false">
102
+ <header slot="modal-header" class="modal-header">
103
+ <h4 class="modal-title">输入文件名称</h4>
104
+ </header>
105
+ <article slot="modal-body" class="modal-body">
106
+ <div class="form-group">
107
+ <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
108
+ </div>
109
+ </article>
110
+ <footer slot="modal-footer" class="modal-footer">
111
+ <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
112
+ <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
113
+ </footer>
114
+ </modal>
115
+ </div>
116
+ </template>
117
+
118
+ <script>
119
+ import { DataModel } from 'vue-client'
120
+ import co from 'co'
121
+ let saveFile = function * (self) {
122
+ // 线验证文件是否重名
123
+ let count = yield self.$resetpost('rs/sql/manageSingleTable',
124
+ {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
125
+ {resolveMsg: null, rejectMsg: null})
126
+ if (count.data.length > 0) {
127
+ self.$showAlert('无法保存，文件名重名', 'warning', 3000)
128
+ return
129
+ }
130
+ let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
131
+ f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
132
+ f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
133
+ f_outlets: this.$login.f.depname})
134
+ if (saveBack.data.status === 'succeed') {
135
+ self.show = false
136
+ self.filename = ''
137
+ // 后台保存完成，通知刷新
138
+ self.$dispatch('save-success', self.filename)
139
+ }
140
+ }
141
+ export default {
142
+ title: '抄表员情况统计表',
143
+ props: ['data'],
144
+ data () {
145
+ return {
146
+ printTime: this.$login.toStandardTimeString(),
147
+ depresid: [],
148
+
149
+ userresid: [],
150
+ f_orgid: this.$login.f.orgid,
151
+ f_depid: this.$login.f.depids,
152
+ f_operatorid: this.$login.f.id,
153
+ operatorid: [],
154
+ depid: [],
155
+ orgname: '',
156
+ depname: '',
157
+ operatorname: '',
158
+ orgCondtionStr: '1=1',
159
+ model: new DataModel('rs/report/tl_handgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
160
+ f_orgid: 'this.model.f_orgid'}),
161
+ reportStr: null,
162
+ show: false,
163
+ }
164
+ },
165
+ ready () {
166
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
167
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
168
+ console.log(this.$login.f)
169
+ },
170
+ methods: {
171
+ searchData () {
172
+ this.$refs.paged.$refs.criteria.search()
173
+ },
174
+ selfSearch (args) {
175
+ this.printTime = this.$login.toStandardTimeString()
176
+ let orgcondition = 'f_orgid in(' + this.f_orgid + ')'
177
+ if (this.f_depid[0]) {
178
+ orgcondition += ' and f_depid in(' + this.f_depid + ')'
179
+ }
180
+ if(this.f_operatorid[0]) {
181
+ orgcondition += ' and f_operatorid in(' + this.f_operatorid + ')'
182
+ }
183
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
184
+ this.$refs.paged.search(args)
185
+ },
186
+ getRes (obj) {
187
+ this.orgname = obj.res[0]
188
+ this.depresid = obj.resids
189
+ this.f_orgid = obj.resids
190
+ },
191
+ getdep (obj, val) {
192
+ // this.depname = val[0]
193
+ this.userresid = obj
194
+ this.f_depid = obj
195
+ },
196
+ getuser ( obj, val) {
197
+ this.operatorname = val[0]
198
+ this.f_operatorid = obj
199
+ },
200
+
201
+ // 根据文件路径获取储存的报表内容
202
+ getFileContent (path) {
203
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
204
+ this.reportStr = res.data.filecontent
205
+ this.model.state = '正确'
206
+ })
207
+ },
208
+ confirm () {
209
+ if (!this.filename || this.filename === '') {
210
+ this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
211
+ }
212
+ let saveGen = saveFile(this)
213
+ co(saveGen)
214
+ },
215
+ close () {
216
+ this.show = false
217
+ },
218
+ // 将报表保存成文件
219
+ confirmReport () {
220
+ this.show = true
221
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
222
+ },
223
+ },
224
+ watch: {
225
+ 'data' (val) {
226
+ if (val.f_files_path) {
227
+ this.getFileContent(val.f_files_path)
228
+ } else {
229
+ this.reportStr = null
230
+ }
231
+ }
232
+ },
233
+ computed: {
234
+ }
235
+ }
236
+ </script>
237
+ <style scoped>
238
+ .noborder{
239
+ border: none;
240
+ }
241
+ .fontSize{
242
+ font-size: 13px;
243
+ }
244
+ </style>
package/src/components/SellReport/tl_handmoney.vue ADDED
@@ -0,0 +1,244 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 98%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <p class="bg-info text-center" style="padding: 8px;">抄表员气量统计表</p>
6
+ <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
+ <div class="row">
9
+ <div class="col-sm-4" >
10
+ <label class="font_normal_body" for="startDate">开始日期:</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
+ :disabled-days-of-Week="[]"
15
+ :format="'yyyy-MM-dd HH:mm:ss'"
16
+ :show-reset-button="reset">
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-4" >
20
+ <label class="font_normal_body" for="endDate">结束日期:</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
+ :disabled-days-of-Week="[]"
25
+ :format="'yyyy-MM-dd HH:mm:ss'"
26
+ :show-reset-button="reset">
27
+ </datepicker>
28
+ </div>
29
+ <div class="col-sm-4">
30
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
31
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
+ </div>
33
+ <div class="col-sm-4">
34
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
35
+ <res-select restype='department'
36
+ is-mul="false"
37
+ @res-select="$parent.$parent.getdep"
38
+ :parentresid="$parent.$parent.depresid"
39
+ :initresid='$parent.$parent.depid'>
40
+ </res-select>
41
+
42
+ </div>
43
+ <div class="col-sm-4">
44
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
45
+ <res-select restype='user'
46
+ is-mul="false"
47
+ @res-select="$parent.$parent.getuser"
48
+ :parentresid="$parent.$parent.userresid"
49
+ :initresid='$parent.$parent.operatorid'>
50
+ </res-select>
51
+ </div>
52
+ </div>
53
+ <div class="span" style = "float:right;">
54
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
55
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
56
+ <report-excel id='gasprice'></report-excel>
57
+ </div>
58
+ </div>
59
+ </criteria>
60
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
61
+ <table class='tableprint' style="margin: 0px auto;">
62
+ <thead>
63
+ <tr>
64
+ <th colspan='18' style="font-weight: normal; text-align: left;">
65
+ <h3 style="text-align: center">抄表员气量统计表</h3>
66
+ </th>
67
+ </tr>
68
+ <tr>
69
+ <th colspan='18' style="font-weight: normal; text-align: center;">
70
+ 开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
71
+ 结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
72
+ 打印时间：{{{$parent.printTime}}}
73
+ </th>
74
+ </tr>
75
+ <tr>
76
+ <th colspan='18' style="font-weight: normal; text-align: center;">
77
+ <div>
78
+ <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
79
+ <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
80
+ <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
81
+ </div>
82
+ </th>
83
+ </tr>
84
+ </thead>
85
+ <tr>
86
+ <td colspan='18'>
87
+ {{{ model.data.substring(26,model.data.length-8) }}}
88
+ </td>
89
+ </tr>
90
+ <tfoot>
91
+ <tr style="text-align: left">
92
+ <th colspan='6'>财务审核：</th>
93
+ <th colspan='6'>收款审核：</th>
94
+ <th colspan='6'>收款员：</th>
95
+ </tr>
96
+ </tfoot>
97
+ </table>
98
+ {{{ $parent.reportStr}}}
99
+ </div>
100
+ </criteria-paged>
101
+ <modal :show.sync="show" v-ref:modal small backdrop="false">
102
+ <header slot="modal-header" class="modal-header">
103
+ <h4 class="modal-title">输入文件名称</h4>
104
+ </header>
105
+ <article slot="modal-body" class="modal-body">
106
+ <div class="form-group">
107
+ <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
108
+ </div>
109
+ </article>
110
+ <footer slot="modal-footer" class="modal-footer">
111
+ <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
112
+ <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
113
+ </footer>
114
+ </modal>
115
+ </div>
116
+ </template>
117
+
118
+ <script>
119
+ import { DataModel } from 'vue-client'
120
+ import co from 'co'
121
+ let saveFile = function * (self) {
122
+ // 线验证文件是否重名
123
+ let count = yield self.$resetpost('rs/sql/manageSingleTable',
124
+ {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
125
+ {resolveMsg: null, rejectMsg: null})
126
+ if (count.data.length > 0) {
127
+ self.$showAlert('无法保存，文件名重名', 'warning', 3000)
128
+ return
129
+ }
130
+ let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
131
+ f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
132
+ f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
133
+ f_outlets: this.$login.f.depname})
134
+ if (saveBack.data.status === 'succeed') {
135
+ self.show = false
136
+ self.filename = ''
137
+ // 后台保存完成，通知刷新
138
+ self.$dispatch('save-success', self.filename)
139
+ }
140
+ }
141
+ export default {
142
+ title: '抄表员气量统计表',
143
+ props: ['data'],
144
+ data () {
145
+ return {
146
+ printTime: this.$login.toStandardTimeString(),
147
+ depresid: [],
148
+
149
+ userresid: [],
150
+ f_orgid: this.$login.f.orgid,
151
+ f_depid: this.$login.f.depids,
152
+ f_operatorid: this.$login.f.id,
153
+ operatorid: [],
154
+ depid: [],
155
+ orgname: '',
156
+ depname: '',
157
+ operatorname: '',
158
+ orgCondtionStr: '1=1',
159
+ model: new DataModel('rs/report/tl_handmoney', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
160
+ f_orgid: 'this.model.f_orgid'}),
161
+ reportStr: null,
162
+ show: false,
163
+ }
164
+ },
165
+ ready () {
166
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
167
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
168
+ console.log(this.$login.f)
169
+ },
170
+ methods: {
171
+ searchData () {
172
+ this.$refs.paged.$refs.criteria.search()
173
+ },
174
+ selfSearch (args) {
175
+ this.printTime = this.$login.toStandardTimeString()
176
+ let orgcondition = 'f_orgid in(' + this.f_orgid + ')'
177
+ if (this.f_depid[0]) {
178
+ orgcondition += ' and f_depid in(' + this.f_depid + ')'
179
+ }
180
+ if(this.f_operatorid[0]) {
181
+ orgcondition += ' and f_operatorid in(' + this.f_operatorid + ')'
182
+ }
183
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
184
+ this.$refs.paged.search(args)
185
+ },
186
+ getRes (obj) {
187
+ this.orgname = obj.res[0]
188
+ this.depresid = obj.resids
189
+ this.f_orgid = obj.resids
190
+ },
191
+ getdep (obj, val) {
192
+ // this.depname = val[0]
193
+ this.userresid = obj
194
+ this.f_depid = obj
195
+ },
196
+ getuser ( obj, val) {
197
+ this.operatorname = val[0]
198
+ this.f_operatorid = obj
199
+ },
200
+
201
+ // 根据文件路径获取储存的报表内容
202
+ getFileContent (path) {
203
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
204
+ this.reportStr = res.data.filecontent
205
+ this.model.state = '正确'
206
+ })
207
+ },
208
+ confirm () {
209
+ if (!this.filename || this.filename === '') {
210
+ this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
211
+ }
212
+ let saveGen = saveFile(this)
213
+ co(saveGen)
214
+ },
215
+ close () {
216
+ this.show = false
217
+ },
218
+ // 将报表保存成文件
219
+ confirmReport () {
220
+ this.show = true
221
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
222
+ },
223
+ },
224
+ watch: {
225
+ 'data' (val) {
226
+ if (val.f_files_path) {
227
+ this.getFileContent(val.f_files_path)
228
+ } else {
229
+ this.reportStr = null
230
+ }
231
+ }
232
+ },
233
+ computed: {
234
+ }
235
+ }
236
+ </script>
237
+ <style scoped>
238
+ .noborder{
239
+ border: none;
240
+ }
241
+ .fontSize{
242
+ font-size: 13px;
243
+ }
244
+ </style>
package/src/filiale/macheng/WebmeterSettlementAnalysis.vue CHANGED
@@ -145,6 +145,9 @@
145
145
  <th style="text-align:center">
146
146
  <nobr>最后上报金额</nobr>
147
147
  </th>
148
+ <th style="text-align:center">
149
+ <nobr>未抄金额</nobr>
150
+ </th>
148
151
  <th style="text-align:center">
149
152
  <nobr>账户余额</nobr>
150
153
  </th>
@@ -183,6 +186,9 @@
183
186
  <td style="text-align:center">
184
187
  <nobr>{{ row.f_jval }}</nobr>
185
188
  </td>
189
+ <td style="text-align:center">
190
+ <nobr>{{ !row.coll?"":row.coll}}</nobr>
191
+ </td>
186
192
  <td style="text-align:center">
187
193
  <nobr>{{ row.f_balance_amount }}</nobr>
188
194
  </td>
package/src/reportManage.js CHANGED
@@ -612,7 +612,14 @@ export default function (filiale) {
612
612
  Vue.component('card-applys-gas', (resolve) => {
613
613
  require(['./components/SellReport/Cardapplysgas'], resolve)
614
614
  })
615
-
615
+ // 抄表员情况统计表
616
+ Vue.component('tl_handgas', (resolve) => {
617
+ require(['./components/SellReport/tl_handgas'], resolve)
618
+ })
619
+ // 抄表员气量统计表
620
+ Vue.component('tl_handmoney', (resolve) => {
621
+ require(['./components/SellReport/tl_handmoney'], resolve)
622
+ })
616
623
  if (filiale) {
617
624
  let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
618
625
  Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale
package/src/webmeterManage.js CHANGED
@@ -110,7 +110,7 @@ export default function (filiale) {
110
110
  Vue.component('webmeter-settlement-analysis', (resolve) => { require(['./components/webmeter/gasAnalysis/WebmeterSettlementAnalysis'], resolve) })
111
111
 
112
112
  if (filiale) {
113
- let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
113
+ let filialeComp = require(`./filiale/${filiale}/webmeterManage`).specialComp
114
114
  Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale
115
115
  for (let key in filialeComp) {
116
116
  Vue.component(key, filialeComp[key])