Handy_Cao 7 mesiacov pred
rodič
commit
073078c23e

+ 5 - 4
src/packages/pc/views/query/internal/offlinedelivery/components/details/index.vue

@@ -46,6 +46,7 @@ const props = defineProps({
 
 const { t } = i18n.global
 const goodsunitEnum = useEnum('goodsunit')
+const deliveryOrderStatusEnum = useEnum('deliveryOrderStatus')
 const show = shallowRef(true)
 
 const { data } = useRequest(queryOfflineDetail, {
@@ -70,12 +71,12 @@ const detailProps = computed<CellProp[]>(() => [
     { prop: 'matchname', label: 'query.internal.offlinedelivery.details.matchname' },
     { prop: 'deliveryinfo', label: 'query.internal.offlinedelivery.details.deliveryinfo' },
     { prop: 'reqtime', label: 'query.internal.offlinedelivery.details.reqtime', formatValue: (val) => formatDate(val) },
-    { prop: 'orderstatusdisplay', label: 'query.internal.offlinedelivery.details.orderstatusdisplay' },
+    { prop: 'orderstatus', label: 'query.internal.offlinedelivery.details.orderstatusdisplay', formatValue: (val) => deliveryOrderStatusEnum.getEnumTypeName(val) },
     { prop: 'remark', label: 'query.internal.offlinedelivery.details.remark' },
     { prop: 'deliverycharge', label: 'query.internal.offlinedelivery.details.deliverycharge' },
-    { prop: 'totalpricemove', label: '总升贴水', show: !!data.value?.totalpricemove },
-    { prop: 'totalshippingfee', label: '总运费', show: !!data.value?.totalshippingfee },
-    { prop: 'totalotherfee', label: '总其它费用', show: !!data.value?.totalotherfee },
+    { prop: 'totalpricemove', label: 'query.internal.offlinedelivery.details.totalpricemove', show: !!data.value?.totalpricemove },
+    { prop: 'totalshippingfee', label: 'query.internal.offlinedelivery.details.totalshippingfee', show: !!data.value?.totalshippingfee },
+    { prop: 'totalotherfee', label: 'query.internal.offlinedelivery.details.totalotherfee', show: !!data.value?.totalotherfee },
     { prop: 'closetime', label: 'query.internal.offlinedelivery.details.closetime', formatValue: (val) => formatDate(val) },
 ])
 

+ 1 - 0
src/types/model/order.d.ts

@@ -1515,6 +1515,7 @@ declare namespace Model {
         goodunitid: number;
         matchname: string; // 对手方
         orderstatusdisplay: string; // 交收状态
+        orderstatus: number;
         remark: string; // 备注
         reqtime: string; // 申请时间
         sucdeliveryqty: number; // 实际交收数量