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] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6=E8=AE=A2?= =?UTF-8?q?=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" /> - +