diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index f0bae57..7b8a18e 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -1353,7 +1353,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { boolean order1 = BillStatusEnum.isCanEditOrder(billStatus); BillStatusEnum byValue = BillStatusEnum.getByValue(billStatus); AssertUtil.isEmpty(byValue, "订单状态异常"); - if(!StringUtils.isNotBlank(type)){ + if(StringUtils.isBlank(type)){ AssertUtil.isTrue(!order1, byValue.getName() + "状态不允许修改"); } return saleOrderDO; diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue index 3c17205..936342f 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue @@ -774,12 +774,14 @@ const addNewBill = () => { } +let copyData = ''; /** 初始化 **/ onMounted(() => { queryParams.id = ''; if (route.query) { queryParams.id = route.query.id ?? ''; queryParams.type = route.query._t ?? ''; + copyData = route.query.type ?? ''; } }) @@ -847,9 +849,11 @@ onMounted(async () => { ...formData.value, id: queryParams.id } - if(queryParams.type!= undefined){ //复制新增 + if(copyData){ //复制新增 formData.value.contractCode = null; formData.value.bizdate = null; + formData.value.id = ''; + queryParams.id = ''; that.tmpFormData.planDate = calculateDateAfterDays(7); }