sale-client 4.2.37 → 4.2.38
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 +50 -36
- package/package.json +1 -1
- package/src/App.vue +1 -1
- package/src/components/charge/bzjcancel.vue +57 -4
- package/src/components/revenue/HandManager/MeterBookUser.vue +726 -726
- package/src/components/revenue/base/rightview/CardList.vue +2 -2
- package/src/components/revenue/comprehen/ComprehenOperation/QrPay/QrPaymentDetailed.vue +423 -423
- package/src/components/revenue/comprehen/Maintenance/hand/handOperate.vue +469 -469
- package/src/components/revenue/machineHandManage/ArrearsQuery.vue +938 -938
- package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue +970 -970
- package/src/filiale/alashan/eticket/EticketRecordList.vue +428 -428
- package/src/filiale/bayan/ChargeList.vue +1010 -1010
- package/src/filiale/bayan/StockListmain.vue +543 -543
- package/src/filiale/bazhong/UserInfoDetailManageNew.vue +245 -245
- package/src/filiale/bazhong/ic_detail/ChangeMeterQueryUser.vue +370 -370
- package/src/filiale/bazhong/sale.js +8 -8
- package/src/filiale/beifangshiye/OtherChargeNew.vue +625 -625
- package/src/filiale/jinhong/CardList.vue +2 -2
- package/src/filiale/jinhong/GarbageCharge.vue +4 -5
- package/src/filiale/jinhong/machineHand.vue +2099 -2099
- package/src/filiale/jinhong/plugins/GetSaleParams.js +302 -302
- package/src/filiale/lixianV3/ArrearsQuery.vue +938 -938
- package/src/filiale/lixianV3/InsuranceChargesDetails.vue +425 -425
- package/src/filiale/meihekou/common/userinfo_detail/ic_detail/MachineRecordQuery.vue +281 -281
- package/src/filiale/qianneng/revenue/sms/AccountMessageList.vue +508 -508
- package/src/filiale/ronghao/ArrearsQuery.vue +974 -974
- package/src/filiale/ronghao/CardService.js +2144 -2144
- package/src/filiale/ronghao/InsuranceManage.vue +58 -58
- package/src/filiale/ronghao/MachineChargeService.js +149 -149
- package/src/filiale/ronghao/NoCardMeterCenter.vue +534 -534
- package/src/filiale/ronghao/PaymentCode.vue +174 -174
- package/src/filiale/ronghao/PriceChangeCompensation/CompensationManage.vue +26 -26
- package/src/filiale/ronghao/PriceChangeCompensation/IotCompensation.vue +318 -318
- package/src/filiale/ronghao/PriceChangeCompensation/JbCompensation.vue +343 -343
- package/src/filiale/ronghao/PriceChangeCompensation/SurplusRecordDetail.vue +74 -74
- package/src/filiale/ronghao/ReplaceCardManage.vue +415 -415
- package/src/filiale/ronghao/Upload.vue +654 -654
- package/src/filiale/ronghao/cardDown.vue +1141 -1141
- package/src/filiale/ronghao/changemeterOperate.vue +315 -315
- package/src/filiale/ronghao/fillgasSpecific.vue +313 -313
- package/src/filiale/ronghao/ic_detail/ChargeRecordQuery.vue +106 -106
- package/src/filiale/ronghao/ic_detail/WatchCollection.vue +115 -115
- package/src/filiale/ronghao/ic_detail/WebHandQueryUser.vue +411 -411
- package/src/filiale/ronghao/machineDown.vue +1176 -1176
- package/src/filiale/ronghao/replacementSingleInfoOperation.vue +315 -315
- package/src/filiale/ronghao/specificInformation.vue +537 -537
- package/src/filiale/yangchun/ChargeList.vue +954 -954
- package/src/filiale/yuncheng/changemeterListMaintain.vue +504 -504
- package/src/filiale/zhongsheng/BlackListList.vue +293 -293
- package/src/filiale/zhongyi/HandQueryUser.vue +389 -389
- package/src/main.js +1 -1
- package/src/plugins/CardService.js +2217 -2217
- package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/vcs-1/gc.properties +0 -0
- package/hs_err_pid32452.log +0 -625
- package/hs_err_pid36896.log +0 -249
|
@@ -340,7 +340,7 @@
|
|
|
340
340
|
}
|
|
341
341
|
}
|
|
342
342
|
if (row.type === '物联网收费' || row.type === '卡表赠气' || row.type === '物联网赠费' || row.type === '卡表赠费' || row.type === '物联网赠气') {
|
|
343
|
-
let table_name = this.$appdata.getSingleValue('新抄表')? 't_web_handplan' : 't_handplan'
|
|
343
|
+
let table_name = this.$appdata.getSingleValue('新抄表') ? 't_web_handplan' : 't_handplan'
|
|
344
344
|
let getWebHand = await this.$SqlService.singleTable(table_name, `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_userfiles_id = '${row.f_userfiles_id}'`)
|
|
345
345
|
console.log('长度', getWebHand)
|
|
346
346
|
if (getWebHand.data.length > 0) {
|
|
@@ -474,7 +474,7 @@
|
|
|
474
474
|
name = 'api/af-revenue/report/pre_sell'
|
|
475
475
|
} else if (type === '调价预存') {
|
|
476
476
|
name = 'api/af-revenue/report/refund_sell'
|
|
477
|
-
} else if (type === '退费') {
|
|
477
|
+
} else if (type === '退费' || type === '卡表退费') {
|
|
478
478
|
name = 'api/af-revenue/report/refund_sell'
|
|
479
479
|
} else if (type === '调价补费') {
|
|
480
480
|
name = 'api/af-revenue/report/compensation_bill'
|
|
@@ -73,6 +73,7 @@ let loadGen = async function (self) {
|
|
|
73
73
|
let owes = res.data
|
|
74
74
|
self.refreshCenter(owes)
|
|
75
75
|
}
|
|
76
|
+
console.log('垃圾费收费config', self.config, self.model)
|
|
76
77
|
}
|
|
77
78
|
/**
|
|
78
79
|
*售气收费
|
|
@@ -91,13 +92,13 @@ export default {
|
|
|
91
92
|
payment: '现金',
|
|
92
93
|
billType: '燃气费'
|
|
93
94
|
},
|
|
94
|
-
print:false,
|
|
95
|
+
print: false,
|
|
95
96
|
paytype: this.$appdata.getParam('付款方式'),
|
|
96
97
|
printstyle: this.$appdata.getParam('打印格式'),
|
|
97
98
|
printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
|
|
98
99
|
garbagelist: [],
|
|
99
100
|
billData: {
|
|
100
|
-
url: 'api/af-revenue/report/
|
|
101
|
+
url: 'api/af-revenue/report/garbageChargeReport',
|
|
101
102
|
bill: ''
|
|
102
103
|
},
|
|
103
104
|
garbagefee: 0,
|
|
@@ -109,7 +110,7 @@ export default {
|
|
|
109
110
|
chargeView: false
|
|
110
111
|
}
|
|
111
112
|
},
|
|
112
|
-
props: ['row','cardData'],
|
|
113
|
+
props: ['row', 'cardData'],
|
|
113
114
|
ready () {
|
|
114
115
|
this.initData(this.row)
|
|
115
116
|
this.blodid = this.row.f_userinfo_id
|
|
@@ -152,11 +153,9 @@ export default {
|
|
|
152
153
|
this.row.id = res.data.recordId
|
|
153
154
|
this.row.f_bill_type = '垃圾费'
|
|
154
155
|
this.row.f_bill_style = this.model.f_print
|
|
155
|
-
this.billData.url = 'api/af-revenue/report/garbageChargeReport'
|
|
156
156
|
this.print = true
|
|
157
157
|
} else {
|
|
158
158
|
this.row.id = res.data.recordId
|
|
159
|
-
this.billData.url = 'api/af-revenue/report/garbageChargeReport'
|
|
160
159
|
this.print = true
|
|
161
160
|
}
|
|
162
161
|
} else if (this.config.printType === '国税发票') {
|