diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 7932971c..e85b9a09 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -66,6 +66,7 @@ prefix-icon="Calendar" type="datetime" placeholder="创建时间" + value-format="YYYY-MM-DD HH:mm:ss" :clearable="false" /> @@ -2353,7 +2354,7 @@ const onEditLoad = async () => { details.query.openOrderUserName = details.query.agent; details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName; - details.query.openOrderDate = data.warehouseWaybill.createTime; + details.query.openOrderDate = data.warehouseWaybill.documentMakingTime; details.query.orderCode = data.warehouseWaybill.orderNo; details.query.transportType = details.query.transportType ? details.query.transportType : '1'; details.query.receipt = data.warehouseWaybill.receipt @@ -3774,6 +3775,7 @@ const getTranslationArr = codeArr => { /** 提交 */ const handleSubmit = (formEl: FormInstance | undefined) => { + console.log('details.form :>> ', details.query.openOrderDate); if (!formEl) return; formEl.validate(async valid => { if (!valid) return false; @@ -3782,6 +3784,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => { const timer = setTimeout(async () => { try { + if (!details.query.openOrderDate) return ElMessage.warning('请选择制单时间'); + // if (!details.query.shipperId) // return ElMessage.warning('未选择系统内维护的发货单位,请选择或维护'); // if (!details.query.consigneeId) diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index 92ec3c7f..ca16091f 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -56,11 +56,15 @@ {{ details.query.openOrderUserName }} + @@ -1810,7 +1814,7 @@ const initPageInfo = async () => { delete details.query.warehouseWaybill; details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName; console.log('data :>> ', data); - details.query.openOrderDate = data.warehouseWaybill.createTime; + details.query.openOrderDate = data.warehouseWaybill.documentMakingTime; details.query.orderCode = data.warehouseWaybill.orderNo; // 是否提货 @@ -2952,6 +2956,7 @@ const handleSubmit = async (formEl: FormInstance | undefined) => { // return ElMessage.warning('请选择系统内维护的发货单位,请选择或维护'); // if (!details.query.consigneeId) // return ElMessage.warning('请选择系统内维护的收货单位,请选择或维护'); + if (!details.query.openOrderDate) return ElMessage.warning('请选择制单时间'); let _arr = [];