manage-client 1.22.41-ca → 1.22.42-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.
- package/build/dev-server.js +3 -3
- package/client.iml +14 -14
- package/package.json +1 -1
- package/src/App.vue +28 -28
- package/src/components/MeterManage/ChangeMeterQuery.vue +140 -140
- package/src/components/MeterManage/MeterMsg.vue +390 -390
- package/src/components/sale/businessquery/FillGasQuery.vue +311 -311
- package/src/components/sale/businessquery/SellgasQuerybyDep.vue +187 -187
- package/src/components/sale/businessquery/SellgasQuerybySpot.vue +192 -192
- package/src/components/webmeter/newwebmeter/UserGasList.vue +319 -311
package/build/dev-server.js
CHANGED
|
@@ -8,7 +8,7 @@ var app = express()
|
|
|
8
8
|
var compiler = webpack(config)
|
|
9
9
|
// var proxy = httpProxy.createProxyServer()
|
|
10
10
|
|
|
11
|
-
var bendi = 'http://
|
|
11
|
+
var bendi = 'http://127.0.0.1:8081/', changan = 'http://192.168.2.84:7003/'
|
|
12
12
|
var proxyTable = {
|
|
13
13
|
// 查找资源服务数据
|
|
14
14
|
'/rs/sql/manageSingleTable': {
|
|
@@ -43,10 +43,10 @@ var proxyTable = {
|
|
|
43
43
|
target: changan
|
|
44
44
|
},
|
|
45
45
|
'/rs/sql': {
|
|
46
|
-
target:
|
|
46
|
+
target: changan
|
|
47
47
|
},
|
|
48
48
|
'/rs/logic/exportfile': {
|
|
49
|
-
target:
|
|
49
|
+
target: changan
|
|
50
50
|
},
|
|
51
51
|
'/rs': {
|
|
52
52
|
//target: changan
|
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
package/src/App.vue
CHANGED
|
@@ -1,28 +1,28 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div>
|
|
3
|
-
<app-base class="bg">
|
|
4
|
-
<div class='flex'>
|
|
5
|
-
<article>
|
|
6
|
-
<!--<route :comp="{name: 'manage-home'}"></route>-->
|
|
7
|
-
<!--<route :comp="{name: 'meter-reading'}"></route>-->
|
|
8
|
-
<!--<route :comp="{name: 'Gasproperties'}"></route>-->
|
|
9
|
-
<!--<route :comp="{name: 'vender-management'}"></route>-->
|
|
10
|
-
<!--<route :comp="{name: 'malfunction-home'}"></route>-->
|
|
11
|
-
<route :comp="{name: 'login'}"></route>
|
|
12
|
-
<!-- <route :comp="{name: 'load-data'}"></route> -->
|
|
13
|
-
<!-- <route :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
|
|
14
|
-
<!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
|
|
15
|
-
</article>
|
|
16
|
-
</div>
|
|
17
|
-
</app-base>
|
|
18
|
-
</div>
|
|
19
|
-
</template>
|
|
20
|
-
|
|
21
|
-
<script>
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
export default {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
</script>
|
|
1
|
+
<template>
|
|
2
|
+
<div>
|
|
3
|
+
<app-base class="bg">
|
|
4
|
+
<div class='flex'>
|
|
5
|
+
<article>
|
|
6
|
+
<!--<route :comp="{name: 'manage-home'}"></route>-->
|
|
7
|
+
<!--<route :comp="{name: 'meter-reading'}"></route>-->
|
|
8
|
+
<!--<route :comp="{name: 'Gasproperties'}"></route>-->
|
|
9
|
+
<!--<route :comp="{name: 'vender-management'}"></route>-->
|
|
10
|
+
<!--<route :comp="{name: 'malfunction-home'}"></route>-->
|
|
11
|
+
<route :comp="{name: 'login'}"></route>
|
|
12
|
+
<!-- <route :comp="{name: 'load-data'}"></route> -->
|
|
13
|
+
<!-- <route :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
|
|
14
|
+
<!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
|
|
15
|
+
</article>
|
|
16
|
+
</div>
|
|
17
|
+
</app-base>
|
|
18
|
+
</div>
|
|
19
|
+
</template>
|
|
20
|
+
|
|
21
|
+
<script>
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
export default {
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
}
|
|
28
|
+
</script>
|
|
@@ -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" > 开始时间</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" > 开始时间</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>
|