diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue index 3311746..bfc1749 100644 --- a/src/views/wms/wmsShippingBill/edit.vue +++ b/src/views/wms/wmsShippingBill/edit.vue @@ -14,14 +14,19 @@ /> - - + + - + @@ -43,6 +48,31 @@ + + + + + + - + + + + + {{ proxy?.parseTime(form.arrivalConfirmTime, '{y}-{m}-{d} {h}:{i}:{s}') || '-' }} + + + + + {{ form.arrivalConfirmByName || '-' }} + + + + + + + + + @@ -525,6 +555,19 @@ const isArrivalConfirmApprover = computed(() => { ); }); +const showArrivalConfirmSection = computed(() => { + const hasArrivalConfirmData = + String(form.value.needArrivalConfirm || '') === '1' || + !!form.value.isAllReceiving || + !!form.value.arrivalConfirmTime || + !!form.value.arrivalConfirmByName || + !!form.value.arrivalReceiptOssId; + if (isViewMode.value) { + return hasArrivalConfirmData; + } + return isArrivalConfirmApprover.value; +}); + const isViewMode = computed(() => routeParams.value.type === 'view'); const isDraftFlowStatus = computed(() => { @@ -655,8 +698,16 @@ const initFormData: WmsShippingBillForm = { warehouseName: undefined, outStockBillStatus: '1', // 默认暂存 flowStatus: 'draft', + needArrivalConfirm: undefined, + isAllReceiving: undefined, + arrivalReceiptOssId: undefined, + arrivalConfirmTime: undefined, + arrivalConfirmBy: undefined, + arrivalConfirmByName: undefined, shippingStatus: '1', // 默认待发货 remark: undefined, + createBy: undefined, + createTime: undefined, detailsList: [] };