diff --git a/src/PagesStatistics/businessOverview.vue b/src/PagesStatistics/businessOverview.vue index 32077f2..7c4f840 100644 --- a/src/PagesStatistics/businessOverview.vue +++ b/src/PagesStatistics/businessOverview.vue @@ -22,7 +22,8 @@ {{ item.name }}:{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal) }} + >{{ item.isBefore ? item.unit : "" }} + {{ formatMoney(item.num, item.decimal) }} {{ item.isBefore ? "" : item.unit }} @@ -30,10 +31,13 @@ - {{ item.name }}:{{ item.name }}: + - {{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal) }} + {{ item.isBefore ? item.unit : "" }} + {{ formatMoney(item.num, item.decimal) }} {{ item.isBefore ? "" : item.unit }} @@ -43,7 +47,8 @@ {{ item.name }}:{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal)}} + >{{ item.isBefore ? item.unit : "" }} + {{ formatMoney(item.num, item.decimal) }} {{ item.isBefore ? "" : item.unit }} @@ -106,9 +111,6 @@ const handleOk = (v: any) => { currentTab.value = 5; getOverview(); }; -const randomNum = (index: number) => { - return Math.floor(Math.random() * (10000 - 1 + 1)) + 1 + index; -}; const gridList1 = reactive([ { @@ -202,7 +204,6 @@ const gridList2 = reactive([ num: "", isHighLight: true, decimal: 0, - }, { name: "", diff --git a/src/PagesStatistics/customer/detail.vue b/src/PagesStatistics/customer/detail.vue index cd451df..051463f 100644 --- a/src/PagesStatistics/customer/detail.vue +++ b/src/PagesStatistics/customer/detail.vue @@ -42,9 +42,17 @@ {{ item.name }}:{{ item.isBefore ? item.unit : "" }} - {{ item.num }} + > + {{ item.isBefore ? item.unit : "" }} + + + {{ + (state.order.netWeight || 0) - + (state.order.settlementNet || 0) + }} + + {{ item.num }} + {{ item.isBefore ? "" : item.unit }} diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue index e951743..76847ea 100644 --- a/src/pagesShipment/form/settlementForm.vue +++ b/src/pagesShipment/form/settlementForm.vue @@ -325,7 +325,7 @@ const formAttrList = reactive([ model1.order.incidentals = null; model1.order.realIncome = null; model1.order.paymentMethodName = null; - model1.order.settlementNotes = ''; + model1.order.settlementNotes = ""; } recordSettlementUnit.value = v; }, @@ -778,8 +778,9 @@ onLoad((option) => { }), settlementUnit: res.data.settlementUnit !== null ? res.data.settlementUnit : 1, + settlementWeight: res.data.settlementWeight, + estimatePrice: res.data.estimatePrice, }; - recordSettlementUnit.value = model1.order.settlementUnit; } }); diff --git a/src/pagesShipment/review/index.vue b/src/pagesShipment/review/index.vue index e1bf986..1693c8b 100644 --- a/src/pagesShipment/review/index.vue +++ b/src/pagesShipment/review/index.vue @@ -236,10 +236,7 @@ const contrlModalParams = reactive<{ [attrName: string]: any }>({ ], }, }); -const state = reactive<{ - order: Shipment; - [attrName: string]: any; -}>({ +const state = reactive({ order: { id: "", buttonType: 0,