sale-client 3.6.105 → 3.6.106
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/package.json +1 -1
- package/src/components/charge/business/CardChangeFill.vue +34 -3
- package/src/components/charge/business/CardMeterCenter.vue +27 -16
- package/src/components/charge/business/IOTMeterCenter.vue +20 -9
- package/src/components/charge/business/NoCardMeterCenter.vue +34 -2
- package/src/components/charge/business/OtherChargeNew.vue +33 -1
- package/src/components/charge/business/depositCharge/DepositCharge.vue +10 -1
- package/src/components/charge/business/machine/MachineMeterCenter.vue +21 -10
- package/src/components/charge/business/refund/DropTableRefund.vue +34 -2
- package/src/components/charge/business/refund/IOTRefund.vue +31 -1
- package/src/components/charge/business/refund/machineRefund.vue +32 -2
- package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue +33 -1
- package/src/components/revenue/comprehen/ComprehenOperation/FeeDeduction/feeDeduction.vue +31 -1
- package/src/components/revenue/comprehen/ComprehenOperation/FeeDeduction/feeMachine.vue +32 -1
- package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue +32 -1
- package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue +32 -1
- package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue +42 -5
- package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue +33 -1
- package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue +38 -12
- package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue +100 -62
- package/src/filiale/fugu/components/BlackList/BlackListList.vue +4 -4
- package/src/filiale/shexian/revenue/newchangemeter/ChangeMeter.vue +27 -13
- package/src/filiale/shexian/revenue/newchangemeter/ResetMeter.vue +28 -14
package/package.json
CHANGED
|
@@ -169,7 +169,7 @@
|
|
|
169
169
|
|
|
170
170
|
<payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
|
|
171
171
|
</div>
|
|
172
|
-
<upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="补气购气"></upload>
|
|
172
|
+
<upload :blodid="blodid" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="补气购气"></upload>
|
|
173
173
|
</template>
|
|
174
174
|
<script>
|
|
175
175
|
/**
|
|
@@ -260,7 +260,18 @@
|
|
|
260
260
|
self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
|
|
261
261
|
let res = await self.$CardService.remanentinitCard(self.model, self.row, self.cardallot)
|
|
262
262
|
console.log('换表发卡数据返回', res.data.sellid, res.data.fillgasid, res, self.model)
|
|
263
|
-
|
|
263
|
+
if (self.config.showupload) {
|
|
264
|
+
let param = []
|
|
265
|
+
for (let row of self.resid) {
|
|
266
|
+
param.push({id: row.id})
|
|
267
|
+
}
|
|
268
|
+
let data1 = {
|
|
269
|
+
param: param,
|
|
270
|
+
f_blobid: res.data.sellid
|
|
271
|
+
}
|
|
272
|
+
console.log('-------------------------->', data1)
|
|
273
|
+
await self.$resetpost('rs/logic/updatefiles', data1)
|
|
274
|
+
}
|
|
264
275
|
// 开始打票
|
|
265
276
|
if (self.config.hasPrint) {
|
|
266
277
|
if (self.model.f_print.indexOf('电子发票') == -1) {
|
|
@@ -366,6 +377,8 @@
|
|
|
366
377
|
url: 'rs/report/card_gas_bill',
|
|
367
378
|
bill: ''
|
|
368
379
|
},
|
|
380
|
+
randomBusinessId: '',
|
|
381
|
+
resid: [], // 存放新增的f_files表中id
|
|
369
382
|
print: false,
|
|
370
383
|
|
|
371
384
|
// 是否有限购
|
|
@@ -419,7 +432,7 @@
|
|
|
419
432
|
}
|
|
420
433
|
|
|
421
434
|
this.model.f_collection = 0
|
|
422
|
-
|
|
435
|
+
this.getRandomId()
|
|
423
436
|
await asyncShowCardSellGas(this)
|
|
424
437
|
},
|
|
425
438
|
watch: {
|
|
@@ -448,7 +461,25 @@
|
|
|
448
461
|
}
|
|
449
462
|
}
|
|
450
463
|
},
|
|
464
|
+
events: {
|
|
465
|
+
// 删除Resid数组元素
|
|
466
|
+
'delResid' (val) {
|
|
467
|
+
this.resid.$remove({id: val, f_biobid: ''})
|
|
468
|
+
// this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
|
|
469
|
+
},
|
|
470
|
+
// 增加Resid数组元素
|
|
471
|
+
'resid' (val) {
|
|
472
|
+
this.resid.push({id: val, f_biobid: ''})
|
|
473
|
+
}
|
|
474
|
+
},
|
|
451
475
|
methods: {
|
|
476
|
+
getRandomId () {
|
|
477
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
478
|
+
let res = Math.random() * 16 | 0
|
|
479
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
480
|
+
return v.toString(16)
|
|
481
|
+
})
|
|
482
|
+
},
|
|
452
483
|
confirm () {
|
|
453
484
|
this.$dispatch('no-button')
|
|
454
485
|
this.clickConfirm = true
|
|
@@ -234,7 +234,7 @@
|
|
|
234
234
|
<payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
|
|
235
235
|
</div>
|
|
236
236
|
</div>
|
|
237
|
-
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="卡表收费"></upload>
|
|
237
|
+
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="卡表收费"></upload>
|
|
238
238
|
</template>
|
|
239
239
|
<script>
|
|
240
240
|
import {HttpResetClass} from 'vue-client'
|
|
@@ -341,22 +341,24 @@
|
|
|
341
341
|
localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)
|
|
342
342
|
window.localStorage.setItem('sustainMoney', localeSustainMoney)
|
|
343
343
|
}
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
344
|
+
if (self.config.showupload) {
|
|
345
|
+
let param = []
|
|
346
|
+
for (let row of self.resid) {
|
|
347
|
+
param.push({id: row.id})
|
|
348
|
+
}
|
|
349
|
+
let writeid
|
|
350
|
+
if (res.data && res.data.id) {
|
|
351
|
+
writeid = res.data.id
|
|
352
|
+
} else {
|
|
353
|
+
writeid = res
|
|
354
|
+
}
|
|
355
|
+
let data = {
|
|
356
|
+
param: param,
|
|
357
|
+
f_blobid: writeid
|
|
358
|
+
}
|
|
358
359
|
|
|
359
|
-
|
|
360
|
+
await self.$resetpost('rs/logic/updatefiles', data)
|
|
361
|
+
}
|
|
360
362
|
console.log(self.config, self.config.hasPrint && !self.$login.r.includes('不打印发票'))
|
|
361
363
|
// 开始打票
|
|
362
364
|
if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
|
|
@@ -502,6 +504,7 @@
|
|
|
502
504
|
return {
|
|
503
505
|
mjshow: false,
|
|
504
506
|
serialShow: false,
|
|
507
|
+
randomBusinessId: '',
|
|
505
508
|
resid: [], // 存放新增的f_files表中id
|
|
506
509
|
config: {
|
|
507
510
|
calculatePreByCollection: false, // 可以更具收款来反向计算预购
|
|
@@ -592,6 +595,7 @@
|
|
|
592
595
|
this.model.f_pregas = 0
|
|
593
596
|
}
|
|
594
597
|
this.$els.fpregas.focus()
|
|
598
|
+
this.getRandomId()
|
|
595
599
|
asyncCardMeterCenter(this)
|
|
596
600
|
},
|
|
597
601
|
watch: {
|
|
@@ -651,6 +655,13 @@
|
|
|
651
655
|
}
|
|
652
656
|
},
|
|
653
657
|
methods: {
|
|
658
|
+
getRandomId () {
|
|
659
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
660
|
+
let res = Math.random() * 16 | 0
|
|
661
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
662
|
+
return v.toString(16)
|
|
663
|
+
})
|
|
664
|
+
},
|
|
654
665
|
// 根据收款金额计算划价信息
|
|
655
666
|
// 需要配置 calculatePreByCollection = true
|
|
656
667
|
async calculatePreByCollection () {
|
|
@@ -198,7 +198,7 @@
|
|
|
198
198
|
</div>
|
|
199
199
|
<eticket-modal :show="eticket_msg" @closemodalshow="eticket_msg = false" :row="row" @confirm="confirm"></eticket-modal>
|
|
200
200
|
<ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
|
|
201
|
-
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="物联网表收费"></upload>
|
|
201
|
+
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="物联网表收费"></upload>
|
|
202
202
|
<!-- <modal :show.sync="showfiles" width="80%"style="width:auto;" v-ref:modal middle backdrop="false">-->
|
|
203
203
|
<!-- <article slot="modal-body">-->
|
|
204
204
|
<!-- <upload :blodid="row.f_userinfo_id" v-ref:upload :fusetype="uploadText" isremark="true" style="width:auto" ></upload>-->
|
|
@@ -323,15 +323,17 @@
|
|
|
323
323
|
localeSustainMoney = (localeSustainMoney - 0) + (param.f_collection - 0)
|
|
324
324
|
window.localStorage.setItem('sustainMoney', localeSustainMoney)
|
|
325
325
|
}
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
326
|
+
if (self.config.showupload) {
|
|
327
|
+
let param1 = []
|
|
328
|
+
for (let row of self.resid) {
|
|
329
|
+
param1.push({id: row.id})
|
|
330
|
+
}
|
|
331
|
+
let data = {
|
|
332
|
+
param: param1,
|
|
333
|
+
f_blobid: res.data.id
|
|
334
|
+
}
|
|
335
|
+
await self.$resetpost('rs/logic/updatefiles', data)
|
|
333
336
|
}
|
|
334
|
-
await self.$resetpost('rs/logic/updatefiles', data)
|
|
335
337
|
console.log('物联网收费返回。。。', res.data.id)
|
|
336
338
|
// 开始打票
|
|
337
339
|
console.log('开始打票', self.config)
|
|
@@ -491,6 +493,7 @@
|
|
|
491
493
|
f_after_discount: 0,
|
|
492
494
|
f_sys_balance: 0
|
|
493
495
|
},
|
|
496
|
+
randomBusinessId: '',
|
|
494
497
|
eticket_msg: false,
|
|
495
498
|
eticket_show: false,
|
|
496
499
|
invoice_is_pax: '不征税',
|
|
@@ -549,6 +552,7 @@
|
|
|
549
552
|
this.model.f_pregas = ''
|
|
550
553
|
document.getElementById('pregasFocue').focus()
|
|
551
554
|
asyncCardMeterCenter(this)
|
|
555
|
+
this.getRandomId()
|
|
552
556
|
},
|
|
553
557
|
watch: {
|
|
554
558
|
'model.f_payment.length' (val) {
|
|
@@ -608,6 +612,13 @@
|
|
|
608
612
|
}
|
|
609
613
|
},
|
|
610
614
|
methods: {
|
|
615
|
+
getRandomId () {
|
|
616
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
617
|
+
let res = Math.random() * 16 | 0
|
|
618
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
619
|
+
return v.toString(16)
|
|
620
|
+
})
|
|
621
|
+
},
|
|
611
622
|
// 校验发票信息
|
|
612
623
|
checkInvoiceMsg () {
|
|
613
624
|
// 校验是否超出最大透支余额
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
</div>
|
|
159
159
|
</validator>
|
|
160
160
|
<payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
|
|
161
|
-
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="无卡收费"></upload>
|
|
161
|
+
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="无卡收费"></upload>
|
|
162
162
|
</div>
|
|
163
163
|
</div>
|
|
164
164
|
</template>
|
|
@@ -233,7 +233,17 @@
|
|
|
233
233
|
|
|
234
234
|
let res = await self.$CardService.noCardSellGas(self.model, self.row, self.cardallot)
|
|
235
235
|
console.log('卡表收费返回id', res, self.model)
|
|
236
|
-
|
|
236
|
+
if (self.config.showupload) {
|
|
237
|
+
let param = []
|
|
238
|
+
for (let row of self.resid) {
|
|
239
|
+
param.push({id: row.id})
|
|
240
|
+
}
|
|
241
|
+
let data = {
|
|
242
|
+
param: param,
|
|
243
|
+
f_blobid: res
|
|
244
|
+
}
|
|
245
|
+
await self.$resetpost('rs/logic/updatefiles', data)
|
|
246
|
+
}
|
|
237
247
|
// 开始打票
|
|
238
248
|
if (self.config.hasPrint) {
|
|
239
249
|
if (self.model.f_print.indexOf('电子发票') == -1) {
|
|
@@ -308,6 +318,7 @@
|
|
|
308
318
|
data () {
|
|
309
319
|
return {
|
|
310
320
|
serialShow: false,
|
|
321
|
+
resid: [], // 存放新增的f_files表中id
|
|
311
322
|
config: {
|
|
312
323
|
notShowFormula: false, // 不显示计算公式,默认显示
|
|
313
324
|
hasPrint: true, // 默认打票
|
|
@@ -315,6 +326,7 @@
|
|
|
315
326
|
floor: false, //是否取整收费
|
|
316
327
|
billType: '燃气费', // 票据类型(燃气费,其他费用,调用的发票代码不同)
|
|
317
328
|
printType: '普通收据', // 收据/电子票/专用发票/国税发票
|
|
329
|
+
showupload: true,
|
|
318
330
|
payment: '现金缴费'
|
|
319
331
|
},
|
|
320
332
|
model: {
|
|
@@ -337,6 +349,7 @@
|
|
|
337
349
|
url: 'rs/report/card_bill',
|
|
338
350
|
billnumber: ''
|
|
339
351
|
},
|
|
352
|
+
randomBusinessId: '',
|
|
340
353
|
hasLimit: false,
|
|
341
354
|
maxgas: 99999999, // 限购
|
|
342
355
|
maxmoney: 99999999,
|
|
@@ -365,8 +378,27 @@
|
|
|
365
378
|
}
|
|
366
379
|
document.getElementById('fpregas').focus()
|
|
367
380
|
asyncCardMeterCenter(this)
|
|
381
|
+
this.getRandomId()
|
|
382
|
+
},
|
|
383
|
+
events: {
|
|
384
|
+
// 删除Resid数组元素
|
|
385
|
+
'delResid' (val) {
|
|
386
|
+
this.resid.$remove({id: val, f_biobid: ''})
|
|
387
|
+
// this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
|
|
388
|
+
},
|
|
389
|
+
// 增加Resid数组元素
|
|
390
|
+
'resid' (val) {
|
|
391
|
+
this.resid.push({id: val, f_biobid: ''})
|
|
392
|
+
}
|
|
368
393
|
},
|
|
369
394
|
methods: {
|
|
395
|
+
getRandomId () {
|
|
396
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
397
|
+
let res = Math.random() * 16 | 0
|
|
398
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
399
|
+
return v.toString(16)
|
|
400
|
+
})
|
|
401
|
+
},
|
|
370
402
|
confirm () {
|
|
371
403
|
this.$showMessage(`对客户${this.row.f_user_name}进行收费。该操作只做收费,不做写卡,确定要进行该操作吗?`, ['confirm', 'cancel']).then(async (res) => {
|
|
372
404
|
if (res === 'confirm') {
|
|
@@ -169,7 +169,7 @@
|
|
|
169
169
|
<button class="button_clear btn-gn" @click="clean()">取消</button>
|
|
170
170
|
</div>
|
|
171
171
|
</validator>
|
|
172
|
-
<upload :blodid="
|
|
172
|
+
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="其他收费"></upload>
|
|
173
173
|
</div>
|
|
174
174
|
<payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
|
|
175
175
|
</div>
|
|
@@ -183,6 +183,17 @@ let otherChargeGen = async function (self, parameter) {
|
|
|
183
183
|
console.log('11111', self.model)
|
|
184
184
|
let resid = await self.$LogicService.otherCharge(self.model, self.row)
|
|
185
185
|
console.log('其他收费返回id', resid, self.config.hasPrint, self.$login.r.includes('不打印发票'))
|
|
186
|
+
if (self.config.showupload) {
|
|
187
|
+
let param = []
|
|
188
|
+
for (let row of self.resid) {
|
|
189
|
+
param.push({id: row.id})
|
|
190
|
+
}
|
|
191
|
+
let data = {
|
|
192
|
+
param: param,
|
|
193
|
+
f_blobid: resid.data
|
|
194
|
+
}
|
|
195
|
+
await self.$resetpost('rs/logic/updatefiles', data)
|
|
196
|
+
}
|
|
186
197
|
if (self.config.dispatch) {
|
|
187
198
|
await self.$showMessage(`是否添加派工单`, ['confirm', 'cancel']).then((res) => {
|
|
188
199
|
if (res === 'confirm') {
|
|
@@ -297,6 +308,8 @@ export default {
|
|
|
297
308
|
brandspec: '材料费', // 收费类型
|
|
298
309
|
services: this.$login.f.name // 服务人员
|
|
299
310
|
},
|
|
311
|
+
randomBusinessId: '',
|
|
312
|
+
resid: [], // 存放新增的f_files表中id
|
|
300
313
|
model: {
|
|
301
314
|
f_print: [],
|
|
302
315
|
f_payment: '现金缴费',
|
|
@@ -342,6 +355,7 @@ export default {
|
|
|
342
355
|
ready () {
|
|
343
356
|
// this.model.f_unitprice = this.$appdata.getSingleValue('置换气费')
|
|
344
357
|
asyncOtherCharge(this)
|
|
358
|
+
this.getRandomId()
|
|
345
359
|
},
|
|
346
360
|
watch: {
|
|
347
361
|
'model.f_fee_type' (val) {
|
|
@@ -350,7 +364,25 @@ export default {
|
|
|
350
364
|
}
|
|
351
365
|
}
|
|
352
366
|
},
|
|
367
|
+
events: {
|
|
368
|
+
// 删除Resid数组元素
|
|
369
|
+
'delResid' (val) {
|
|
370
|
+
this.resid.$remove({id: val, f_biobid: ''})
|
|
371
|
+
// this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
|
|
372
|
+
},
|
|
373
|
+
// 增加Resid数组元素
|
|
374
|
+
'resid' (val) {
|
|
375
|
+
this.resid.push({id: val, f_biobid: ''})
|
|
376
|
+
}
|
|
377
|
+
},
|
|
353
378
|
methods: {
|
|
379
|
+
getRandomId () {
|
|
380
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
381
|
+
let res = Math.random() * 16 | 0
|
|
382
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
383
|
+
return v.toString(16)
|
|
384
|
+
})
|
|
385
|
+
},
|
|
354
386
|
// 初始化安检人
|
|
355
387
|
initSecuritypersons () {
|
|
356
388
|
let origin = this.$appdata.getSingleValue('服务人员来源')
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
</div>
|
|
80
80
|
</validator>
|
|
81
81
|
<payment-code v-ref:paymentcode :payment="data.f_payment" :row="row" :money="data.f_collection"></payment-code>
|
|
82
|
-
<upload :blodid="row.f_userinfo_id" isremark="true" fusetype="预存收费"></upload>
|
|
82
|
+
<upload :blodid="row.f_userinfo_id" isremark="true" :businessid="randomBusinessId" fusetype="预存收费"></upload>
|
|
83
83
|
<modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
|
|
84
84
|
<header slot="modal-header" class="modal-header">
|
|
85
85
|
<button type="button" class="close" @click="eticket_msg = false"><span>×</span></button>
|
|
@@ -232,6 +232,7 @@
|
|
|
232
232
|
printType: '普通收据', // 收据/电子票/专用发票/国税发票
|
|
233
233
|
payment: '现金缴费'
|
|
234
234
|
},
|
|
235
|
+
randomBusinessId: '',
|
|
235
236
|
overdueModal: {
|
|
236
237
|
f_old_overdue: 0,
|
|
237
238
|
f_new_overdue: ''
|
|
@@ -281,8 +282,16 @@
|
|
|
281
282
|
asyncMachineMeterCenter(this)
|
|
282
283
|
document.getElementById('f_collection').focus()
|
|
283
284
|
loadGen(this)
|
|
285
|
+
this.getRandomId()
|
|
284
286
|
},
|
|
285
287
|
methods: {
|
|
288
|
+
getRandomId () {
|
|
289
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
290
|
+
let res = Math.random() * 16 | 0
|
|
291
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
292
|
+
return v.toString(16)
|
|
293
|
+
})
|
|
294
|
+
},
|
|
286
295
|
checkInvoiceMsg () {
|
|
287
296
|
console.log("点点",this.data)
|
|
288
297
|
if (this.data.f_print[0] === '电子发票') {
|
|
@@ -179,7 +179,7 @@
|
|
|
179
179
|
<!--</modal>-->
|
|
180
180
|
<payment-code v-ref:paymentcode :payment="data.f_payment" :row="row" :money="data.f_after_discount"></payment-code>
|
|
181
181
|
</div>
|
|
182
|
-
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="机表收费"></upload>
|
|
182
|
+
<upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="机表收费"></upload>
|
|
183
183
|
</template>
|
|
184
184
|
<script>
|
|
185
185
|
import {HttpResetClass} from 'vue-client'
|
|
@@ -210,16 +210,18 @@ let asyncMachineMeterCenter = async function (self) {
|
|
|
210
210
|
localeSustainMoney = (localeSustainMoney - 0) + (self.data.f_collection - self.data.f_garbage_fee)
|
|
211
211
|
window.localStorage.setItem('sustainMoney', localeSustainMoney)
|
|
212
212
|
}
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
213
|
+
if (self.config.showupload) {
|
|
214
|
+
let param = []
|
|
215
|
+
for (let row of self.resid) {
|
|
216
|
+
param.push({id: row.id})
|
|
217
|
+
}
|
|
218
|
+
let data = {
|
|
219
|
+
param: param,
|
|
220
|
+
f_blobid: res.data
|
|
221
|
+
}
|
|
221
222
|
|
|
222
|
-
|
|
223
|
+
await self.$resetpost('rs/logic/updatefiles', data)
|
|
224
|
+
}
|
|
223
225
|
|
|
224
226
|
// 开始打票
|
|
225
227
|
if (self.config.hasPrint) {
|
|
@@ -294,6 +296,7 @@ let asyncMachineMeterCenter = async function (self) {
|
|
|
294
296
|
return {
|
|
295
297
|
mjshow: false,
|
|
296
298
|
resid: [], // 存放新增的f_files表中id
|
|
299
|
+
randomBusinessId: '',
|
|
297
300
|
config: {
|
|
298
301
|
showupload: true, // 显示上传
|
|
299
302
|
hasPrint: true, // 默认打票
|
|
@@ -356,6 +359,7 @@ let asyncMachineMeterCenter = async function (self) {
|
|
|
356
359
|
this.totalcost = this.data.f_totalcost
|
|
357
360
|
}
|
|
358
361
|
document.getElementById('f_collection').focus()
|
|
362
|
+
this.getRandomId()
|
|
359
363
|
asyncMachineMeterCenter(this)
|
|
360
364
|
},
|
|
361
365
|
events: {
|
|
@@ -374,6 +378,13 @@ let asyncMachineMeterCenter = async function (self) {
|
|
|
374
378
|
this.showOverdueModal = true
|
|
375
379
|
},
|
|
376
380
|
methods: {
|
|
381
|
+
getRandomId () {
|
|
382
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
383
|
+
let res = Math.random() * 16 | 0
|
|
384
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
385
|
+
return v.toString(16)
|
|
386
|
+
})
|
|
387
|
+
},
|
|
377
388
|
// 校验发票信息
|
|
378
389
|
checkInvoiceMsg () {
|
|
379
390
|
if (this.data.f_print[0] === '电子发票') {
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel' v-ref:printbill></print-bill>
|
|
67
67
|
</div>
|
|
68
68
|
|
|
69
|
-
<upload :blodid="
|
|
69
|
+
<upload :blodid="row.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="退费管理"></upload>
|
|
70
70
|
</template>
|
|
71
71
|
|
|
72
72
|
|
|
@@ -110,6 +110,8 @@
|
|
|
110
110
|
|
|
111
111
|
printModel: {},
|
|
112
112
|
print: false,
|
|
113
|
+
randomBusinessId: '',
|
|
114
|
+
resid: [], // 存放新增的f_files表中id
|
|
113
115
|
billUrl: '',
|
|
114
116
|
billData: {
|
|
115
117
|
url: 'rs/report/refund_sell',
|
|
@@ -124,6 +126,7 @@
|
|
|
124
126
|
props: ['row'],
|
|
125
127
|
ready () {
|
|
126
128
|
readyGen(this)
|
|
129
|
+
this.getRandomId()
|
|
127
130
|
},
|
|
128
131
|
computed: {
|
|
129
132
|
'f_refund_gas' () {
|
|
@@ -131,7 +134,25 @@
|
|
|
131
134
|
return Number(((this.row.f_total_gas - 0) - (this.model.f_meter_base - 0)).toFixed(4))
|
|
132
135
|
}
|
|
133
136
|
},
|
|
137
|
+
events: {
|
|
138
|
+
// 删除Resid数组元素
|
|
139
|
+
'delResid' (val) {
|
|
140
|
+
this.resid.$remove({id: val, f_biobid: ''})
|
|
141
|
+
// this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
|
|
142
|
+
},
|
|
143
|
+
// 增加Resid数组元素
|
|
144
|
+
'resid' (val) {
|
|
145
|
+
this.resid.push({id: val, f_biobid: ''})
|
|
146
|
+
}
|
|
147
|
+
},
|
|
134
148
|
methods: {
|
|
149
|
+
getRandomId () {
|
|
150
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
151
|
+
let res = Math.random() * 16 | 0
|
|
152
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
153
|
+
return v.toString(16)
|
|
154
|
+
})
|
|
155
|
+
},
|
|
135
156
|
async confirm () {
|
|
136
157
|
let param = {
|
|
137
158
|
f_user_id: this.row.f_user_id,
|
|
@@ -157,7 +178,18 @@
|
|
|
157
178
|
}
|
|
158
179
|
|
|
159
180
|
let res = await this.$resetpost('rs/logic/dropTableRefund', {data: param}, {warnMsg: `确定要对用户${this.row.f_user_name}进行退费吗?`, resolveMsg: '退费成功!!', rejectMsg: '退费失败!!请重试!!'})
|
|
160
|
-
|
|
181
|
+
console.log('看一下清零退款返回的数据===>', res)
|
|
182
|
+
if (this.config.showupload) {
|
|
183
|
+
let param = []
|
|
184
|
+
for (let row of this.resid) {
|
|
185
|
+
param.push({id: row.id})
|
|
186
|
+
}
|
|
187
|
+
let data = {
|
|
188
|
+
param: param,
|
|
189
|
+
f_blobid: res.data.id
|
|
190
|
+
}
|
|
191
|
+
await this.$resetpost('rs/logic/updatefiles', data)
|
|
192
|
+
}
|
|
161
193
|
if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint && !this.$login.r.includes('不打印发票')) {
|
|
162
194
|
console.log('this.config.hasBillManage', this.config.hasBillManage)
|
|
163
195
|
if (this.config.hasBillManage) {
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel' v-ref:printbill></print-bill>
|
|
90
90
|
</div>
|
|
91
91
|
|
|
92
|
-
<upload :blodid="data.f_userinfo_id"
|
|
92
|
+
<upload :blodid="data.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="退费管理"></upload>
|
|
93
93
|
</template>
|
|
94
94
|
|
|
95
95
|
|
|
@@ -129,6 +129,8 @@
|
|
|
129
129
|
|
|
130
130
|
blodid: '',
|
|
131
131
|
hasValidateBill: false,
|
|
132
|
+
randomBusinessId: '',
|
|
133
|
+
resid: [], // 存放新增的f_files表中id
|
|
132
134
|
validateOk: false,
|
|
133
135
|
|
|
134
136
|
printModel: {},
|
|
@@ -147,6 +149,7 @@
|
|
|
147
149
|
props: ['data'],
|
|
148
150
|
ready () {
|
|
149
151
|
readyGen(this)
|
|
152
|
+
this.getRandomId()
|
|
150
153
|
if (this.data.f_collection_type === '按气量') {
|
|
151
154
|
// this.$showAlert('按气量缴费的物联网表退费功能尚未开放!!', 'warning', 3000)
|
|
152
155
|
this.model.f_price = this.data.f_price
|
|
@@ -154,7 +157,25 @@
|
|
|
154
157
|
// this.$dispatch('refresh')
|
|
155
158
|
}
|
|
156
159
|
},
|
|
160
|
+
events: {
|
|
161
|
+
// 删除Resid数组元素
|
|
162
|
+
'delResid' (val) {
|
|
163
|
+
this.resid.$remove({id: val, f_biobid: ''})
|
|
164
|
+
// this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
|
|
165
|
+
},
|
|
166
|
+
// 增加Resid数组元素
|
|
167
|
+
'resid' (val) {
|
|
168
|
+
this.resid.push({id: val, f_biobid: ''})
|
|
169
|
+
}
|
|
170
|
+
},
|
|
157
171
|
methods: {
|
|
172
|
+
getRandomId () {
|
|
173
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
174
|
+
let res = Math.random() * 16 | 0
|
|
175
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
176
|
+
return v.toString(16)
|
|
177
|
+
})
|
|
178
|
+
},
|
|
158
179
|
async confirm () {
|
|
159
180
|
let param = {
|
|
160
181
|
f_user_id: this.data.f_user_id,
|
|
@@ -183,6 +204,15 @@
|
|
|
183
204
|
console.log('退费传参', param)
|
|
184
205
|
let res = await this.$resetpost('rs/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗?`, resolveMsg: '退费成功!!', rejectMsg: '退费失败!!请重试!!'})
|
|
185
206
|
console.log('退费', res)
|
|
207
|
+
let param1 = []
|
|
208
|
+
for (let row of this.resid) {
|
|
209
|
+
param1.push({id: row.id})
|
|
210
|
+
}
|
|
211
|
+
let data = {
|
|
212
|
+
param: param1,
|
|
213
|
+
f_blobid: res.data.id
|
|
214
|
+
}
|
|
215
|
+
await this.$resetpost('rs/logic/updatefiles', data)
|
|
186
216
|
console.log('退费this.config', this.config)
|
|
187
217
|
console.log('退费this.model', this.model)
|
|
188
218
|
if (this.config.hasPrint) {
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel' v-ref:printbill></print-bill>
|
|
65
65
|
</div>
|
|
66
66
|
|
|
67
|
-
<upload :blodid="data.f_userinfo_id"
|
|
67
|
+
<upload :blodid="data.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="退费管理"></upload>
|
|
68
68
|
</template>
|
|
69
69
|
|
|
70
70
|
|
|
@@ -104,6 +104,8 @@
|
|
|
104
104
|
|
|
105
105
|
blodid: '',
|
|
106
106
|
hasValidateBill: false,
|
|
107
|
+
randomBusinessId: '',
|
|
108
|
+
resid: [], // 存放新增的f_files表中id
|
|
107
109
|
validateOk: false,
|
|
108
110
|
|
|
109
111
|
printModel: {},
|
|
@@ -127,8 +129,27 @@
|
|
|
127
129
|
} else { */
|
|
128
130
|
readyGen(this)
|
|
129
131
|
/* } */
|
|
132
|
+
this.getRandomId()
|
|
133
|
+
},
|
|
134
|
+
events: {
|
|
135
|
+
// 删除Resid数组元素
|
|
136
|
+
'delResid' (val) {
|
|
137
|
+
this.resid.$remove({id: val, f_biobid: ''})
|
|
138
|
+
// this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
|
|
139
|
+
},
|
|
140
|
+
// 增加Resid数组元素
|
|
141
|
+
'resid' (val) {
|
|
142
|
+
this.resid.push({id: val, f_biobid: ''})
|
|
143
|
+
}
|
|
130
144
|
},
|
|
131
145
|
methods: {
|
|
146
|
+
getRandomId () {
|
|
147
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
148
|
+
let res = Math.random() * 16 | 0
|
|
149
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
150
|
+
return v.toString(16)
|
|
151
|
+
})
|
|
152
|
+
},
|
|
132
153
|
async confirm () {
|
|
133
154
|
let param = {
|
|
134
155
|
f_user_id: this.data.f_user_id,
|
|
@@ -153,7 +174,16 @@
|
|
|
153
174
|
}
|
|
154
175
|
|
|
155
176
|
let res = await this.$resetpost('rs/logic/machineRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗?`, resolveMsg: '退费成功!!', rejectMsg: '退费失败!!请重试!!'})
|
|
156
|
-
|
|
177
|
+
console.log('机表退费返回的数据==========>', res)
|
|
178
|
+
let param1 = []
|
|
179
|
+
for (let row of this.resid) {
|
|
180
|
+
param1.push({id: row.id})
|
|
181
|
+
}
|
|
182
|
+
let data = {
|
|
183
|
+
param: param1,
|
|
184
|
+
f_blobid: res.data.id
|
|
185
|
+
}
|
|
186
|
+
await this.$resetpost('rs/logic/updatefiles', data)
|
|
157
187
|
if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint && !this.$login.r.includes('不打印发票')) {
|
|
158
188
|
console.log('this.config.hasBillManage', this.config.hasBillManage)
|
|
159
189
|
if (this.config.hasBillManage) {
|