-
+
diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue
index d16a411..c28f39d 100644
--- a/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue
+++ b/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue
@@ -25,7 +25,7 @@
import * as TradeStatisticsApi from '@/api/oms/statistics/trade'
import { CardTitle } from '@/components/Card'
-/** 运营数据卡片 */
+/** 待处理任务卡片 */
defineOptions({ name: 'OperationDataCard' })
const { t } = useI18n()
const router = useRouter() // 路由
From f3e592af18f7164260b6b925b0817c8f2b58ac91 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Mon, 3 Mar 2025 00:03:35 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../saleorder/front/dto/CreateSaleOrderDTO.java | 6 ++++++
.../src/views/oms/customer/index.vue | 2 +-
hangtag-ui/hangtag-ui-front/src/locales/en.ts | 1 +
hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts | 1 +
.../src/views/oms/order/createorder/index.vue | 14 +++++++++++---
.../src/views/oms/saleorder/index.vue | 11 +++++++++--
6 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/dto/CreateSaleOrderDTO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/dto/CreateSaleOrderDTO.java
index e5a9393..1b0227d 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/dto/CreateSaleOrderDTO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/dto/CreateSaleOrderDTO.java
@@ -109,6 +109,12 @@ public class CreateSaleOrderDTO implements Serializable {
*/
private String currency;
+ /**
+ * 订单方式
+ */
+ private String type;
+
+
/**
* 驳回原因
*/
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue
index c94e2b8..301064f 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue
@@ -112,7 +112,7 @@
-
+
diff --git a/hangtag-ui/hangtag-ui-front/src/locales/en.ts b/hangtag-ui/hangtag-ui-front/src/locales/en.ts
index 2da7a73..0f49e43 100644
--- a/hangtag-ui/hangtag-ui-front/src/locales/en.ts
+++ b/hangtag-ui/hangtag-ui-front/src/locales/en.ts
@@ -492,6 +492,7 @@ export default {
waitAudit:'Wait Audit',
waitArrange:'Wait Arrange',
planned:'Planned',
+ copy:'copy',
edit:'edit',
details:'details',
operate:'operate',
diff --git a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts
index ac93191..2100bb1 100644
--- a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts
+++ b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts
@@ -487,6 +487,7 @@ export default {
waitAudit:'待审核',
waitArrange:'待排产',
planned:'已排产',
+ copy:'复制',
edit:'编辑',
details:'详情',
operate:'操作',
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 0fa2f97..c38d298 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
@@ -479,6 +479,7 @@ const list = ref([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
id: null,
+ type: null,
pageNo: 1,
pageSize: 10,
name: null,
@@ -545,7 +546,7 @@ const formData = ref({
rejectReason: '',
})
const isEditState = computed(() => {
- return route.query.id != undefined
+ return route.query.id != undefined && route.query.type == undefined
})
const formRules = reactive({
contactName: [{required: true, message: t('createOrder.ruleMsgContactName'), trigger: 'blur'}],
@@ -694,8 +695,10 @@ const submitPreHandler = (showMsg = true) => {
const addNewBill = () => {
console.log("stepRef.value.getTableData()", stepRef.value.getTableData())
submitPreHandler().then(res => {
+ formData.value.type = queryParams.type
console.log("formData222", formData.value)
- if (formData.value.id) {
+ debugger;
+ if (formData.value.id && formData.value.type==undefined) {
SaleOrderApi.editOrder(formData.value.id, {
...formData.value
}).then(res => {
@@ -723,10 +726,10 @@ const addNewBill = () => {
useMessage().warning("Error：" + e.message ? e.message : e)
})
} else {
+ formData.value.id = null
SaleOrderApi.placeOrder({
...formData.value
}).then(res => {
-
useMessage().confirm(t('createOrder.tipsLoadingOrderCompleted'),{
confirmButtonText: t('createOrder.backHome'),
cancelButtonText: t('createOrder.viewOrder'),
@@ -764,6 +767,7 @@ onMounted(() => {
queryParams.id = '';
if (route.query) {
queryParams.id = route.query.id ?? ''
+ queryParams.type = route.query.type ?? ''
}
})
@@ -831,6 +835,10 @@ onMounted(async () => {
...formData.value,
id: queryParams.id
}
+ if(queryParams.type!= undefined){
+ formData.value.contractCode = null;
+ }
+
console.log("res.saleOrderEntry",res.saleOrderEntry)
stepRef.value.init(res.saleOrderEntry ?? []);
}
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
index 7307405..0a0e20e 100644
--- a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
@@ -233,9 +233,16 @@
:formatter="dateFormatter"
width="180px"
/>
-
+
-
+
+
+
+ {{t('billlist.copy')}}
+
+
Date: Mon, 3 Mar 2025 19:21:33 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/service/user/AdminUserServiceImpl.java | 8 ++++----
.../hangtag-ui-admin/src/views/oms/customer/index.vue | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java
index 632037f..1903b66 100644
--- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java
+++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java
@@ -133,10 +133,10 @@ public class AdminUserServiceImpl implements AdminUserService {
public void updateUser(UserSaveReqVO updateReqVO) {
updateReqVO.setPassword(null); // 特殊：此处不更新密码
updateReqVO.setUsername(updateReqVO.getEmail());
+ validateUsernameUnique(updateReqVO.getId(),updateReqVO.getUsername());
// 1. 校验正确性
AdminUserDO oldUser = validateUserForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getUsername(),
updateReqVO.getMobile(), updateReqVO.getEmail(), updateReqVO.getDeptId(), updateReqVO.getPostIds());
-
// 2.1 更新用户
AdminUserDO updateObj = BeanUtils.toBean(updateReqVO, AdminUserDO.class);
userMapper.updateById(updateObj);
@@ -292,10 +292,10 @@ public class AdminUserServiceImpl implements AdminUserService {
@Override
public AdminUserDO getUser(Long id) {
AdminUserDO adminUserDO = ADMIN_USERS_CACHE.get(id);
- if(FuncUtil.isEmpty(adminUserDO)){
+ //if(FuncUtil.isEmpty(adminUserDO)){
adminUserDO = userMapper.selectById(id);
- ADMIN_USERS_CACHE.put(id,adminUserDO);
- }
+ // ADMIN_USERS_CACHE.put(id,adminUserDO);
+ //}
return adminUserDO;
}
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue
index 301064f..7177f1b 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue
@@ -109,11 +109,11 @@
>
-
-
-
-
-
+
+
+
+
+
From 5cc8a9659234cd7115a925d0f1ad0c1f8e453cdd Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Mon, 3 Mar 2025 20:37:26 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/oms/order/createorder/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 c38d298..777b153 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
@@ -181,7 +181,7 @@
-
+
{
onMounted(() => {
queryParams.id = '';
if (route.query) {
- queryParams.id = route.query.id ?? ''
- queryParams.type = route.query.type ?? ''
+ queryParams.id = route.query.id ?? '';
+ queryParams.type = route.query.type ?? '';
}
})
From ccdc8afaab8e8888e7f12276bf99a8d31a435214 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Mon, 3 Mar 2025 22:01:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../core/rule/dept/DeptDataPermissionRule.java | 1 +
hangtag-module-oms/hangtag-module-oms-biz/pom.xml | 4 ++++
.../saleorder/front/SaleOrderFrontController.java | 10 +++++++---
.../oms/service/saleorder/SaleOrderService.java | 2 +-
.../service/saleorder/SaleOrderServiceImpl.java | 14 ++++++++------
.../src/api/oms/saleorder/index.ts | 4 ++--
.../src/views/oms/order/createorder/index.vue | 2 +-
7 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/src/main/java/cn/hangtag/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java b/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/src/main/java/cn/hangtag/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
index 4b4567b..3e0831f 100644
--- a/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/src/main/java/cn/hangtag/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
+++ b/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/src/main/java/cn/hangtag/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
@@ -123,6 +123,7 @@ public class DeptDataPermissionRule implements DataPermissionRule {
return new EqualsTo(null, null); // WHERE null = null，可以保证返回的数据为空
}
+ if(true) return null;
// 情况三，拼接 Dept 和 User 的条件，最后组合
Expression deptExpression = buildDeptExpression(tableName,tableAlias, deptDataPermission.getDeptIds());
Expression userExpression = buildUserExpression(tableName, tableAlias, deptDataPermission.getSelf(), loginUser.getId());
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/pom.xml b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
index 791e6b1..3685b9c 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
+++ b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
@@ -102,6 +102,10 @@
x-easypdf
3.1.1
+
+ cn.hangtag
+ hangtag-spring-boot-starter-protection
+
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/SaleOrderFrontController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/SaleOrderFrontController.java
index fed8526..5fc3547 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/SaleOrderFrontController.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/SaleOrderFrontController.java
@@ -1,6 +1,7 @@
package cn.hangtag.module.oms.controller.admin.saleorder.front;
import cn.hangtag.framework.common.pojo.CommonResult;
+import cn.hangtag.framework.idempotent.core.annotation.Idempotent;
import cn.hangtag.module.oms.controller.admin.saleorder.front.dto.CreateSaleOrderDTO;
import cn.hangtag.module.oms.service.customer.CustomerService;
import cn.hangtag.module.oms.service.saleorder.SaleOrderService;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
+import java.util.concurrent.TimeUnit;
+
import static cn.hangtag.framework.common.pojo.CommonResult.success;
@Tag(name = "销售订单")
@@ -31,6 +34,7 @@ public class SaleOrderFrontController {
@PostMapping("/placeOrder")
@Operation(summary = "下单")
+ @Idempotent(timeout = 10, timeUnit = TimeUnit.SECONDS, message = "正在创建订单中，请勿重复提交")
public CommonResult placeOrder(@Valid @RequestBody CreateSaleOrderDTO dto) {
return success(saleOrderService.placeOrder(dto));
}
@@ -40,10 +44,10 @@ public class SaleOrderFrontController {
return success(saleOrderService.editOrder(id,dto));
}
- @GetMapping("/details/{id}")
+ @GetMapping("/details/{type}/{id}")
@Operation(summary = "编辑订单")
- public CommonResult placeOrder(@PathVariable Long id) {
- CreateSaleOrderDTO dto = saleOrderService.queryEditOrder(id);
+ public CommonResult placeOrder(@PathVariable String type,@PathVariable Long id) {
+ CreateSaleOrderDTO dto = saleOrderService.queryEditOrder(id,type);
return success(dto);
}
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java
index bf161d3..1688ac5 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java
@@ -136,7 +136,7 @@ public interface SaleOrderService {
* @param id ID
* @return {@link CreateSaleOrderDTO }
*/
- CreateSaleOrderDTO queryEditOrder(Long id);
+ CreateSaleOrderDTO queryEditOrder(Long id,String type);
/**
* 查询上次订单品牌
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 b71fbb9..f0bae57 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
@@ -765,7 +765,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
CustomerDO customerDO = customerMapper.selectById(customerId);
String orderFollowerUser = order.getOrderFollowerUser();
if (StringUtils.isNotBlank(orderFollowerUser) && customerDO!=null) {
- AdminUserDO user = adminUserService.getUser(Long.valueOf("143"));
+ AdminUserDO user = adminUserService.getUser(Long.valueOf(orderFollowerUser));
String email = user.getEmail();
MailSendMessage message = new MailSendMessage();
message.setAccountId(1L);
@@ -784,7 +784,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
@Transactional(rollbackFor = Exception.class)
public Long editOrder(Long id, CreateSaleOrderDTO dto) {
- SaleOrderDO saleOrderDO = checkEditOrder(id);
+ SaleOrderDO saleOrderDO = checkEditOrder(id,null);
// 校验订单
SaleOrderDO order = new SaleOrderDO(dto);
order.setId(saleOrderDO.getId());
@@ -1137,9 +1137,9 @@ public class SaleOrderServiceImpl implements SaleOrderService {
}
@Override
- public CreateSaleOrderDTO queryEditOrder(Long id) {
+ public CreateSaleOrderDTO queryEditOrder(Long id,String type) {
CreateSaleOrderDTO res = new CreateSaleOrderDTO();
- SaleOrderDO saleOrderDO = checkEditOrder(id);
+ SaleOrderDO saleOrderDO = checkEditOrder(id,type);
BeanUtil.copyProperties(saleOrderDO, res);
LambdaQueryWrapper entryQueryWrapper = new LambdaQueryWrapper<>();
entryQueryWrapper.eq(SaleOrderEntryDO::getParentId, saleOrderDO.getId());
@@ -1345,7 +1345,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
}
}
- private SaleOrderDO checkEditOrder(Long id) {
+ private SaleOrderDO checkEditOrder(Long id,String type) {
SaleOrderDO saleOrderDO = saleOrderMapper.selectById(id);
AssertUtil.isEmpty(saleOrderDO, "订单不存在");
String billStatus = saleOrderDO.getBillStatus();
@@ -1353,7 +1353,9 @@ public class SaleOrderServiceImpl implements SaleOrderService {
boolean order1 = BillStatusEnum.isCanEditOrder(billStatus);
BillStatusEnum byValue = BillStatusEnum.getByValue(billStatus);
AssertUtil.isEmpty(byValue, "订单状态异常");
- AssertUtil.isTrue(!order1, byValue.getName() + "状态不允许修改");
+ if(!StringUtils.isNotBlank(type)){
+ AssertUtil.isTrue(!order1, byValue.getName() + "状态不允许修改");
+ }
return saleOrderDO;
}
diff --git a/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts
index bf472d8..6b7d455 100644
--- a/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts
+++ b/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts
@@ -120,8 +120,8 @@ export const SaleOrderApi = {
return await request.post({ url: `/front/oms/sale-order/placeOrder`, data })
},
// 查询编辑订单
- queryEditById: async (id: string) => {
- return await request.get({ url: `/front/oms/sale-order/details/${id}` })
+ queryEditById: async (id: string,type: string) => {
+ return await request.get({ url: `/front/oms/sale-order/details/${type}/${id}` })
},
// 修改订单
editOrder: async (id: string,data: any) => {
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 777b153..c01c060 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
@@ -826,7 +826,7 @@ onMounted(async () => {
}
// 获取订单信息
if (queryParams.id) {
- const res = await SaleOrderApi.queryEditById(queryParams.id);
+ const res = await SaleOrderApi.queryEditById(queryParams.id,queryParams.type);
formData.value = res
formData.value.bizdate = formatDate(new Date(res.bizdate), 'YYYY-MM-DD hh:mm:ss');
that.tmpFormData.planDate = formatDate(new Date(res.plansenddate), 'YYYY-MM-DD');
From c94727c72eb8c611fcca8dc78c50a881493a39a5 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Mon, 3 Mar 2025 22:20:57 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/oms/order/createorder/index.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 c01c060..178b04b 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
@@ -835,8 +835,10 @@ onMounted(async () => {
...formData.value,
id: queryParams.id
}
- if(queryParams.type!= undefined){
+ if(queryParams.type!= undefined){ //复制新增
formData.value.contractCode = null;
+ formData.value.bizdate = null;
+ that.tmpFormData.planDate = calculateDateAfterDays(7);
}
console.log("res.saleOrderEntry",res.saleOrderEntry)