diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c006e82b..5aef8fa8 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -26,6 +26,14 @@
+ +
+ + + +
+ +
@@ -92,11 +100,11 @@
-
+
@@ -257,7 +265,7 @@ export default { if(res.code==200){ this.rlKefuURL="https://ykf.7moor.com?token="+res.data; }else{ - this.$modal.msgError("token fail"); + // this.$modal.msgError("token fail"); } }).catch(error => { this.$modal.msgError(error); diff --git a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue index 8d1d97b8..0a6be151 100644 --- a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue +++ b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue @@ -20,14 +20,24 @@ + + + + + + + + + + - + - + @@ -186,9 +196,11 @@ import { getEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuo import { mapGetters } from 'vuex' import {addDateTimeByDay,dateToStr} from '@/utils/custom' -import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; -import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue'; +import CountryMutiSelectPicker from '@/views/emis/EmisBaseTools/CountryMutiSelectPicker.vue'; +import CountryMutiSelectPicker1 from '@/views/emis/EmisBaseTools/CountryMutiSelectPicker.vue'; +import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; +import TransProductMultiplePicker from '@/views/emis/EmisBaseTools/TransProductMultiplePicker.vue'; import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisStaffListPicker from '@/views/emis/EmisBaseTools/EmisStaffListPicker.vue'; @@ -206,8 +218,8 @@ export default { } }, components: { - CountryPicker,CountryPicker1,EmisSiteSimplePicker,EcqExpressionPanel, - EmisStaffListPicker + CountryMutiSelectPicker,CountryMutiSelectPicker1,EmisSiteSimplePicker,EcqExpressionPanel, + EmisStaffListPicker,TransLinePicker,TransProductMultiplePicker }, dicts: ['emis_price_type','emis_fee_type','sys_currency_type', 'emis_commission_post','emis_biz_shipping_method','emis_commission_fee_type'], diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue index fb1b4163..d8a882b6 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue @@ -44,12 +44,6 @@ - @@ -57,6 +51,13 @@ + + diff --git a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue index e842fdf3..85f235a2 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue @@ -173,6 +173,21 @@ + + + + + + diff --git a/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue b/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue index b67ebce2..c9bdeff6 100644 --- a/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SubBillListPanel.vue @@ -241,6 +241,23 @@ {{scope.row.waybillDetail.freight}} + + + + + + + + diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue index 5ec83ca1..f521ef00 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue @@ -23,7 +23,9 @@ 增值税专用发票 其它手工发票 - {{ emisSettleInvoiceRecord.applyMoney }} + {{ emisSettleInvoiceRecord.applyMoney }} + {{ emisSettleInvoiceRecord.addTaxRate }} + ￥{{ emisSettleInvoiceRecord.addOpenMoney }} 未开票 diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue index b5360717..9ba39b72 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue @@ -58,6 +58,21 @@ + + + + + + + + + + + + + + + @@ -313,7 +328,23 @@ {{scope.row.waybillDetail.freight}} {{scope.row.waybillDetail.freight}} - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -494,6 +524,8 @@ export default { custName: null, customerCode: null, customerName: null, + openBillStatus: null, + paymentStatus: null, payee: null, salesmen: null, blSpecialQuote: null, diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 2cb9d21d..b1a94e25 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -221,7 +221,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -1474,7 +1474,7 @@ methods: { this.form.printTypeCheckList=[0,1,5] this.form.destinationCountry=this.form.reciever.country; - if(this.form.packType!=null&&this.form.packType!=''){ + if(this.form.packType&&this.form.packType!=''){ this.form.packType=this.form.packType.split(","); } diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index 88fb12f0..60e586b0 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -1412,12 +1412,10 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - - let newList = this.form.feeItems.filter(item => item.feeCode !== row.feeCode); - - console.log("======>newList===>",newList) this.form.feeItems=newList; + // 删除后重新计算费用 + this.handleCalcFeeItem(); }).catch(() => { })