manage-client 3.2.117 → 3.2.118

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 (3) hide show
  1. package/build/dev-server.js +176 -176
  2. package/package.json +1 -1
  3. package/src/components/SellReport/ManageBusSummary.vue +75 -59
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 = 'http://203.57.101.233:9001'
17
- // var bendi = 'http://172.168.1.11:9001'
18
- var fuwu = 'http://192.168.50.4: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: bendi
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://127.0.0.1:8090'
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: bendi
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.117",
3
+ "version": "3.2.118",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/SellReport/ManageBusSummary.vue CHANGED
@@ -1,7 +1,7 @@
1
1
  <template>
2
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>
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
6
  <div class="row">
7
7
  <div class="col-sm-2 form-group" >
@@ -59,59 +59,67 @@
59
59
  </div>
60
60
  <div class="row" v-show="$parent.$parent.criteriaShow">
61
61
  <div class="col-sm-2 form-group">
62
- <label class="font_normal_body">收费状态</label>
63
- <v-select :value.sync="$parent.$parent.f_state" multiple
64
- v-model="$parent.$parent.f_state"
65
- :options='$parent.$parent.charge_state' placeholder='请选择'
66
- condition="f_state in {}"
62
+ <label class="font_normal_body">用户类型</label>
63
+ <v-select :value.sync="$parent.$parent.f_user_type"
64
+ v-model="$parent.$parent.f_user_type"
65
+ :options='$parent.$parent.user_type' placeholder='请选择'
66
+ condition="f_user_type = '{}'"
67
67
  close-on-select></v-select>
68
68
  </div>
69
+ <!--<div class="col-sm-2 form-group">-->
70
+ <!--<label class="font_normal_body">收费状态</label>-->
71
+ <!--<v-select :value.sync="$parent.$parent.f_state" multiple-->
72
+ <!--v-model="$parent.$parent.f_state"-->
73
+ <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
74
+ <!--condition="f_state in {}"-->
75
+ <!--close-on-select></v-select>-->
76
+ <!--</div>-->
69
77
  </div>
70
78
  </div>
71
- </criteria>
72
- <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
73
- <table class='tableprint' style="margin: 0px auto">
74
- <thead>
75
- <tr>
76
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
77
- <h3 style="text-align: center">收费结账报表</h3>
78
- </th>
79
- </tr>
80
- <tr>
81
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
82
- 开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
83
- 结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
84
- <!--打印时间：{{{$parent.printTime}}}-->
85
- 打印时间：{{$parent.printTime}}
86
- <!--收费员：{{// $parent.operatorname}}-->
87
- </th>
88
- </tr>
89
- <tr>
90
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
91
- <div>
92
- <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
93
- <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
94
- <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
95
- </div>
96
- </th>
97
- </tr>
98
- </thead>
99
- <tr>
100
- <td :colspan='$parent.spans' class="noborder">
101
- {{{ model.data.substring(26,model.data.length-8) }}}
102
- </td>
103
- </tr>
104
- <tfoot>
105
- <tr style="text-align: left">
106
- <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
107
- <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
108
- <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
109
- </tr>
110
- </tfoot>
111
- </table>
112
- {{{ $parent.reportStr}}}
113
- </div>
114
- </criteria-paged>
79
+ </criteria>
80
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
81
+ <table class='tableprint' style="margin: 0px auto">
82
+ <thead>
83
+ <tr>
84
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
85
+ <h3 style="text-align: center">收费结账报表</h3>
86
+ </th>
87
+ </tr>
88
+ <tr>
89
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
90
+ 开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
91
+ 结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
92
+ <!--打印时间：{{{$parent.printTime}}}-->
93
+ 打印时间：{{$parent.printTime}}
94
+ <!--收费员：{{// $parent.operatorname}}-->
95
+ </th>
96
+ </tr>
97
+ <tr>
98
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
99
+ <div>
100
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
101
+ <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
102
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
103
+ </div>
104
+ </th>
105
+ </tr>
106
+ </thead>
107
+ <tr>
108
+ <td :colspan='$parent.spans' class="noborder">
109
+ {{{ model.data.substring(26,model.data.length-8) }}}
110
+ </td>
111
+ </tr>
112
+ <tfoot>
113
+ <tr style="text-align: left">
114
+ <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
115
+ <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
116
+ <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
117
+ </tr>
118
+ </tfoot>
119
+ </table>
120
+ {{{ $parent.reportStr}}}
121
+ </div>
122
+ </criteria-paged>
115
123
  </div>
116
124
  </template>
117
125
 
@@ -137,6 +145,7 @@
137
145
  criteriaShow: false,
138
146
  operatorname: '',
139
147
  orgCondtionStr: '1=1',
148
+ f_user_type: '',
140
149
  f_state:['有效'],
141
150
  model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
142
151
  f_orgid: 'this.model.f_orgid'}),
@@ -164,15 +173,19 @@
164
173
  let orgcondition = '1=1'
165
174
  let orgstr = this.orgCondtionStr
166
175
  orgcondition = orgcondition + orgstr
167
- /* if (this.f_orgid && this.f_orgid[0]) {
168
- orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
169
- }
170
- if (this.f_depid && this.f_depid[0]) {
171
- orgcondition += ' and f_depid in (' + this.f_depid + ')'
176
+ console.log('23231312321:',this.f_user_type)
177
+ if(this.f_user_type && this.f_user_type[0]) {
178
+ orgcondition += ` and f_user_type = '${ this.f_user_type} '`
172
179
  }
173
- if(this.f_operatorid && this.f_operatorid[0]) {
174
- orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
175
- }*/
180
+ /* if (this.f_orgid && this.f_orgid[0]) {
181
+ orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
182
+ }
183
+ if (this.f_depid && this.f_depid[0]) {
184
+ orgcondition += ' and f_depid in (' + this.f_depid + ')'
185
+ }
186
+ if(this.f_operatorid && this.f_operatorid[0]) {
187
+ orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
188
+ }*/
176
189
  this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
177
190
  this.$refs.paged.search(args)
178
191
  },
@@ -210,6 +223,9 @@
210
223
  computed: {
211
224
  charge_state() {
212
225
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
226
+ },
227
+ user_type () {
228
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
213
229
  }
214
230
  }
215
231
  }