Browse Source

修复开单问题

dev
qb 3 days ago
parent
commit
18e5a30dc5
  1. 6
      src/views/distribution/inventory/CreateOrder.vue
  2. 9
      src/views/waybill/CreateZeroOrder.vue

6
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"
/>
</div>
@ -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)

9
src/views/waybill/CreateZeroOrder.vue

@ -56,11 +56,15 @@
<el-icon><User /></el-icon>
<span style="margin-left: 10px">{{ details.query.openOrderUserName }}</span>
</div>
<el-date-picker
v-model="query.openOrderDate"
:readonly="$route.query.type === 'edit'"
prefix-icon="Calendar"
type="datetime"
:clearable="false"
placeholder="创建时间"
value-format="YYYY-MM-DD HH:mm:ss"
:clearable="false"
/>
</div>
</div>
@ -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 = [];

Loading…
Cancel
Save