manage-client 4.1.88-linshi-dexin → 4.1.89

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,145 +1,145 @@
1
- const express = require('express')
2
- const webpack = require('webpack')
3
- const config = require('./webpack.dev.conf')
4
- const proxyMiddleware = require('http-proxy-middleware')
5
-
6
- const app = express()
7
- const compiler = webpack(config)
8
-
9
- const server = 'http://222.83.114.229:31785/'
10
- const local = 'http://222.83.114.229:31785/'
11
- const proxyTable = {
12
- '/rs/logic/exportfile': {
13
- target: server
14
- },
15
- '/dataManage': {
16
- target: server
17
- },
18
- '/api/af-revenue/sql/': {
19
- // pathRewrite: {
20
- // '^/api/af-revenue': '/'
21
- // },
22
- target: local
23
- },
24
- '/api/af-revenue/report/': {
25
- // pathRewrite: {
26
- // '^/api/af-revenue': '/'
27
- // },
28
- target: local
29
- },
30
- '/api/af-revenue/logic': {
31
- // pathRewrite: {
32
- // '^/api/af-revenue': '/'
33
- // },
34
- target: local
35
- },
36
- '/api': {
37
- target: server
38
- },
39
- '/rs/sql/chargeQuery_by_gasproperties': {
40
- target: server
41
- },
42
- '/rs/logic/chargeQuery_by_gasproperties_line': {
43
- target: server
44
- },
45
- '/files': {
46
- target: server
47
- },
48
- // 查找资源服务数据
49
- '/rs/search': {
50
- target: server
51
- },
52
- // 查找资源服务数据
53
- '/rs/logic/getLogin': {
54
- target: server
55
- },
56
- // 查找资源服务数据
57
- '/rs/logic/getInitData': {
58
- target: server
59
- },
60
- '/rs/logic/getSaleInitData': {
61
- target: server
62
- },
63
- // 用户登录服务地址
64
- '/rs/user': {
65
- target: server
66
- },
67
- '/rs/path/getParams': {
68
- target: server
69
- },
70
- '/rs/data': {
71
- target: server
72
- },
73
- '/rs/license': {
74
- target: server
75
- },
76
- '/rs/db': {
77
- target: server
78
- },
79
- '/excel': {
80
- target: server
81
- },
82
- '/rs/config': {
83
- target: server
84
- },
85
- '/rs/sql/getLicenseById': {
86
- target: server
87
- },
88
- '/rs/report': {
89
- target: server
90
- },
91
- '/rs/vue': {
92
- target: server
93
- },
94
- '/rs/file': {
95
- target: server
96
- },
97
- '/rs/sql/singleTable': {
98
- target: server
99
- },
100
- '/rs': {
101
- target: server
102
- }
103
- }
104
-
105
- const devMiddleware = require('webpack-dev-middleware')(compiler, {
106
- publicPath: config.output.publicPath,
107
- stats: {
108
- colors: true,
109
- chunks: false
110
- }
111
- })
112
-
113
- const hotMiddleware = require('webpack-hot-middleware')(compiler)
114
- // force page reload when html-webpack-plugin template changes
115
- compiler.plugin('compilation', function (compilation) {
116
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
117
- hotMiddleware.publish({action: 'reload'})
118
- cb()
119
- })
120
- })
121
-
122
- // proxy api requests
123
- Object.keys(proxyTable).forEach(function (context) {
124
- let options = proxyTable[context]
125
- if (typeof options === 'string') {
126
- options = {target: options}
127
- }
128
- app.use(proxyMiddleware(context, options))
129
- })
130
-
131
- app.use(require('connect-history-api-fallback')())
132
-
133
- app.use(devMiddleware)
134
-
135
- app.use(hotMiddleware)
136
-
137
- app.use('/static', express.static('./static'))
138
-
139
- module.exports = app.listen(8015, function (err) {
140
- if (err) {
141
- console.log(err)
142
- return
143
- }
144
- console.log('Listening at http://localhost:8015')
145
- })
1
+ const express = require('express')
2
+ const webpack = require('webpack')
3
+ const config = require('./webpack.dev.conf')
4
+ const proxyMiddleware = require('http-proxy-middleware')
5
+
6
+ const app = express()
7
+ const compiler = webpack(config)
8
+
9
+ const server = 'http://192.168.50.67:31567/'
10
+ const local = 'http://127.0.0.1:9026/'
11
+ const proxyTable = {
12
+ '/rs/logic/exportfile': {
13
+ target: server
14
+ },
15
+ '/dataManage': {
16
+ target: server
17
+ },
18
+ '/api/af-revenue/sql/': {
19
+ pathRewrite: {
20
+ '^/api/af-revenue': '/'
21
+ },
22
+ target: local
23
+ },
24
+ '/api/af-revenue/report/': {
25
+ pathRewrite: {
26
+ '^/api/af-revenue': '/'
27
+ },
28
+ target: local
29
+ },
30
+ '/api/af-revenue/logic': {
31
+ pathRewrite: {
32
+ '^/api/af-revenue': '/'
33
+ },
34
+ target: local
35
+ },
36
+ '/api': {
37
+ target: server
38
+ },
39
+ '/rs/sql/chargeQuery_by_gasproperties': {
40
+ target: server
41
+ },
42
+ '/rs/logic/chargeQuery_by_gasproperties_line': {
43
+ target: server
44
+ },
45
+ '/files': {
46
+ target: server
47
+ },
48
+ // 查找资源服务数据
49
+ '/rs/search': {
50
+ target: server
51
+ },
52
+ // 查找资源服务数据
53
+ '/rs/logic/getLogin': {
54
+ target: server
55
+ },
56
+ // 查找资源服务数据
57
+ '/rs/logic/getInitData': {
58
+ target: server
59
+ },
60
+ '/rs/logic/getSaleInitData': {
61
+ target: server
62
+ },
63
+ // 用户登录服务地址
64
+ '/rs/user': {
65
+ target: server
66
+ },
67
+ '/rs/path/getParams': {
68
+ target: server
69
+ },
70
+ '/rs/data': {
71
+ target: server
72
+ },
73
+ '/rs/license': {
74
+ target: server
75
+ },
76
+ '/rs/db': {
77
+ target: server
78
+ },
79
+ '/excel': {
80
+ target: server
81
+ },
82
+ '/rs/config': {
83
+ target: server
84
+ },
85
+ '/rs/sql/getLicenseById': {
86
+ target: server
87
+ },
88
+ '/rs/report': {
89
+ target: server
90
+ },
91
+ '/rs/vue': {
92
+ target: server
93
+ },
94
+ '/rs/file': {
95
+ target: server
96
+ },
97
+ '/rs/sql/singleTable': {
98
+ target: server
99
+ },
100
+ '/rs': {
101
+ target: server
102
+ }
103
+ }
104
+
105
+ const devMiddleware = require('webpack-dev-middleware')(compiler, {
106
+ publicPath: config.output.publicPath,
107
+ stats: {
108
+ colors: true,
109
+ chunks: false
110
+ }
111
+ })
112
+
113
+ const hotMiddleware = require('webpack-hot-middleware')(compiler)
114
+ // force page reload when html-webpack-plugin template changes
115
+ compiler.plugin('compilation', function (compilation) {
116
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
117
+ hotMiddleware.publish({action: 'reload'})
118
+ cb()
119
+ })
120
+ })
121
+
122
+ // proxy api requests
123
+ Object.keys(proxyTable).forEach(function (context) {
124
+ let options = proxyTable[context]
125
+ if (typeof options === 'string') {
126
+ options = {target: options}
127
+ }
128
+ app.use(proxyMiddleware(context, options))
129
+ })
130
+
131
+ app.use(require('connect-history-api-fallback')())
132
+
133
+ app.use(devMiddleware)
134
+
135
+ app.use(hotMiddleware)
136
+
137
+ app.use('/static', express.static('./static'))
138
+
139
+ module.exports = app.listen(8015, function (err) {
140
+ if (err) {
141
+ console.log(err)
142
+ return
143
+ }
144
+ console.log('Listening at http://localhost:8015')
145
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.1.88-linshi-dexin",
3
+ "version": "4.1.89",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -0,0 +1,200 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="col-sm-2 form-group" >
8
+ <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
10
+ v-model="model.startDate"
11
+ :value.sync="model.startDate"
12
+ :disabled-days-of-Week="[]"
13
+ :format="'yyyy-MM-dd'"
14
+ :show-reset-button="reset">
15
+ </datepicker>
16
+ </div>
17
+ <div class="col-sm-2 form-group" >
18
+ <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
20
+ v-model="model.endDate"
21
+ :value.sync="model.endDate"
22
+ :disabled-days-of-Week="[]"
23
+ :format="'yyyy-MM-dd'"
24
+ :show-reset-button="reset">
25
+ </datepicker>
26
+ </div>
27
+ <div class="col-sm-2 form-group">
28
+ <label class="font_normal_body">用户类型</label>
29
+ <v-select :value.sync="model.f_user_type"
30
+ v-model="model.f_user_type"
31
+ multiple
32
+ :options='$parent.$parent.user_type' placeholder='请选择'
33
+ condition="f_user_type in {}"
34
+ close-on-select></v-select>
35
+ </div>
36
+ <div class="col-sm-2 form-group">
37
+ <label class="font_normal_body">用气性质</label>
38
+ <v-select :value.sync="model.f_gasproperties"
39
+ v-model="model.f_gasproperties"
40
+ multiple
41
+ :options='$parent.$parent.gasproperties' placeholder='请选择'
42
+ condition="f_gasproperties in {}"
43
+ close-on-select></v-select>
44
+ </div>
45
+ <res-select-group :show-component="$parent.$parent.resshow"
46
+ :selectin="true" :initres="$parent.$parent.initres"
47
+ :cascade =true @re-res="$parent.$parent.getRes"
48
+ v-ref:sel>
49
+ </res-select-group>
50
+ </div>
51
+ <div class="span" style = "float:right;">
52
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
53
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
54
+ <report-excel id='gasprice'></report-excel>
55
+ </div>
56
+ </div>
57
+ </criteria>
58
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
59
+ <table class='tableprint' style="margin: 0px auto">
60
+ <thead>
61
+ <tr>
62
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
63
+ <h3 style="text-align: center">易家家报账单</h3>
64
+ </th>
65
+ </tr>
66
+ <tr>
67
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
68
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
69
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;<br/>
70
+ <!--收费员:{{// $parent.operatorname}}-->
71
+ </th>
72
+ </tr>
73
+ <tr >
74
+ <th v-if="false" :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
75
+ <div>
76
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司:{{$parent.orgname}}</span>
77
+ <span v-show="$parent.depname"> 部门:{{$parent.depname}}</span>
78
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员:{{$parent.operatorname}}</span>
79
+ </div>
80
+ </th>
81
+ </tr>
82
+ </thead>
83
+ <tr>
84
+ <td :colspan='$parent.spans' class="noborder">
85
+ {{{ model.data.substring(26,model.data.length-8) }}}
86
+ </td>
87
+ </tr>
88
+ <tfoot>
89
+ <tr style="text-align: left">
90
+ <th :colspan='Math.floor($parent.spans/3)'>报账人:</th>
91
+ <th :colspan='Math.floor($parent.spans/3)'>数据审核:</th>
92
+ <th :colspan='Math.floor($parent.spans/3)'>接收人:</th>
93
+ </tr>
94
+ </tfoot>
95
+ </table>
96
+ {{{ $parent.reportStr}}}
97
+ </div>
98
+ </criteria-paged>
99
+ </div>
100
+ </template>
101
+
102
+ <script>
103
+ import { DataModel } from 'vue-client'
104
+ import co from 'co'
105
+ export default {
106
+ title: '易家家报账单',
107
+ props: ['data'],
108
+ data () {
109
+ return {
110
+ printTime: this.$login.toStandardTimeString(),
111
+ depresid: [],
112
+ userresid: [],
113
+ f_orgid: this.$login.f.orgid,
114
+ f_depid: this.$login.f.depids,
115
+ // f_operatorid: this.$login.f.id,
116
+ operatorid: [],
117
+ depid: [],
118
+ orgname: '',
119
+ depname: '',
120
+ criteriaShow: false,
121
+ operatorname: '',
122
+ orgCondtionStr: '1=1',
123
+ f_user_type: '',
124
+ f_gasproperties: '',
125
+ f_state: ['有效'],
126
+ model: new DataModel('api/af-revenue/report/rh_yjj_charge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
127
+ f_orgid: 'this.model.f_orgid'}),
128
+ reportStr: null,
129
+ resshow: ['company', 'department', 'operator'],
130
+ spans: 0,
131
+ initres: {
132
+ org: [this.$login.f.orgid],
133
+ dep: [],
134
+ user: []
135
+ }
136
+ }
137
+ },
138
+ ready () {
139
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
140
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
141
+ },
142
+ methods: {
143
+ searchData () {
144
+ this.$refs.paged.$refs.criteria.search()
145
+ },
146
+ selfSearch (args) {
147
+ this.printTime = this.$login.toStandardTimeString()
148
+ let orgcondition = args.condition
149
+ let orgstr = this.orgCondtionStr
150
+ orgcondition = orgcondition + orgstr
151
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
152
+ this.$refs.paged.search(args)
153
+ },
154
+
155
+ hidden () {
156
+ this.criteriaShow = !this.criteriaShow
157
+ },
158
+ getRes (condition, obj) {
159
+ this.orgCondtionStr = condition
160
+ this.orgname = obj.orgnames[0]
161
+ this.depname = obj.depnames[0]
162
+ this.operatorname = obj.operatornames[0]
163
+ },
164
+ getdep (obj, val) {
165
+ this.depname = val[0]
166
+ this.userresid = obj
167
+ this.f_depid = obj
168
+ },
169
+ getuser ( obj, val) {
170
+ this.operatorname = val[0]
171
+ this.f_operatorid = obj
172
+ }
173
+ },
174
+ watch: {
175
+ 'model.data' (val) {
176
+ let len=0
177
+ let a=val.split('</tr>')
178
+ for(let i=0;i<a.length;i++){
179
+ if(a[i].split('</td>').length-1>len){
180
+ len=a[i].split('</td>').length-1
181
+ }
182
+ }
183
+ this.spans = len
184
+ }
185
+ },
186
+ computed: {
187
+ user_type () {
188
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
189
+ },
190
+ gasproperties () {
191
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
192
+ }
193
+ }
194
+ }
195
+ </script>
196
+ <style scoped>
197
+ .noborder{
198
+ border: none;
199
+ }
200
+ </style>