manage-client 4.0.83 → 4.0.84
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 +6 -17
- package/package.json +1 -1
- package/src/filiale/gehua/GasStatistics.vue +21 -21
- package/src/filiale/qingtongxia/NewWebMeterHandPlan.vue +3 -3
- package/src/filiale/rongcheng/RecordInfoQuery.vue +13 -0
- package/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
- package/.gradle/file-system.probe +0 -0
package/build/dev-server.js
CHANGED
|
@@ -19,9 +19,9 @@ var qtx = 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:9001/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
22
|
+
var bendi = 'http://203.57.101.233:9001/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://203.57.101.233:9001/'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
@@ -33,26 +33,15 @@ var proxyTable = {
|
|
|
33
33
|
target: 'http://203.57.101.233:9001/'
|
|
34
34
|
|
|
35
35
|
},
|
|
36
|
-
'/api/af-revenue/
|
|
36
|
+
'/api/af-revenue/sql/compreQuery': {
|
|
37
37
|
pathRewrite: {
|
|
38
|
-
'
|
|
39
|
-
},
|
|
40
|
-
target: 'http://127.0.0.1:9026/'
|
|
41
|
-
},
|
|
42
|
-
'/api/af-revenue/sql': {
|
|
43
|
-
pathRewrite: {
|
|
44
|
-
'/api/af-revenue/sql': '/sql'
|
|
45
|
-
},
|
|
46
|
-
target: 'http://127.0.0.1:9026/'
|
|
47
|
-
},
|
|
48
|
-
'/api/af-revenue/logic': {
|
|
49
|
-
pathRewrite: {
|
|
50
|
-
'/api/af-revenue/logic': '/logic'
|
|
38
|
+
'^/api/af-revenue': '/'
|
|
51
39
|
},
|
|
52
40
|
target: 'http://127.0.0.1:9026/'
|
|
53
41
|
},
|
|
54
42
|
'/api': {
|
|
55
|
-
target: 'http://192.168.50.67:
|
|
43
|
+
target: 'http://192.168.50.67:31567/'
|
|
44
|
+
|
|
56
45
|
},
|
|
57
46
|
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
58
47
|
target: 'http://localhost:8084/'
|
package/package.json
CHANGED
|
@@ -18,18 +18,18 @@
|
|
|
18
18
|
<div class="col-sm-2">
|
|
19
19
|
<label class="font_normal_body">客户编号</label>
|
|
20
20
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
21
|
-
condition="
|
|
21
|
+
condition="f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
|
|
22
22
|
>
|
|
23
23
|
</div>
|
|
24
24
|
<div class="col-sm-2">
|
|
25
25
|
<label class="font_normal_body">客户名称</label>
|
|
26
26
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
|
|
27
|
-
condition="
|
|
27
|
+
condition="f_user_name = '{}'" v-next-el='userid' v-el:username>
|
|
28
28
|
</div>
|
|
29
29
|
<div class="col-sm-2">
|
|
30
30
|
<label class="font_normal_body">客户地址</label>
|
|
31
31
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
|
|
32
|
-
condition="
|
|
32
|
+
condition="f_address like '%{}%'" v-next-el='f_address' v-el:f_address>
|
|
33
33
|
</div>
|
|
34
34
|
|
|
35
35
|
<div class="col-sm-2 form-group">
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
<div class="col-sm-2">
|
|
59
59
|
<label class="font_normal_body">电 话</label>
|
|
60
60
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_user_phone" placeholder='电话'
|
|
61
|
-
condition="
|
|
61
|
+
condition="f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
|
|
62
62
|
>
|
|
63
63
|
</div>
|
|
64
64
|
<div class="col-sm-2">
|
|
65
65
|
<label class="font_normal_body">小 区</label>
|
|
66
66
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
|
|
67
|
-
condition="
|
|
67
|
+
condition="f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_residential_area>
|
|
68
68
|
</div>
|
|
69
69
|
<div class="col-sm-2 form-group">
|
|
70
70
|
<label class="font_normal_body">片区</label>
|
|
@@ -77,13 +77,13 @@
|
|
|
77
77
|
<div class="col-sm-2">
|
|
78
78
|
<label class="font_normal_body">表 号</label>
|
|
79
79
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
|
|
80
|
-
condition="
|
|
80
|
+
condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
|
|
81
81
|
>
|
|
82
82
|
</div>
|
|
83
83
|
<div class="col-sm-2">
|
|
84
84
|
<label class="font_normal_body">燃气证号</label>
|
|
85
85
|
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_gascode" placeholder='燃气证号'
|
|
86
|
-
condition="
|
|
86
|
+
condition="f_gascode like '%{}%'" v-next-el='f_gascode' v-el:f_gascode
|
|
87
87
|
>
|
|
88
88
|
</div>
|
|
89
89
|
<div class="col-sm-2 form-group">
|
|
@@ -98,7 +98,7 @@
|
|
|
98
98
|
<v-select :value.sync="model.f_price_name"
|
|
99
99
|
v-model="model.f_price_name"
|
|
100
100
|
:options="$parent.$parent.getPricenames"
|
|
101
|
-
condition="
|
|
101
|
+
condition="f_price_name = '{}'"
|
|
102
102
|
close-on-select></v-select>
|
|
103
103
|
</div>
|
|
104
104
|
<div class="col-sm-2 form-group">
|
|
@@ -106,7 +106,7 @@
|
|
|
106
106
|
<v-select :value.sync="model.f_meter_brand"
|
|
107
107
|
v-model="model.f_meter_brand"
|
|
108
108
|
:options="$parent.$parent.meterbrands"
|
|
109
|
-
condition="
|
|
109
|
+
condition="f_meter_brand = '{}'"
|
|
110
110
|
close-on-select></v-select>
|
|
111
111
|
</div>
|
|
112
112
|
<div class="col-sm-2 form-group">
|
|
@@ -114,7 +114,7 @@
|
|
|
114
114
|
<v-select :value.sync="model.f_changetable_state"
|
|
115
115
|
v-model="model.f_changetable_state"
|
|
116
116
|
:options="$parent.$parent.isChange"
|
|
117
|
-
condition="
|
|
117
|
+
condition="f_changetable_state = '{}'"
|
|
118
118
|
close-on-select></v-select>
|
|
119
119
|
</div>
|
|
120
120
|
<div class="col-sm-2 form-group">
|
|
@@ -122,27 +122,27 @@
|
|
|
122
122
|
<v-select :value.sync="model.f_gas_state"
|
|
123
123
|
v-model="model.f_gas_state"
|
|
124
124
|
:options="$parent.$parent.gasState"
|
|
125
|
-
condition="
|
|
125
|
+
condition="f_gas_state = '{}'"
|
|
126
126
|
close-on-select></v-select>
|
|
127
127
|
</div>
|
|
128
128
|
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
129
129
|
<label class="font_normal_body">用气量区间</label>
|
|
130
130
|
<div class="row">
|
|
131
131
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
|
|
132
|
-
condition="
|
|
132
|
+
condition="f_oughtamount >= {} " placeholder="">
|
|
133
133
|
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
134
134
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
|
|
135
|
-
condition="
|
|
135
|
+
condition="f_oughtamount <= {} " placeholder="">
|
|
136
136
|
</div>
|
|
137
137
|
</div>
|
|
138
138
|
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
139
139
|
<label class="font_normal_body"> 充值区间 </label>
|
|
140
140
|
<div class="row">
|
|
141
141
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_collection1"
|
|
142
|
-
condition="
|
|
142
|
+
condition="f_collection >= {} " placeholder="">
|
|
143
143
|
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
144
144
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_collection2"
|
|
145
|
-
condition="
|
|
145
|
+
condition="f_collection <= {} " placeholder="">
|
|
146
146
|
</div>
|
|
147
147
|
</div>
|
|
148
148
|
<div class="col-sm-2 form-group" >
|
|
@@ -169,10 +169,10 @@
|
|
|
169
169
|
<label class="font_normal_body">余额区间</label>
|
|
170
170
|
<div class="row">
|
|
171
171
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_sta"
|
|
172
|
-
condition="
|
|
172
|
+
condition="f_balance_amount >= {} " placeholder="">
|
|
173
173
|
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
174
174
|
<input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_end"
|
|
175
|
-
condition="
|
|
175
|
+
condition="f_balance_amount <= {} " placeholder="">
|
|
176
176
|
</div>
|
|
177
177
|
</div>
|
|
178
178
|
</div>
|
|
@@ -325,7 +325,7 @@
|
|
|
325
325
|
return {
|
|
326
326
|
show:false,
|
|
327
327
|
org:[this.$login.f.orgid],
|
|
328
|
-
orgcondition: ' and
|
|
328
|
+
orgcondition: ' and f_orgid = ' + this.$login.f.orgid,
|
|
329
329
|
//f_filialeid: this.$login.f.f_orgid,
|
|
330
330
|
detaillist: [],
|
|
331
331
|
meterbrands: [],
|
|
@@ -345,7 +345,7 @@
|
|
|
345
345
|
//默认打印列
|
|
346
346
|
defaultfield: [],
|
|
347
347
|
orgCondtionStr: '',
|
|
348
|
-
model: new PagedList('api/af-revenue/sql/
|
|
348
|
+
model: new PagedList('api/af-revenue/sql/newGasRecordQuery', 50,{
|
|
349
349
|
startDate: 'this.model.startDate',
|
|
350
350
|
endDate: 'this.model.endDate'
|
|
351
351
|
},{
|
|
@@ -417,9 +417,9 @@
|
|
|
417
417
|
},
|
|
418
418
|
getorg(obj) {
|
|
419
419
|
if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
|
|
420
|
-
this.orgcondition = " and
|
|
420
|
+
this.orgcondition = " and f_orgid in " + plugins.convertToIn(obj)
|
|
421
421
|
}else{
|
|
422
|
-
this.orgcondition = " and
|
|
422
|
+
this.orgcondition = " and f_orgid = " + this.$login.f.orgid
|
|
423
423
|
}
|
|
424
424
|
},
|
|
425
425
|
userTypeChange () {
|
|
@@ -426,6 +426,7 @@
|
|
|
426
426
|
import {PagedList} from 'vue-client'
|
|
427
427
|
import getLodop from '../../plugins/LodopFuncs'
|
|
428
428
|
import plugins from '../../plugins/GetLoginInfoService'
|
|
429
|
+
import * as Util from '../../Util'
|
|
429
430
|
|
|
430
431
|
let readyGen = async function (self) {
|
|
431
432
|
await self.$getConfig(self, 'HandManager')
|
|
@@ -501,10 +502,9 @@
|
|
|
501
502
|
ready() {
|
|
502
503
|
/*this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString() + ' 00:00:00'
|
|
503
504
|
this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString() + ' 23:59:59'*/
|
|
504
|
-
|
|
505
|
-
|
|
505
|
+
this.$refs.paged.$refs.criteria.model.startDate1 = Util.toStandardDateString() + ' 00:00:00'
|
|
506
|
+
this.$refs.paged.$refs.criteria.model.endDate1 = Util.toStandardDateString() + ' 23:59:59'
|
|
506
507
|
//初始化用户类型，用气性质，用气属性下拉框
|
|
507
|
-
this.search({'condition': '1=1'})
|
|
508
508
|
readyGen(this)
|
|
509
509
|
},
|
|
510
510
|
methods: {
|
|
@@ -321,6 +321,14 @@
|
|
|
321
321
|
close-on-select
|
|
322
322
|
style="width: 139px !important; min-width: 139px; max-width: 139px;"></v-select>
|
|
323
323
|
</div>
|
|
324
|
+
<div class="col-sm-2 form-group">
|
|
325
|
+
<label class="font_normal_body" >以表带阀</label>
|
|
326
|
+
<v-select :value.sync="model.f_devices_starp" v-model="model.f_devices_starp"
|
|
327
|
+
:options='$parent.$parent.ybdf' placeholder='请选择'
|
|
328
|
+
condition="f_devices_starp = '{}'"
|
|
329
|
+
close-on-select
|
|
330
|
+
style="width: 139px !important; min-width: 139px; max-width: 139px;"></v-select>
|
|
331
|
+
</div>
|
|
324
332
|
<div class="col-sm-2 form-group">
|
|
325
333
|
<label class="font_normal_body">使用类型</label>
|
|
326
334
|
<v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
|
|
@@ -419,6 +427,7 @@
|
|
|
419
427
|
<th><nobr>是否安装报警器</nobr></th>
|
|
420
428
|
<th><nobr>是否有切断阀</nobr></th>
|
|
421
429
|
<th><nobr>是否有自闭阀</nobr></th>
|
|
430
|
+
<th><nobr>以表带阀</nobr></th>
|
|
422
431
|
|
|
423
432
|
</tr>
|
|
424
433
|
</template>
|
|
@@ -507,6 +516,7 @@
|
|
|
507
516
|
<td style="text-align: center;"><nobr>{{row.f_has_bjq}}</nobr></td>
|
|
508
517
|
<td style="text-align: center;"><nobr>{{row.f_has_qdf}}</nobr></td>
|
|
509
518
|
<td style="text-align: center;"><nobr>{{row.f_has_zbf}}</nobr></td>
|
|
519
|
+
<td style="text-align: center;"><nobr>{{row.f_devices_starp}}</nobr></td>
|
|
510
520
|
|
|
511
521
|
</template>
|
|
512
522
|
<template partial='foot'>
|
|
@@ -818,6 +828,9 @@ export default {
|
|
|
818
828
|
zbf() {
|
|
819
829
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('自闭阀')]
|
|
820
830
|
},
|
|
831
|
+
ybdf() {
|
|
832
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('以表带阀')]
|
|
833
|
+
},
|
|
821
834
|
houseTypes() {
|
|
822
835
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
|
|
823
836
|
},
|
|
Binary file
|
|
Binary file
|