manage-client 4.0.87 → 4.0.89-rc-linshi
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/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
- package/.gradle/file-system.probe +0 -0
- package/build/dev-server.js +9 -3
- package/package.json +1 -1
- package/src/filiale/qianneng/GasLossQuery.vue +6 -0
- package/src/filiale/qianneng/OtherChargeQuery.vue +43 -2
- package/src/filiale/qianneng/exportConfig.js +2 -2
- package/src/filiale/rongcheng/DeviceQuery.vue +5 -13
- package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue +56 -20
- package/src/filiale/rongcheng/exportConfig.js +1 -1
- package/src/main.js +2 -3
|
Binary file
|
|
Binary file
|
package/build/dev-server.js
CHANGED
|
@@ -33,11 +33,17 @@ var proxyTable = {
|
|
|
33
33
|
target: 'http://203.57.101.233:9001/'
|
|
34
34
|
|
|
35
35
|
},
|
|
36
|
-
'/api/af-revenue/sql/
|
|
36
|
+
'/api/af-revenue/sql/WeChatPaydetail': {
|
|
37
37
|
pathRewrite: {
|
|
38
|
-
'^/api/af-revenue': '/'
|
|
38
|
+
'^/api/af-revenue': '/rs'
|
|
39
39
|
},
|
|
40
|
-
target: 'http://127.0.0.1:
|
|
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/'
|
|
41
47
|
},
|
|
42
48
|
'/api': {
|
|
43
49
|
target: 'http://192.168.50.67:31567/'
|
package/package.json
CHANGED
|
@@ -135,6 +135,9 @@
|
|
|
135
135
|
<th>
|
|
136
136
|
<nobr>支付单号</nobr>
|
|
137
137
|
</th>
|
|
138
|
+
<th>
|
|
139
|
+
<nobr>收费状态</nobr>
|
|
140
|
+
</th>
|
|
138
141
|
<th>
|
|
139
142
|
<nobr>详情</nobr>
|
|
140
143
|
</th>
|
|
@@ -196,6 +199,9 @@
|
|
|
196
199
|
<td style="text-align: center;">
|
|
197
200
|
<nobr>{{row.f_pay_id}}</nobr>
|
|
198
201
|
</td>
|
|
202
|
+
<td style="text-align: center;">
|
|
203
|
+
<nobr>{{row.f_state}}</nobr>
|
|
204
|
+
</td>
|
|
199
205
|
<td style="text-align: center;">
|
|
200
206
|
<nobr>{{row.detail}}</nobr>
|
|
201
207
|
</td>
|
|
@@ -128,7 +128,18 @@
|
|
|
128
128
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
|
|
129
129
|
condition="f_card_id = '{}'" placeholder='卡号'>
|
|
130
130
|
</div>
|
|
131
|
-
|
|
131
|
+
<div class="col-sm-2 form-group">
|
|
132
|
+
<label class="font_normal_body">收费来源</label>
|
|
133
|
+
<v-select id="f_state"
|
|
134
|
+
v-model="model.f_charge_source"
|
|
135
|
+
placeholder='请选择'
|
|
136
|
+
condition="f_charge_source in {}"
|
|
137
|
+
multiple="true"
|
|
138
|
+
:value.sync="model.f_charge_source"
|
|
139
|
+
:options='$parent.$parent.chargesource'
|
|
140
|
+
close-on-select clear-button>
|
|
141
|
+
</v-select>
|
|
142
|
+
</div>
|
|
132
143
|
<div class="col-sm-2 form-group">
|
|
133
144
|
<label class="font_normal_body">收费状态</label>
|
|
134
145
|
<v-select id="f_state"
|
|
@@ -154,6 +165,18 @@
|
|
|
154
165
|
close-on-select clear-button>
|
|
155
166
|
</v-select>
|
|
156
167
|
</div>
|
|
168
|
+
<div class="col-sm-2 form-group">
|
|
169
|
+
<label class="font_normal_body">银行名称</label>
|
|
170
|
+
<v-select id="f_payment"
|
|
171
|
+
v-model="model.f_bank_type"
|
|
172
|
+
placeholder='请选择'
|
|
173
|
+
multiple="true"
|
|
174
|
+
condition="f_bank_type in {}"
|
|
175
|
+
:value.sync="model.f_bank_type"
|
|
176
|
+
:options='$parent.$parent.banktype'
|
|
177
|
+
close-on-select clear-button>
|
|
178
|
+
</v-select>
|
|
179
|
+
</div>
|
|
157
180
|
<div class="col-sm-2 form-group">
|
|
158
181
|
<label class="font_normal_body">气表类型</label>
|
|
159
182
|
<v-select :value.sync="model.f_meter_classify" multiple
|
|
@@ -199,6 +222,7 @@
|
|
|
199
222
|
<th>
|
|
200
223
|
<nobr>收费编号</nobr>
|
|
201
224
|
</th>
|
|
225
|
+
|
|
202
226
|
<th>
|
|
203
227
|
<nobr>客户名称</nobr>
|
|
204
228
|
</th>
|
|
@@ -226,6 +250,9 @@
|
|
|
226
250
|
<th>
|
|
227
251
|
<nobr>卡号</nobr>
|
|
228
252
|
</th>
|
|
253
|
+
<th>
|
|
254
|
+
<nobr>收费来源</nobr>
|
|
255
|
+
</th>
|
|
229
256
|
<th>
|
|
230
257
|
<nobr>收据票号</nobr>
|
|
231
258
|
</th>
|
|
@@ -263,6 +290,9 @@
|
|
|
263
290
|
<th>
|
|
264
291
|
<nobr>付款方式</nobr>
|
|
265
292
|
</th>
|
|
293
|
+
<th>
|
|
294
|
+
<nobr>银行名称</nobr>
|
|
295
|
+
</th>
|
|
266
296
|
<th>
|
|
267
297
|
<nobr>状态</nobr>
|
|
268
298
|
</th>
|
|
@@ -326,7 +356,9 @@
|
|
|
326
356
|
<td style="text-align: center;">
|
|
327
357
|
<nobr>{{row.f_card_id}}</nobr>
|
|
328
358
|
</td>
|
|
329
|
-
|
|
359
|
+
<td style="text-align: center;">
|
|
360
|
+
<nobr>{{row.f_charge_source}}</nobr>
|
|
361
|
+
</td>
|
|
330
362
|
<td style="text-align: center;">
|
|
331
363
|
<nobr>{{row.f_bill_number}}</nobr>
|
|
332
364
|
</td>
|
|
@@ -363,6 +395,9 @@
|
|
|
363
395
|
<td style="text-align: center;">
|
|
364
396
|
<nobr>{{row.f_payment}}</nobr>
|
|
365
397
|
</td>
|
|
398
|
+
<td style="text-align: center;">
|
|
399
|
+
<nobr>{{row.f_bank_type}}</nobr>
|
|
400
|
+
</td>
|
|
366
401
|
<td style="text-align: center;">
|
|
367
402
|
<nobr>{{row.f_state}}</nobr>
|
|
368
403
|
</td>
|
|
@@ -695,9 +730,15 @@
|
|
|
695
730
|
chargeState() {
|
|
696
731
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
|
|
697
732
|
},
|
|
733
|
+
chargesource() {
|
|
734
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费来源')]
|
|
735
|
+
},
|
|
698
736
|
metertypes() {
|
|
699
737
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
700
738
|
},
|
|
739
|
+
banktype() {
|
|
740
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
|
|
741
|
+
},
|
|
701
742
|
payments() {
|
|
702
743
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
|
|
703
744
|
}
|
|
@@ -77,7 +77,7 @@ export default{
|
|
|
77
77
|
'f_number': '数量', 'f_unitprice': '单价', 'f_collection': '金额',
|
|
78
78
|
'f_payment': '付款方式', 'f_bill_style': '打印格式',
|
|
79
79
|
'f_serial_id': '流水号', 'f_pay_id': '支付单号', 'detail': '详细信息', 'f_charge_date': '缴费日期',
|
|
80
|
-
'f_orgname': '公司', 'f_depname': '部门', 'f_operator': '操作员'
|
|
80
|
+
'f_orgname': '公司', 'f_depname': '部门', 'f_operator': '操作员', 'f_state': '收费状态'
|
|
81
81
|
},
|
|
82
82
|
batchBankConfig2: {
|
|
83
83
|
'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
|
|
@@ -89,7 +89,7 @@ export default{
|
|
|
89
89
|
'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_contact_phone': '安装联系电话', 'f_meter_classify': '气表类型',
|
|
90
90
|
'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
|
|
91
91
|
'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量', 'f_money': '应收',
|
|
92
|
-
'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
|
|
92
|
+
'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_bank_type': '银行名称', 'f_state': '状态',
|
|
93
93
|
'f_old_overdue': '违约金', 'f_operate_date': '收费日期', 'f_serial_id': '流水编号', 'f_service_person': '服务人员', 'f_comments': '备注',
|
|
94
94
|
'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
|
|
95
95
|
},
|
|
@@ -72,13 +72,14 @@
|
|
|
72
72
|
condition="f_meternumber like '%{}%'" placeholder='所属表(表号)'>
|
|
73
73
|
</div>
|
|
74
74
|
|
|
75
|
-
<div class="col-sm-2 form-group"
|
|
76
|
-
<label class="font_normal_body">设备类型</label>
|
|
75
|
+
<div class="col-sm-2 form-group">
|
|
76
|
+
<label class="font_normal_body" >设备类型</label>
|
|
77
77
|
<v-select :value.sync="model.f_devices_type"
|
|
78
78
|
v-model="model.f_devices_type"
|
|
79
|
-
:options='$parent.$parent.
|
|
79
|
+
:options='$parent.$parent.devicestype' placeholder='请选择'
|
|
80
80
|
condition="f_devices_type = '{}'"
|
|
81
|
-
close-on-select
|
|
81
|
+
close-on-select :search="false">
|
|
82
|
+
</v-select>
|
|
82
83
|
</div>
|
|
83
84
|
<div class="col-sm-2 form-group" >
|
|
84
85
|
<label class="font_normal_body">购买方式</label>
|
|
@@ -226,15 +227,6 @@
|
|
|
226
227
|
</v-select>
|
|
227
228
|
</div>
|
|
228
229
|
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
|
|
229
|
-
<div class="col-sm-2 form-group">
|
|
230
|
-
<label class="font_normal_body" >设备类型</label>
|
|
231
|
-
<v-select :value.sync="model.f_devices_type"
|
|
232
|
-
v-model="model.f_devices_type"
|
|
233
|
-
:options='$parent.$parent.devicestype' placeholder='请选择'
|
|
234
|
-
condition="f_devices_type = '{}'"
|
|
235
|
-
close-on-select :search="false">
|
|
236
|
-
</v-select>
|
|
237
|
-
</div>
|
|
238
230
|
</div>
|
|
239
231
|
</div>
|
|
240
232
|
</criteria>
|
|
@@ -209,7 +209,6 @@
|
|
|
209
209
|
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
|
|
210
210
|
<template partial='head'>
|
|
211
211
|
<tr>
|
|
212
|
-
<th><nobr>审核状态</nobr></th>
|
|
213
212
|
<th>
|
|
214
213
|
<!--<nobr>客户编号</nobr>-->
|
|
215
214
|
<data-order field="f_userinfo_code" name="客户编号"
|
|
@@ -221,11 +220,17 @@
|
|
|
221
220
|
<th>
|
|
222
221
|
<nobr>档案编号</nobr>
|
|
223
222
|
</th>
|
|
223
|
+
<th>
|
|
224
|
+
<nobr>用户电话</nobr>
|
|
225
|
+
</th>
|
|
224
226
|
<th>
|
|
225
227
|
<nobr>付款方式</nobr>
|
|
226
228
|
</th>
|
|
227
229
|
<th>
|
|
228
|
-
<nobr
|
|
230
|
+
<nobr>上期底数</nobr>
|
|
231
|
+
</th>
|
|
232
|
+
<th>
|
|
233
|
+
<nobr>本期底数</nobr>
|
|
229
234
|
</th>
|
|
230
235
|
<th>
|
|
231
236
|
<nobr>表上余额</nobr>
|
|
@@ -256,9 +261,9 @@
|
|
|
256
261
|
<th>
|
|
257
262
|
<nobr>新表号</nobr>
|
|
258
263
|
</th>
|
|
259
|
-
<th
|
|
260
|
-
<nobr>表封号</nobr
|
|
261
|
-
</th
|
|
264
|
+
<!-- <th>-->
|
|
265
|
+
<!-- <nobr>表封号</nobr>-->
|
|
266
|
+
<!-- </th>-->
|
|
262
267
|
<th>
|
|
263
268
|
<nobr>旧气表品牌</nobr>
|
|
264
269
|
</th>
|
|
@@ -271,9 +276,9 @@
|
|
|
271
276
|
<th>
|
|
272
277
|
<nobr>补气金额</nobr>
|
|
273
278
|
</th>
|
|
274
|
-
<th
|
|
275
|
-
<nobr>订单编号</nobr
|
|
276
|
-
</th
|
|
279
|
+
<!-- <th>-->
|
|
280
|
+
<!-- <nobr>订单编号</nobr>-->
|
|
281
|
+
<!-- </th>-->
|
|
277
282
|
<th>
|
|
278
283
|
<nobr>备注</nobr>
|
|
279
284
|
</th>
|
|
@@ -299,18 +304,27 @@
|
|
|
299
304
|
</th>
|
|
300
305
|
<th><nobr>旧表类型</nobr></th>
|
|
301
306
|
<th><nobr>新表类型</nobr></th>
|
|
307
|
+
<th>
|
|
308
|
+
<nobr>上期底数</nobr>
|
|
309
|
+
</th>
|
|
310
|
+
<th>
|
|
311
|
+
<nobr>本期底数</nobr>
|
|
312
|
+
</th>
|
|
313
|
+
<th>
|
|
314
|
+
<nobr>换表前气价名称</nobr>
|
|
315
|
+
</th>
|
|
316
|
+
<th>
|
|
317
|
+
<nobr>换表后气价名称</nobr>
|
|
318
|
+
</th>
|
|
302
319
|
<th><nobr>用户类型</nobr></th>
|
|
303
|
-
<th><nobr
|
|
320
|
+
<th><nobr>查看</nobr></th>
|
|
321
|
+
<th><nobr>审核状态</nobr></th>
|
|
304
322
|
<th><nobr>审核时间</nobr></th>
|
|
305
323
|
<th><nobr>审核人</nobr></th>
|
|
306
324
|
<th><nobr>审核原因</nobr></th>
|
|
307
325
|
</tr>
|
|
308
326
|
</template>
|
|
309
327
|
<template partial='body'>
|
|
310
|
-
<td style="text-align: center;"><nobr>
|
|
311
|
-
<button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核')" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.checkData(row)">审核</button>
|
|
312
|
-
<span v-if="row.f_changetables_check_state">{{row.f_changetables_check_state}}</span>
|
|
313
|
-
</nobr></td>
|
|
314
328
|
<td style="text-align: center;"><nobr>
|
|
315
329
|
<span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
|
|
316
330
|
</nobr> </td>
|
|
@@ -320,12 +334,18 @@
|
|
|
320
334
|
<td style="text-align: center;">
|
|
321
335
|
<nobr>{{row.f_olduserinfo_code}}</nobr>
|
|
322
336
|
</td>
|
|
337
|
+
<td style="text-align: center;">
|
|
338
|
+
<nobr>{{row.f_user_phone}}</nobr>
|
|
339
|
+
</td>
|
|
323
340
|
<td style="text-align: center;">
|
|
324
341
|
<nobr>{{row.f_payment}}</nobr>
|
|
325
342
|
</td>
|
|
326
343
|
<td style="text-align: center;">
|
|
327
344
|
<nobr>{{row.f_meter_base}}</nobr>
|
|
328
345
|
</td>
|
|
346
|
+
<td style="text-align: center;">
|
|
347
|
+
<nobr>{{row.f_using_base_old}}</nobr>
|
|
348
|
+
</td>
|
|
329
349
|
<td style="text-align: center;">
|
|
330
350
|
<nobr>{{row.f_balance_amount}}</nobr>
|
|
331
351
|
</td>
|
|
@@ -354,9 +374,9 @@
|
|
|
354
374
|
<td style="text-align: center;">
|
|
355
375
|
<nobr>{{row.f_meternumber}}</nobr>
|
|
356
376
|
</td>
|
|
357
|
-
<td style="text-align: center;"
|
|
358
|
-
<nobr>{{row.f_metertitles}}</nobr
|
|
359
|
-
</td
|
|
377
|
+
<!-- <td style="text-align: center;">-->
|
|
378
|
+
<!-- <nobr>{{row.f_metertitles}}</nobr>-->
|
|
379
|
+
<!-- </td>-->
|
|
360
380
|
<td style="text-align: center;">
|
|
361
381
|
<nobr>{{row.f_meter_brand_old}}</nobr>
|
|
362
382
|
</td>
|
|
@@ -369,9 +389,9 @@
|
|
|
369
389
|
<td style="text-align: center;">
|
|
370
390
|
<nobr>{{row.f_remanent_money}}</nobr>
|
|
371
391
|
</td>
|
|
372
|
-
<td style="text-align: center;"
|
|
373
|
-
<nobr>{{row.f_serial_number}}</nobr
|
|
374
|
-
</td
|
|
392
|
+
<!-- <td style="text-align: center;">-->
|
|
393
|
+
<!-- <nobr>{{row.f_serial_number}}</nobr>-->
|
|
394
|
+
<!-- </td>-->
|
|
375
395
|
<td style="text-align: center;">
|
|
376
396
|
<nobr>{{row.f_comments}}</nobr>
|
|
377
397
|
</td>
|
|
@@ -399,12 +419,28 @@
|
|
|
399
419
|
<td style="text-align: center;">
|
|
400
420
|
<nobr>{{row.f_meter_type}}</nobr>
|
|
401
421
|
</td>
|
|
422
|
+
<td style="text-align: center;">
|
|
423
|
+
<nobr>{{row.f_meter_type_old === '机表' ? row.f_meter_base_old : '' }}</nobr>
|
|
424
|
+
</td>
|
|
425
|
+
<td style="text-align: center;">
|
|
426
|
+
<nobr>{{(row.f_meter_type_old === '气量卡表' || row.f_meter_type_old === '机表') ? row.f_meter_base : ''}}</nobr>
|
|
427
|
+
</td>
|
|
428
|
+
<td style="text-align: center;">
|
|
429
|
+
<nobr>{{row.f_meter_type_old === '机表' ? row.f_used_content : ''}}</nobr>
|
|
430
|
+
</td>
|
|
431
|
+
<td style="text-align: center;">
|
|
432
|
+
<nobr>{{row.f_meter_type_old === '机表' ? row.f_new_content : ''}}</nobr>
|
|
433
|
+
</td>
|
|
402
434
|
<td style="text-align: center;">
|
|
403
435
|
<nobr>{{row.f_user_type}}</nobr>
|
|
404
436
|
</td>
|
|
405
437
|
<td style="text-align: center;"><nobr>
|
|
406
438
|
<button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
|
|
407
439
|
</nobr></td>
|
|
440
|
+
<td style="text-align: center;"><nobr>
|
|
441
|
+
<button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核')" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.checkData(row)">审核</button>
|
|
442
|
+
<span v-if="row.f_changetables_check_state">{{row.f_changetables_check_state}}</span>
|
|
443
|
+
</nobr></td>
|
|
408
444
|
<td style="text-align: center;">
|
|
409
445
|
<nobr>{{row.f_changetables_check_date}}</nobr>
|
|
410
446
|
</td>
|
|
@@ -472,7 +508,7 @@
|
|
|
472
508
|
</div>
|
|
473
509
|
<modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
|
|
474
510
|
<article slot="modal-body">
|
|
475
|
-
<upload :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="
|
|
511
|
+
<upload :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表" ></upload>
|
|
476
512
|
</article>
|
|
477
513
|
<footer slot="modal-footer" class="modal-footer">
|
|
478
514
|
</footer>
|
package/src/main.js
CHANGED
|
@@ -6,8 +6,8 @@ import { all } from 'vue-client'
|
|
|
6
6
|
import { system } from 'system-clients'
|
|
7
7
|
import { ldap } from 'ldap-clients'
|
|
8
8
|
import saleManage from './saleManage'
|
|
9
|
-
import ShanXianSaleManage from './filiale/
|
|
10
|
-
import ShanXianwebSaleManage from './filiale/
|
|
9
|
+
import ShanXianSaleManage from './filiale/rongcheng/sale'
|
|
10
|
+
import ShanXianwebSaleManage from './filiale/qianneng/webmeterManage'
|
|
11
11
|
import webmeterManage from './webmeterManage'
|
|
12
12
|
import reportManage from './reportManage'
|
|
13
13
|
import newmanage from './newmanage'
|
|
@@ -45,7 +45,6 @@ all()
|
|
|
45
45
|
// sale()
|
|
46
46
|
ldap()
|
|
47
47
|
system(false)
|
|
48
|
-
|
|
49
48
|
saleManage()
|
|
50
49
|
webmeterManage()
|
|
51
50
|
ManageHome()
|