manage-client 1.22.43-ca → 1.22.45-ca

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,102 +1,102 @@
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
- var bendi = 'http://127.0.0.1:8081/', changan = 'http://192.168.2.84:7003/'
12
- var proxyTable = {
13
- // 查找资源服务数据
14
- '/rs/sql/manageSingleTable': {
15
- target:changan
16
- },
17
- '/rs/sql/AbndonQuery': {
18
- target:'http://127.0.0.1:8081/'
19
- },
20
- '/rs/search': {
21
- target: changan
22
- },
23
- '/rs/logic/getLogin': {
24
- target: changan
25
- },
26
- '/rs/logic/getInitData': {
27
- target: changan
28
- },
29
- '/rs/logic/getSaleInitData': {
30
- target: changan
31
- },
32
- // 用户登录服务地址
33
- '/rs/user': {
34
- target: changan
35
- },
36
- '/rs/data': {
37
- target: changan
38
- },
39
- '/rs/license': {
40
- target: changan
41
- },
42
- '/xyhf/rs/xyhf': {
43
- target: changan
44
- },
45
- '/rs/sql': {
46
- target: changan
47
- },
48
- '/rs/logic/exportfile': {
49
- target: changan
50
- },
51
- '/rs': {
52
- //target: changan
53
- target: changan
54
- }
55
- }
56
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
57
- publicPath: config.output.publicPath,
58
- stats: {
59
- colors: true,
60
- chunks: false
61
- }
62
- })
63
-
64
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
65
- // force page reload when html-webpack-plugin template changes
66
- compiler.plugin('compilation', function (compilation) {
67
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
68
- hotMiddleware.publish({ action: 'reload' })
69
- cb()
70
- })
71
- })
72
-
73
- // proxy api requests
74
- Object.keys(proxyTable).forEach(function (context) {
75
- var options = proxyTable[context]
76
- if (typeof options === 'string') {
77
- options = { target: options }
78
- }
79
- app.use(proxyMiddleware(context, options))
80
- })
81
-
82
- // handle fallback for HTML5 history API
83
- app.use(require('connect-history-api-fallback')())
84
-
85
- // serve webpack bundle output
86
- app.use(devMiddleware)
87
-
88
- // enable hot-reload and state-preserving
89
- // compilation error display
90
- app.use(hotMiddleware)
91
-
92
- // serve pure static assets
93
- app.use('/static', express.static('./static'))
94
-
95
-
96
- module.exports = app.listen(8085, function (err) {
97
- if (err) {
98
- console.log(err)
99
- return
100
- }
101
- console.log('Listening at http://localhost:8085')
102
- })
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
+ var bendi = 'http://127.0.0.1:8081/', changan = 'http://192.168.2.84:7003/'
12
+ var proxyTable = {
13
+ // 查找资源服务数据
14
+ '/rs/sql/manageSingleTable': {
15
+ target:changan
16
+ },
17
+ '/rs/sql/AbndonQuery': {
18
+ target:'http://127.0.0.1:8081/'
19
+ },
20
+ '/rs/search': {
21
+ target: changan
22
+ },
23
+ '/rs/logic/getLogin': {
24
+ target: changan
25
+ },
26
+ '/rs/logic/getInitData': {
27
+ target: changan
28
+ },
29
+ '/rs/logic/getSaleInitData': {
30
+ target: changan
31
+ },
32
+ // 用户登录服务地址
33
+ '/rs/user': {
34
+ target: changan
35
+ },
36
+ '/rs/data': {
37
+ target: changan
38
+ },
39
+ '/rs/license': {
40
+ target: changan
41
+ },
42
+ '/xyhf/rs/xyhf': {
43
+ target: changan
44
+ },
45
+ '/rs/sql': {
46
+ target: changan
47
+ },
48
+ '/rs/logic/exportfile': {
49
+ target: changan
50
+ },
51
+ '/rs': {
52
+ //target: changan
53
+ target: changan
54
+ }
55
+ }
56
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
57
+ publicPath: config.output.publicPath,
58
+ stats: {
59
+ colors: true,
60
+ chunks: false
61
+ }
62
+ })
63
+
64
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
65
+ // force page reload when html-webpack-plugin template changes
66
+ compiler.plugin('compilation', function (compilation) {
67
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
68
+ hotMiddleware.publish({ action: 'reload' })
69
+ cb()
70
+ })
71
+ })
72
+
73
+ // proxy api requests
74
+ Object.keys(proxyTable).forEach(function (context) {
75
+ var options = proxyTable[context]
76
+ if (typeof options === 'string') {
77
+ options = { target: options }
78
+ }
79
+ app.use(proxyMiddleware(context, options))
80
+ })
81
+
82
+ // handle fallback for HTML5 history API
83
+ app.use(require('connect-history-api-fallback')())
84
+
85
+ // serve webpack bundle output
86
+ app.use(devMiddleware)
87
+
88
+ // enable hot-reload and state-preserving
89
+ // compilation error display
90
+ app.use(hotMiddleware)
91
+
92
+ // serve pure static assets
93
+ app.use('/static', express.static('./static'))
94
+
95
+
96
+ module.exports = app.listen(8085, function (err) {
97
+ if (err) {
98
+ console.log(err)
99
+ return
100
+ }
101
+ console.log('Listening at http://localhost:8085')
102
+ })
package/client.iml CHANGED
@@ -1,15 +1,15 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <module type="JAVA_MODULE" version="4">
3
- <component name="EclipseModuleManager">
4
- <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
5
- <src_description expected_position="0" />
6
- </component>
7
- <component name="NewModuleRootManager">
8
- <output url="file://$MODULE_DIR$/bin" />
9
- <exclude-output />
10
- <content url="file://$MODULE_DIR$" />
11
- <orderEntry type="sourceFolder" forTests="false" />
12
- <orderEntry type="inheritedJdk" />
13
- <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
14
- </component>
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <module type="JAVA_MODULE" version="4">
3
+ <component name="EclipseModuleManager">
4
+ <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
5
+ <src_description expected_position="0" />
6
+ </component>
7
+ <component name="NewModuleRootManager">
8
+ <output url="file://$MODULE_DIR$/bin" />
9
+ <exclude-output />
10
+ <content url="file://$MODULE_DIR$" />
11
+ <orderEntry type="sourceFolder" forTests="false" />
12
+ <orderEntry type="inheritedJdk" />
13
+ <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
14
+ </component>
15
15
  </module>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "1.22.43-ca",
