diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue index 423f2f23..20164775 100644 --- a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue +++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue @@ -54,14 +54,10 @@ - - + + @@ -152,7 +148,7 @@ export default { }, components: { }, - dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', + dicts: ['emis_settlebill_pay_type','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', 'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode' ], @@ -629,24 +625,7 @@ export default { if (j === 'settlePayRecordDetail.payType') { let payType=v['settlePayRecordDetail']['payType']; - if(payType == 1){ - return '微信支付'; - } - else if(payType == 2){ - return '支付宝支付'; - } - else if(payType == 3){ - return '企业微信收款'; - } - else if(payType == 4){ - return '对公付款'; - } - else if(payType == 5){ - return '其他'; - } - else{ - return ''; - } + } if (j === 'settleSubBill.openBillStatus') { let openBillStatus=v['settleSubBill']['openBillStatus']; diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue index 533ca55f..e2232254 100644 --- a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue +++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue @@ -67,6 +67,7 @@ :queryParams="queryParams" :total="total" + @queryTable="getList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" @row-dblclick="onDblClick" @@ -356,6 +357,7 @@ export default { }, handleQuery(){ + console.log("===>handleQuery====>"); this.getList(); }, /** 查询明细列表 */ diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue b/src/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue index ce14cfe3..110e76d8 100644 --- a/src/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue +++ b/src/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue @@ -54,14 +54,10 @@ 退款 - - + + @@ -119,8 +115,7 @@ export default { }, components: { elDateAdvPicker,emisSettlePayRecordForm,SalemanPicker }, - dicts: [ - ], + dicts: ['emis_settlebill_pay_type'], data() { return { // 遮罩层 @@ -466,106 +461,14 @@ export default { return ++index } - if (j === 'waybillDetail.parcelQty') { - return v['waybillDetail']['parcelQty']; + + if (j === 'payType') { + let payType=v['payType']; + return this.selectDictLabel(this.dict.type.emis_settlebill_pay_type,payType); } - if (j === 'waybillDetail.billWeight') { - return v['waybillDetail']['billWeight']; - } - - if (j === 'waybillDetail.totalVolume') { - return v['waybillDetail']['totalVolume']; - } - - if (j === 'waybillDetail.volumeWeight') { - return v['waybillDetail']['volumeWeight']; - } - - if (j === 'waybillDetail.settlementWeight') { - return v['waybillDetail']['settlementWeight']; - } - - if (j === 'waybillDetail.freight') { - return v['waybillDetail']['freight']; - } - - - if (j === 'waybillDetail.productTypeName') { - return v['waybillDetail']['productTypeName']+'('+v['waybillDetail']['timeType']+')'; - } - - - if (j === 'waybillDetail.transLineTypeName') { - return v['waybillDetail']['transLineTypeName']; - } - - if (j === 'waybillDetail.sendCompany') { - return v['waybillDetail']['sendCompany']; - } - - if (j === 'waybillDetail.paymentType') { - let paymentType=v['waybillDetail']['paymentType']; - return this.selectDictLabel(this.dict.type.emis_payment_type,paymentType); - } - - - - if (j === 'settleBillDetail.payee') { - return v['settleBillDetail']['payee']; - } - - if (j === 'settleBillDetail.salesmen') { - return v['settleBillDetail']['salesmen']; - } - - if (j === 'settleBillDetail.recMoney') { - return v['settleBillDetail']['recMoney']; - } - - if (j === 'settleBillDetail.recMoney') { - return v['settleBillDetail']['recMoney']; - } - - if (j === 'settleBillDetail.refundMoney') { - return v['settleBillDetail']['refundMoney']; - } - - if (j === 'settleBillDetail.satisfyMoney') { - return v['settleBillDetail']['satisfyMoney']; - } - - - if (j === 'settleBillDetail.allowanceMoney') { - return v['settleBillDetail']['allowanceMoney']; - } - - if (j === 'settleBillDetail.deductionMoney') { - return v['settleBillDetail']['deductionMoney']; - } - - if (j === 'settleBillDetail.otherMoney') { - return v['settleBillDetail']['otherMoney']; - } - - if (j === 'settlePayRecordDetail.remark') { - return v['settlePayRecordDetail']['remark']; - } - - if (j === 'settlePayRecordDetail.tradeDate') { - return v['settlePayRecordDetail']['tradeDate']; - } - - if (j === 'settleBillDetail.paymentDueDate') { - return v['settleBillDetail']['paymentDueDate']; - } - - if (j === 'settlePayRecordDetail.payId') { - return v['settlePayRecordDetail']['payId']; - } - - if (j === 'settlePayRecordDetail.recType') { - let recType=v['settlePayRecordDetail']['recType']; + if (j === 'recType') { + let recType=v['recType']; if(recType == 1){ return '收款'; } @@ -573,59 +476,8 @@ export default { return '退款'; } } - if (j === 'settlePayRecordDetail.createByName') { - return v['settlePayRecordDetail']['createByName']; - } - if (j === 'settlePayRecordDetail.createTime') { - return v['settlePayRecordDetail']['createTime']; - } - if (j === 'settleBillDetail.settleBillName') { - return v['settleBillDetail']['settleBillName']; - } - if (j === 'settleBillDetail.billMonth') { - return v['settleBillDetail']['billMonth']; - } - if (j === 'settleBillDetail.creditPeriod') { - return v['settleBillDetail']['creditPeriod']; - } - if (j === 'settleBillDetail.custName') { - return v['settleBillDetail']['custName']; - } - if (j === 'settleBillDetail.custName') { - let paymentType=v['waybillDetail']['paymentType']; - if(paymentType==2 || paymentType==4 || paymentType==5 ){ - return v['settleBillDetail']['custName']; - }else{ - return ""; - } - } - - - - if (j === 'settlePayRecordDetail.payType') { - let payType=v['settlePayRecordDetail']['payType']; - if(payType == 1){ - return '微信支付'; - } - else if(payType == 2){ - return '支付宝支付'; - } - else if(payType == 3){ - return '企业微信收款'; - } - else if(payType == 4){ - return '对公付款'; - } - else if(payType == 5){ - return '其他'; - } - else{ - return ''; - } - } if (j === 'settleType') { - if(v['settleType'] == 1){ return '现金收款'; } @@ -637,34 +489,7 @@ export default { } - if (j === 'settleSubBill.openBillStatus') { - let openBillStatus=v['settleSubBill']['openBillStatus']; - if(openBillStatus== 0){ - return '未开票'; - } - else if(openBillStatus == 1){ - return '已开票'; - } - else if(openBillStatus == 2){ - return '部分开票'; - } - else if(openBillStatus == 3){ - return '不开票'; - } - else if(openBillStatus == 4){ - return '已完成'; - } - else{ - return ''; - } - } - if (j === 'settleSubBill.invoicedMoney') { - return v['settleSubBill']['invoicedMoney']; - } - if (j === 'settleSubBill.paymentStatus') { - let paymentStatus=v['settleSubBill']['paymentStatus']; - return this.selectDictLabel(this.dict.type.emis_payment_status,paymentStatus); - } + return v[j] })) diff --git a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue index 2628204f..365dbc5d 100644 --- a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue +++ b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue @@ -167,8 +167,8 @@ - - + + @@ -203,6 +203,7 @@ export default { ], data() { return { + resetRefreshId:null, // 遮罩层 loading: true, // 选中数组 @@ -410,12 +411,15 @@ export default { }, /** 新增按钮操作 */ handleAdd(row) { + this.resetRefreshId="openchbill-"+Math.random().toString(36).substring(3,10); + this.isManaul=false; this.currentId=null; this.openForm= true; this.titleForm = "新增航信开票"; }, handleManualAdd(){ + this.resetRefreshId="openchbill-"+Math.random().toString(36).substring(3,10); this.isManaul=true; this.currentId=null; this.openForm= true; @@ -426,6 +430,7 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { + this.resetRefreshId="openchbill-"+Math.random().toString(36).substring(3,10); this.currentId= row.id || this.ids; this.openForm = true; this.titleForm = "修改"; diff --git a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue index 7ca48036..87e1ea28 100644 --- a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue +++ b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue @@ -127,7 +127,7 @@ - （申请开票金额:￥{{ invoiceApplyData.applyMoney }}) + （申请开票金额:￥{{ invoiceApplyData.applyMoney }}) diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue index f599f144..5bc8fda9 100644 --- a/src/views/emis/emisSettlePayRecord/index.vue +++ b/src/views/emis/emisSettlePayRecord/index.vue @@ -48,6 +48,7 @@ + @@ -110,29 +111,6 @@ @click="handleShowCanlender" >收款日历 - - - - + + @@ -232,8 +206,7 @@ import {timeDiffTime,timeFormat} from '@/utils/dateUtils' export default { name: "EmisSettlePayRecord", components: { elDateAdvPicker,emisSettlePayRecordForm,SalemanPicker }, - dicts: [ - ], + dicts: ['emis_settlebill_pay_type'], data() { return { // 遮罩层