From e50e0ab213aceb077922c51af2f69e4b24f8478b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 29 七月 2024 15:53:24 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/orderDetl/show.vue | 41 +++++++++++++++++++++++++++++++----------
zy-asrs-admin/src/components/order/edit.vue | 1 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/UpdateOrderParam.java | 3 +++
4 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/edit.vue b/zy-asrs-admin/src/components/order/edit.vue
index 2cb8a71..c8de695 100644
--- a/zy-asrs-admin/src/components/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/edit.vue
@@ -47,6 +47,7 @@
if (!isSave.value) {
param.deleteDetlId = orderDetlChild.value.deleteDetlId;
+ param.orderId = formData.value.id;
}
post(isSave.value ? '/api/order/save' : '/api/order/update', param).then((resp) => {
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index b9aac26..16ebaa1 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -165,15 +165,22 @@
<template>
<div>
<a-modal v-model:open="openDetl" width="60%" @ok="handleOk">
- <h3>
- 璁㈠崟鍙凤細{{ orderInfo.orderNo }}
- </h3>
- <h3>
- 鍗曟嵁绫诲瀷锛歿{ orderInfo.orderType$ }}
- </h3>
- <h3>
- 鍗曟嵁鐘舵�侊細{{ orderInfo.orderSettle$ }}
- </h3>
+ <div class="component-header">
+ <div>
+ <h3>
+ 璁㈠崟鍙凤細{{ orderInfo.orderNo }}
+ </h3>
+ <h3>
+ 鍗曟嵁绫诲瀷锛歿{ orderInfo.orderType$ }}
+ </h3>
+ <h3>
+ 鍗曟嵁鐘舵�侊細{{ orderInfo.orderSettle$ }}
+ </h3>
+ </div>
+ <div class="qrcode">
+ <a-qrcode :value="orderInfo.orderNo" :size="100" :bordered="false" />
+ </div>
+ </div>
<a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:scroll="{ y: 768 }" :columns="state.columns">
</a-table>
@@ -181,4 +188,18 @@
</div>
</template>
-<style></style>
+<style>
+.component-header {
+ display: flex;
+}
+
+.component-header > div {
+ flex: 1;
+}
+
+.qrcode {
+ display: flex;
+ justify-content: flex-end;
+ margin-right: 30px;
+}
+</style>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/UpdateOrderParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/UpdateOrderParam.java
index f1ad847..d15387a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/UpdateOrderParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/UpdateOrderParam.java
@@ -8,6 +8,9 @@
@Data
public class UpdateOrderParam {
+ //璁㈠崟ID
+ private Long orderId;
+
//璁㈠崟鍙�
private String orderNo;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index d00cda0..84f3d59 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -95,7 +95,7 @@
@Override
public boolean updateOrder(UpdateOrderParam param) {
- Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.getOrderNo()));
+ Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getId, param.getOrderId()));
order.setOrderNo(param.getOrderNo());
order.setOrderType(param.getOrderType());
order.setOrderSettle(param.getOrderSettle());
--
Gitblit v1.9.1