diff --git a/src/components/TabBar/index.vue b/src/components/TabBar/index.vue index 29dd664..a20466c 100644 --- a/src/components/TabBar/index.vue +++ b/src/components/TabBar/index.vue @@ -112,6 +112,7 @@ onLaunch(() => { height: 35rpx; } ::v-deep .custom-tabbar { + z-index: 999; > view { > view { background: #ffffff; diff --git a/src/pagesReceive/components/detail.vue b/src/pagesReceive/components/detail.vue index b85bb3d..9428615 100644 --- a/src/pagesReceive/components/detail.vue +++ b/src/pagesReceive/components/detail.vue @@ -103,7 +103,9 @@ import SmallModal from "@/components/Modal/smallModal.vue"; import { OrderType, ScaleStatus } from "@/utils/enum"; const props = withDefaults( - defineProps(), + defineProps<{ + currentOrder: any; + }>(), { currentOrder: {}, } diff --git a/src/pagesShipment/review/index.vue b/src/pagesShipment/review/index.vue index 9e65387..9371fce 100644 --- a/src/pagesShipment/review/index.vue +++ b/src/pagesShipment/review/index.vue @@ -114,12 +114,30 @@ " > - {{ item.name }}:{{ item.name }} + + + + + : {{ item.isBefore ? item.unit : "" }} {{ - (state.order.netWeight || 0) - (state.order.settlementNet || 0) + (state.order.netWeight || 0) - + (state.order.settlementWeight || 0) }} @@ -295,11 +313,23 @@ const gridList3 = reactive([ {}, { name: "结算净重", + enName: "settlementNet", + num: 0, + unit: "KG", + isBefore: false, + isTip: true, + info: "基地或钢厂出具结算单的毛重-皮重", + }, + { + name: "结算重量", enName: "settlementWeight", num: 0, unit: "KG", isBefore: false, + isTip: true, + info: "基地或钢厂出具结算单的毛重-皮重-扣杂", }, + { name: "结算单价", enName: "unitPrice", @@ -356,6 +386,8 @@ const gridList3 = reactive([ num: "", unit: "KG", isBefore: false, + isTip: true, + info: "货场过磅净重-结算净重", }, ]); // 立即收款 // 先填写结算信息后更新状态为4 @@ -443,7 +475,7 @@ const init = () => { if (item.name === "净重误差") { item.num = (state.order as any).netWeight - - (state.order as any).settlementNet; + (state.order as any).settlementWeight; } item.num = state.order[item.enName as string]; });