3
+ "version": "1.22.45-ca",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -1,140 +1,140 @@
1
- <template >
2
- <div id="stand-work-list" class="flex bg-white p-10">
3
- <div class="height:auto">
4
- <criteria-paged :model="model" v-ref:paged >
5
- <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search'>
6
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
- <div class="row" width="100%">
8
- <div class="col-sm-4" >
9
- <label class="font_normal_body" >&nbsp;开始时间</label>
10
- <datepicker placeholder="起始时间" style="width:60%"
11
- :value.sync="model.f_start_date"
12
- v-model="model.f_start_date"
13
- :format="'yyyy-MM-dd'"
14
- condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')"
15
- ></datepicker>
16
- </div>
17
- <div class="col-sm-4" >
18
- <label class="font_normal_body" >结束时间</label>
19
- <datepicker placeholder="结束时间" style="width:60%"
20
- :value.sync="model.f_end_date"
21
- v-model="model.f_end_date"
22
- :format="'yyyy-MM-dd'"
23
- condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
24
- ></datepicker>
25
- </div>
26
- <div class="col-sm-4" >
27
- <label class="font_normal_body" >状态</label>
28
- <v-select :value.sync="model.f_state"
29
- v-model="model.f_state"
30
- style="width:60%"
31
- :options='$parent.$parent.charge_state' placeholder='请选择'
32
- condition="f_state = '{}'"
33
- close-on-select></v-select>
34
- </div>
35
- <div class="span" style="float:right;">
36
- <button class="btn btn-success" @click="search()" v-el:cba>查询</button>
37
- </div>
38
- </div>
39
- </div>
40
- </criteria>
41
- <data-grid :model="model" partial='list' v-ref:grid>
42
- <template partial='head'>
43
- <tr>
44
- <th><nobr>换表类型</nobr></th>
45
- <th><nobr>换表费</nobr></th>
46
- <th><nobr>旧表底数</nobr></th>
47
- <th><nobr>新表底数</nobr></th>
48
- <th><nobr>旧卡号</nobr></th>
49
- <th><nobr>新卡号</nobr></th>
50
- <th><nobr>换表日期</nobr></th>
51
- <th><nobr>操作日期</nobr></th>
52
- <th><nobr>查看</nobr></th>
53
- </tr>
54
- </template>
55
- <template partial='body' partial='list' v-ref:grid>
56
- <tr >
57
- <td style="text-align: center;"><nobr>{{row.f_type}}</nobr></td>
58
- <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
59
- <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
60
- <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
61
- <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
62
- <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
63
- <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
64
- <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
65
- <td style="text-align: center;"><button type="button" class="btn btn-link" v-if="row.f_pay_person" @click ="$parent.$parent.$parent.showImg(row)">查看</button></td>
66
- </tr>
67
- </template>
68
- <template partial='foot'></template>
69
- </data-grid>
70
- </criteria-paged>
71
- </div>
72
- <modal :show.sync="show" title="照片查看" v-ref:modal large backdrop="false">
73
- <div slot="title">
74
- {{ "查询换表图片" }}
75
- </div>
76
- <article slot="modal-body" class="modal-body" style="height:80vh">
77
- <div class="col-sm-4" style="height:auto;padding:10px" v-for="row in imgs">
78
- <img-self :src="'/RestWork/rs/file/getfile/'+row.url" width="100%" height="100%"></img-self>
79
- </div>
80
- </article>
81
- <footer slot="modal-footer" style="display: none">
82
- </footer>
83
- </modal>
84
- </div>
85
- </template>
86
-
87
- <script>
88
- import {PagedList} from 'vue-client'
89
-
90
- export default {
91
- title: '收费',
92
- data () {
93
- return {
94
- condition: '1=1',
95
- imgs:[],
96
- model: new PagedList('rs/sql/changeMeterQuery', 15),
97
- charge_state: this.$appdata.getParam('收费状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('收费状态')] : [],
98
- row: null,
99
- isdeal: true,
100
- show: false
101
- }
102
- },
103
- props:
104
- {
105
- searchdata:{},
106
- isdeal: {},
107
- args:{}
108
- },
109
- ready () {
110
- this.$refs.paged.$refs.criteria.model.f_state = ['有效']
111
- this.$refs.paged.$refs.criteria.search()
112
- },
113
- methods: {
114
- showImg(row){
115
- this.show = true
116
- this.imgs = JSON.parse(row.f_pay_person)
117
- },
118
- search(args){
119
- if(this.args && this.args.model) {
120
- this.condition=this.condition+` and f_state='有效' `
121
- if(this.searchdata.f_user_id) {
122
- this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.searchdata.f_user_id}'`
123
- } else if(this.searchdata.f_card_id){
124
- this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_card_id = '${this.searchdata.f_card_id}'`
125
- }else if(this.searchdata.f_userinfo_id) {
126
- this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userinfo_id = '${this.searchdata.f_userinfo_id}'`
127
- }else {
128
- return
129
- }
130
- this.model.search(this.condition, this.args.model)
131
- }
132
- }
133
- },
134
- watch:{
135
- args(val){
136
- this.search()
137
- }
138
- }
139
- }
140
- </script>
1
+ <template >
2
+ <div id="stand-work-list" class="flex bg-white p-10">
3
+ <div class="height:auto">
4
+ <criteria-paged :model="model" v-ref:paged >
5
+ <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search'>
6
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
+ <div class="row" width="100%">
8
+ <div class="col-sm-4" >
9
+ <label class="font_normal_body" >&nbsp;开始时间</label>
10
+ <datepicker placeholder="起始时间" style="width:60%"
11
+ :value.sync="model.f_start_date"
12
+ v-model="model.f_start_date"
13
+ :format="'yyyy-MM-dd'"
14
+ condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')"
15
+ ></datepicker>
16
+ </div>
17
+ <div class="col-sm-4" >
18
+ <label class="font_normal_body" >结束时间</label>
19
+ <datepicker placeholder="结束时间" style="width:60%"
20
+ :value.sync="model.f_end_date"
21
+ v-model="model.f_end_date"
22
+ :format="'yyyy-MM-dd'"
23
+ condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
24
+ ></datepicker>
25
+ </div>
26
+ <div class="col-sm-4" >
27
+ <label class="font_normal_body" >状态</label>
28
+ <v-select :value.sync="model.f_state"
29
+ v-model="model.f_state"
30
+ style="width:60%"
31
+ :options='$parent.$parent.charge_state' placeholder='请选择'
32
+ condition="f_state = '{}'"
33
+ close-on-select></v-select>
34
+ </div>
35
+ <div class="span" style="float:right;">
36
+ <button class="btn btn-success" @click="search()" v-el:cba>查询</button>
37
+ </div>
38
+ </div>
39
+ </div>
40
+ </criteria>
41
+ <data-grid :model="model" partial='list' v-ref:grid>
42
+ <template partial='head'>
43
+ <tr>
44
+ <th><nobr>换表类型</nobr></th>
45
+ <th><nobr>换表费</nobr></th>
46
+ <th><nobr>旧表底数</nobr></th>
47
+ <th><nobr>新表底数</nobr></th>
48
+ <th><nobr>旧卡号</nobr></th>
49
+ <th><nobr>新卡号</nobr></th>
50
+ <th><nobr>换表日期</nobr></th>
51
+ <th><nobr>操作日期</nobr></th>
52
+ <th><nobr>查看</nobr></th>
53
+ </tr>
54
+ </template>
55
+ <template partial='body' partial='list' v-ref:grid>
56
+ <tr >
57
+ <td style="text-align: center;"><nobr>{{row.f_type}}</nobr></td>
58
+ <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
59
+ <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
60
+ <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
61
+ <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
62
+ <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
63
+ <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
64
+ <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
65
+ <td style="text-align: center;"><button type="button" class="btn btn-link" v-if="row.f_pay_person" @click ="$parent.$parent.$parent.showImg(row)">查看</button></td>
66
+ </tr>
67
+ </template>
68
+ <template partial='foot'></template>
69
+ </data-grid>
70
+ </criteria-paged>
71
+ </div>
72
+ <modal :show.sync="show" title="照片查看" v-ref:modal large backdrop="false">
73
+ <div slot="title">
74
+ {{ "查询换表图片" }}
75
+ </div>
76
+ <article slot="modal-body" class="modal-body" style="height:80vh">
77
+ <div class="col-sm-4" style="height:auto;padding:10px" v-for="row in imgs">
78
+ <img-self :src="'/RestWork/rs/file/getfile/'+row.url" width="100%" height="100%"></img-self>
79
+ </div>
80
+ </article>
81
+ <footer slot="modal-footer" style="display: none">
82
+ </footer>
83
+ </modal>
84
+ </div>
85
+ </template>
86
+
87
+ <script>
88
+ import {PagedList} from 'vue-client'
89
+
90
+ export default {
91
+ title: '收费',
92
+ data () {
93
+ return {
94
+ condition: '1=1',
95
+ imgs:[],
96
+ model: new PagedList('rs/sql/changeMeterQuery', 15),
97
+ charge_state: this.$appdata.getParam('收费状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('收费状态')] : [],
98
+ row: null,
99
+ isdeal: true,
100
+ show: false
101
+ }
102
+ },
103
+ props:
104
+ {
105
+ searchdata:{},
106
+ isdeal: {},
107
+ args:{}
108
+ },
109
+ ready () {
110
+ this.$refs.paged.$refs.criteria.model.f_state = ['有效']
111
+ this.$refs.paged.$refs.criteria.search()
112
+ },
113
+ methods: {
114
+ showImg(row){
115
+ this.show = true
116
+ this.imgs = JSON.parse(row.f_pay_person)
117
+ },
118
+ search(args){
119
+ if(this.args && this.args.model) {
120
+ this.condition=this.condition+` and f_state='有效' `
121
+ if(this.searchdata.f_user_id) {
122
+ this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.searchdata.f_user_id}'`
123
+ } else if(this.searchdata.f_card_id){
124
+ this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_card_id = '${this.searchdata.f_card_id}'`
125
+ }else if(this.searchdata.f_userinfo_id) {
126
+ this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userinfo_id = '${this.searchdata.f_userinfo_id}'`
127
+ }else {
128
+ return
129
+ }
130
+ this.model.search(this.condition, this.args.model)
131
+ }
132
+ }
133
+ },
134
+ watch:{
135
+ args(val){
136
+ this.search()
137
+ }
138
+ }
139
+ }
140
+ </script>