manage-client 4.1.23 → 4.1.24-yangchun
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 +8 -42
- package/package.json +1 -1
- package/src/components/sale/businessquery/CollectManage.vue +1 -1
- package/src/filiale/fugou/ReportList.vue +4 -4
- package/src/filiale/fugou/WebHandplanQuery.vue +31 -7
- package/src/filiale/yangchun/ArrearsQuery.vue +1 -1
- package/src/filiale/yangchun/FMYGasQuery.vue +1 -0
- package/src/filiale/yangchun/HandPeopleQuery.vue +1 -1
- package/src/filiale/yangchun/NewFMYGasQuery.vue +1 -0
- package/src/filiale/yangchun/OtherChargeQuery.vue +1 -1
- package/src/filiale/jinbin/exportConfig.js +0 -1110
- package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +0 -1372
- package/src/filiale/jinbin/sale.js +0 -7
package/build/dev-server.js
CHANGED
|
@@ -11,17 +11,17 @@ var compiler = webpack(config)
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
-
var shaoguan = 'http://
|
|
15
|
-
var qtx
|
|
14
|
+
var shaoguan = 'http://119.146.1.106:8300/'
|
|
15
|
+
var qtx= 'http://36.103.222.144:6300/'
|
|
16
16
|
// var bendi = 'http://220.194.141.253:8600/'
|
|
17
17
|
// var bendi = 'http://203.57.101.233:9001'
|
|
18
18
|
// var bendi = 'http://172.168.1.11:9001/'
|
|
19
|
-
// var bendi = 'http://
|
|
19
|
+
// var bendi = 'http://192.168.50.4:8400/'
|
|
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://192.168.50.67:30785/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://192.168.50.67:30785/'
|
|
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'
|
|
@@ -29,42 +29,8 @@ var proxyTable = {
|
|
|
29
29
|
'/rs/logic/exportfile': {
|
|
30
30
|
target: bendi
|
|
31
31
|
},
|
|
32
|
-
'/dataManage': {
|
|
33
|
-
target: 'http://203.57.101.233:9001/'
|
|
34
|
-
|
|
35
|
-
},
|
|
36
|
-
'/api/af-revenue/sql/WeChatPaydetail': {
|
|
37
|
-
pathRewrite: {
|
|
38
|
-
'^/api/af-revenue': '/rs'
|
|
39
|
-
},
|
|
40
|
-
target: 'http://127.0.0.1:8080/'
|
|
41
|
-
},
|
|
42
|
-
'/api/af-revenue/sql/WeChatPayment': {
|
|
43
|
-
pathRewrite: {
|
|
44
|
-
'^/api/af-revenue': '/rs'
|
|
45
|
-
},
|
|
46
|
-
target: 'http://127.0.0.1:8080/'
|
|
47
|
-
},
|
|
48
|
-
'/api/af-revenue/sql/getGasInspection': {
|
|
49
|
-
pathRewrite: {
|
|
50
|
-
'^/api/af-revenue': '/rs'
|
|
51
|
-
},
|
|
52
|
-
target: 'http://127.0.0.1:8080/'
|
|
53
|
-
},
|
|
54
|
-
'/api/af-revenue/sql/inspectList_sellinggas': {
|
|
55
|
-
pathRewrite: {
|
|
56
|
-
'^/api/af-revenue': '/rs'
|
|
57
|
-
},
|
|
58
|
-
target: 'http://127.0.0.1:8080/'
|
|
59
|
-
},
|
|
60
|
-
'/api/af-revenue/sql/inspectList': {
|
|
61
|
-
pathRewrite: {
|
|
62
|
-
'^/api/af-revenue': '/rs'
|
|
63
|
-
},
|
|
64
|
-
target: 'http://127.0.0.1:8080/'
|
|
65
|
-
},
|
|
66
32
|
'/api': {
|
|
67
|
-
target: 'http://
|
|
33
|
+
target: 'http://192.168.50.67:30785'
|
|
68
34
|
|
|
69
35
|
},
|
|
70
36
|
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
@@ -78,7 +44,7 @@ var proxyTable = {
|
|
|
78
44
|
},
|
|
79
45
|
// 查找资源服务数据
|
|
80
46
|
'/rs/search': {
|
|
81
|
-
target:
|
|
47
|
+
target: bendi
|
|
82
48
|
},
|
|
83
49
|
// 查找资源服务数据
|
|
84
50
|
'/rs/logic/getLogin': {
|
|
@@ -120,7 +86,7 @@ var proxyTable = {
|
|
|
120
86
|
target: bendi
|
|
121
87
|
},
|
|
122
88
|
'/rs/vue': {
|
|
123
|
-
target:
|
|
89
|
+
target: bendi
|
|
124
90
|
},
|
|
125
91
|
'/rs/file': {
|
|
126
92
|
target: bendi
|
package/package.json
CHANGED
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
<tabs header="用气查询" v-if="permission('用气查询')">
|
|
40
40
|
<fmygas-query v-if="show.includes('用气查询')" @deal-msg="dealMsg"></fmygas-query>
|
|
41
41
|
</tabs>
|
|
42
|
-
<tabs header="物联网用气查询" v-if="newWebHand && permission('
|
|
42
|
+
<tabs header="物联网用气查询" v-if="newWebHand && permission('物联网用气查询')">
|
|
43
43
|
<newfmygas-query v-if="show.includes('物联网用气查询')" @deal-msg="dealMsg"></newfmygas-query>
|
|
44
44
|
</tabs>
|
|
45
45
|
<tabs header="气费回收率" v-if="permission('气费回收率')">
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
close-on-select></v-select>
|
|
98
98
|
</div>
|
|
99
99
|
<div class="col-sm-2 form-group" >
|
|
100
|
-
<label class="font_normal_body"
|
|
100
|
+
<label class="font_normal_body" >抄表开始时间</label>
|
|
101
101
|
<datepicker style="width: 60%" placeholder="大于等于"
|
|
102
102
|
:value.sync="model.f_start_date"
|
|
103
103
|
v-model="model.f_start_date"
|
|
@@ -106,7 +106,7 @@
|
|
|
106
106
|
></datepicker>
|
|
107
107
|
</div>
|
|
108
108
|
<div class="col-sm-2 form-group" >
|
|
109
|
-
<label class="font_normal_body"
|
|
109
|
+
<label class="font_normal_body">抄表结束时间</label>
|
|
110
110
|
<datepicker style="width: 60%" placeholder="小于等于"
|
|
111
111
|
:value.sync="model.f_end_date"
|
|
112
112
|
v-model="model.f_end_date"
|
|
@@ -126,8 +126,8 @@
|
|
|
126
126
|
<th><nobr>客户电话</nobr></th>
|
|
127
127
|
<th><nobr>客户地址</nobr></th>
|
|
128
128
|
|
|
129
|
-
<th><nobr
|
|
130
|
-
<th><nobr
|
|
129
|
+
<th><nobr>抄表日期</nobr></th>
|
|
130
|
+
<th><nobr>录入日期</nobr></th>
|
|
131
131
|
<th><nobr>表内剩余金额</nobr></th>
|
|
132
132
|
<th><nobr>表内单价</nobr></th>
|
|
133
133
|
<th><nobr>本次抄表底数</nobr></th>
|
|
@@ -35,7 +35,6 @@
|
|
|
35
35
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
36
36
|
|
|
37
37
|
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
38
|
-
|
|
39
38
|
<div class="col-sm-2 form-group">
|
|
40
39
|
<label for="startDate" class="font_normal_body">抄表日期</label>
|
|
41
40
|
<datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
|
|
@@ -43,7 +42,7 @@
|
|
|
43
42
|
:value.sync="model.handStartDate"
|
|
44
43
|
:format="'yyyy-MM-dd 00:00:00'"
|
|
45
44
|
:show-reset-button="true"
|
|
46
|
-
condition="
|
|
45
|
+
condition="f_hand_date >= '{}'">
|
|
47
46
|
</datepicker>
|
|
48
47
|
</div>
|
|
49
48
|
<div class="col-sm-2 form-group">
|
|
@@ -53,6 +52,26 @@
|
|
|
53
52
|
:value.sync="model.handEndDate"
|
|
54
53
|
:format="'yyyy-MM-dd 23:59:59'"
|
|
55
54
|
:show-reset-button="true"
|
|
55
|
+
condition="f_hand_date <= '{}'">
|
|
56
|
+
</datepicker>
|
|
57
|
+
</div>
|
|
58
|
+
<div class="col-sm-2 form-group">
|
|
59
|
+
<label for="startDate" class="font_normal_body">录入日期</label>
|
|
60
|
+
<datepicker id="inputStartDate" placeholder="开始日期" style="width:60%"
|
|
61
|
+
v-model="model.inputStartDate"
|
|
62
|
+
:value.sync="model.inputStartDate"
|
|
63
|
+
:format="'yyyy-MM-dd 00:00:00'"
|
|
64
|
+
:show-reset-button="true"
|
|
65
|
+
condition="f_input_date >= '{}'">
|
|
66
|
+
</datepicker>
|
|
67
|
+
</div>
|
|
68
|
+
<div class="col-sm-2 form-group">
|
|
69
|
+
<label for="endDate" class="font_normal_body"> 至 </label>
|
|
70
|
+
<datepicker id="inputEndDate" placeholder="结束日期" style="width:60%"
|
|
71
|
+
v-model="model.inputEndDate"
|
|
72
|
+
:value.sync="model.inputEndDate"
|
|
73
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
74
|
+
:show-reset-button="true"
|
|
56
75
|
condition="f_input_date <= '{}'">
|
|
57
76
|
</datepicker>
|
|
58
77
|
</div>
|
|
@@ -250,6 +269,9 @@
|
|
|
250
269
|
<th>
|
|
251
270
|
<nobr>抄表日期</nobr>
|
|
252
271
|
</th>
|
|
272
|
+
<th>
|
|
273
|
+
<nobr>录入日期</nobr>
|
|
274
|
+
</th>
|
|
253
275
|
<th>
|
|
254
276
|
<nobr>所属年月</nobr>
|
|
255
277
|
</th>
|
|
@@ -380,7 +402,9 @@
|
|
|
380
402
|
<td style="text-align: center;">
|
|
381
403
|
<nobr>{{row.f_curbalance}}</nobr>
|
|
382
404
|
</td>
|
|
383
|
-
|
|
405
|
+
<td style="text-align: center;">
|
|
406
|
+
<nobr>{{row.f_hand_date}}</nobr>
|
|
407
|
+
</td>
|
|
384
408
|
<td style="text-align: center;">
|
|
385
409
|
<nobr>{{row.f_input_date}}</nobr>
|
|
386
410
|
</td>
|
|
@@ -504,8 +528,8 @@
|
|
|
504
528
|
self.$MagGetSaleParam.initinputtor();
|
|
505
529
|
self.getinputtores();
|
|
506
530
|
self.initmeterbook();
|
|
507
|
-
self.$refs.paged.$refs.cri.model.
|
|
508
|
-
self.$refs.paged.$refs.cri.model.
|
|
531
|
+
self.$refs.paged.$refs.cri.model.inputStartDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
|
|
532
|
+
self.$refs.paged.$refs.cri.model.inputEndDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
|
|
509
533
|
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
510
534
|
await self.$MagLoadParams.loadParam()
|
|
511
535
|
await self.initParams()
|
|
@@ -521,7 +545,7 @@
|
|
|
521
545
|
other:[],
|
|
522
546
|
footer:[],
|
|
523
547
|
data: {},
|
|
524
|
-
model: new PagedList('api/af-revenue/sql/webhandplanQuery', 20, {startDate: 'this.model.
|
|
548
|
+
model: new PagedList('api/af-revenue/sql/webhandplanQuery', 20, {startDate: 'this.model.inputStartDate', endDate: 'this.model.inputEndDate'}, {
|
|
525
549
|
f_oughtamount: 0,
|
|
526
550
|
f_oughtfee: 0,
|
|
527
551
|
f_curbalance: 0
|
|
@@ -939,7 +963,7 @@
|
|
|
939
963
|
return {
|
|
940
964
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_valve_state': '阀门状态',
|
|
941
965
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额','f_meternumber': '表号', 'ym_data': '数据年月',
|
|
942
|
-
'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
|
|
966
|
+
'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期', 'f_input_date': '录入日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
|
|
943
967
|
'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meter_brand': '气表品牌', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
|
|
944
968
|
'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
|
|
945
969
|
'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月','f_current_deduct_amount':'本次抵扣金额','f_remaining_deduct_amount':'剩余抵扣金额'
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
sqlurl="api/af-revenue/logic/openapi/exportfile"
|
|
57
57
|
sql-name="arrearsQuery"
|
|
58
58
|
template-name='用户欠费查询导出'
|
|
59
|
-
v-if="this.$login.r.includes('用户欠费查询导出')
|
|
59
|
+
v-if="this.$login.r.includes('用户欠费查询导出')"
|
|
60
60
|
:choose-col="true"></export-excel>
|
|
61
61
|
|
|
62
62
|
<print-data :sum-field="$parent.$parent.getfield" :model="$parent.model"
|
|
@@ -63,6 +63,7 @@
|
|
|
63
63
|
sqlurl="api/af-revenue/logic/openapi/exportfile"
|
|
64
64
|
sql-name="FMYgasQuery"
|
|
65
65
|
template-name='用气查询导出'
|
|
66
|
+
v-if="this.$login.r.includes('物联查询用气查询导出')"
|
|
66
67
|
:choose-col="true"></export-excel>
|
|
67
68
|
<print-data :model="$parent.model" :field="$parent.$parent.getfield"
|
|
68
69
|
:defaultfield="$parent.$parent.defaultfield" print-name="用气查询打印"
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
sqlurl="api/af-revenue/logic/openapi/exportfile"
|
|
49
49
|
sql-name="handPeopleQuery"
|
|
50
50
|
template-name='抄表员统计查询导出'
|
|
51
|
-
v-if="this.$login.r.includes('抄表员统计查询导出')
|
|
51
|
+
v-if="this.$login.r.includes('抄表员统计查询导出')"
|
|
52
52
|
:choose-col="true"></export-excel>
|
|
53
53
|
<print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
|
|
54
54
|
:defaultfield="$parent.$parent.defaultfield"
|
|
@@ -63,6 +63,7 @@
|
|
|
63
63
|
sqlurl="api/af-revenue/logic/openapi/exportfile"
|
|
64
64
|
sql-name="NewFMYGasQuery"
|
|
65
65
|
template-name='用气查询导出'
|
|
66
|
+
v-if="this.$login.r.includes('物联查询物联网用气查询导出')"
|
|
66
67
|
:choose-col="true"></export-excel>
|
|
67
68
|
<print-data :model="$parent.model" :field="$parent.$parent.getfield"
|
|
68
69
|
:defaultfield="$parent.$parent.defaultfield" print-name="用气查询打印"
|
|
@@ -804,7 +804,7 @@
|
|
|
804
804
|
return exportConfig.otherchargeConfig
|
|
805
805
|
},
|
|
806
806
|
chargetype() {
|
|
807
|
-
return [{label: '全部', value: ''}, ...this.$appdata.getParam('
|
|
807
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('其他收费类型查询')]
|
|
808
808
|
},
|
|
809
809
|
userTypes() {
|
|
810
810
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|