From e831af1c6b4602c6f773ac70ca5b108a7fa71871 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Tue, 28 Oct 2025 16:00:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E7=AD=BE?=
=?UTF-8?q?=E7=BA=A6=E5=85=AC=E5=8F=B8=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
=?UTF-8?q?-=20=E5=9C=A8=20GearOrder=20=E5=AE=9E=E4=BD=93=E7=B1=BB?=
=?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=20company=20=E5=AD=97=E6=AE=B5-=20?=
=?UTF-8?q?=E5=9C=A8=20GearOrderBo=20=E4=B8=9A=E5=8A=A1=E5=AF=B9=E8=B1=A1?=
=?UTF-8?q?=E4=B8=AD=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0=20company=20?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=20-=20=E6=9B=B4=E6=96=B0=20GearOrderMapper.x?=
=?UTF-8?q?ml=20=E6=98=A0=E5=B0=84=E6=96=87=E4=BB=B6=E4=BB=A5=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=20company=20=E5=AD=97=E6=AE=B5=E7=9A=84=E8=AF=BB?=
=?UTF-8?q?=E5=86=99=20-=20=E5=9C=A8=20GearOrderVo=20=E8=A7=86=E5=9B=BE?=
=?UTF-8?q?=E5=AF=B9=E8=B1=A1=E4=B8=AD=E5=A2=9E=E5=8A=A0=20company=20?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B6=E9=85=8D=E7=BD=AE=20Excel=20?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=B1=9E=E6=80=A7=20-=20=E5=9C=A8=E5=89=8D?=
=?UTF-8?q?=E7=AB=AF=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E7=AD=BE=E7=BA=A6=E5=85=AC=E5=8F=B8=E4=B8=8B=E6=8B=89?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=20-=20=E5=BC=95=E5=85=A5=E5=B9=B6?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=20order=5Fcompany=20=E5=AD=97=E5=85=B8?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=A8=E4=BA=8E=E7=AD=BE=E7=BA=A6=E5=85=AC?=
=?UTF-8?q?=E5=8F=B8=E9=80=89=E9=A1=B9=20-=20=E5=88=9D=E5=A7=8B=E5=8C=96?=
=?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=AD=E7=9A=84=20company=20=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E4=B8=BA=20undefined=20-=20=E5=9C=A8=20Vue=20?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E6=B3=A8=E5=86=8C=20order=5Fcompany?=
=?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/gear/oa/domain/GearOrder.java | 4 ++++
.../com/gear/oa/domain/bo/GearOrderBo.java | 5 ++++
.../com/gear/oa/domain/vo/GearOrderVo.java | 6 +++++
.../resources/mapper/oa/GearOrderMapper.xml | 3 +++
.../src/views/oms/order/panels/orderPage.vue | 24 +++++++++++++++----
gear-ui3/src/views/product/info/index.vue | 1 +
6 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java b/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java
index 8b96679..0761b0c 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java
@@ -36,6 +36,10 @@ public class GearOrder extends BaseEntity {
* 客户ID
*/
private Long customerId;
+ /**
+ * 签约公司（字典）
+ */
+ private Integer company;
/**
* 销售经理
*/
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java
index 3af6c8f..1f7d775 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java
@@ -38,6 +38,11 @@ public class GearOrderBo extends BaseEntity {
*/
private Long customerId;
+ /**
+ * 签约公司（字典）
+ */
+ private Integer company;
+
/**
* 销售经理
*/
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java
index c26b427..f24f775 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java
@@ -43,6 +43,12 @@ public class GearOrderVo extends BaseEntity {
@ExcelProperty(value = "客户ID")
private Long customerId;
+ /**
+ * 签约公司（字典）
+ */
+ @ExcelProperty(value = "签约公司")
+ private Integer company;
+
/**
* 销售经理
*/
diff --git a/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml
index dcc0434..574d793 100644
--- a/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml
+++ b/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -24,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select o.order_id,
o.order_code,
o.customer_id,
+ o.company,
o.sales_manager,
o.order_status,
o.remark,
@@ -43,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select o.order_id,
o.order_code,
o.customer_id,
+ o.company,
o.sales_manager,
o.order_status,
o.remark,
diff --git a/gear-ui3/src/views/oms/order/panels/orderPage.vue b/gear-ui3/src/views/oms/order/panels/orderPage.vue
index eadfbc1..1c79f31 100644
--- a/gear-ui3/src/views/oms/order/panels/orderPage.vue
+++ b/gear-ui3/src/views/oms/order/panels/orderPage.vue
@@ -75,6 +75,13 @@
+
+
+
+
+
+
@@ -155,6 +162,14 @@
+
+
+
+
+
+
+
@@ -219,12 +234,12 @@ export default {
},
setup() {
const { proxy } = getCurrentInstance();
- const { order_status } = proxy.useDict("order_status");
-
- console.log(order_status);
+ const { order_status} = proxy.useDict("order_status");
+ const { order_company } = proxy.useDict("order_company");
return {
- order_status
+ order_status,
+ order_company
}
},
computed: {
@@ -271,6 +286,7 @@ export default {
orderId: undefined,
orderCode: undefined,
customerId: undefined,
+ company:undefined,
salesManager: undefined,
// tradeType: this.tradeType,
noTaxAmount: undefined,
diff --git a/gear-ui3/src/views/product/info/index.vue b/gear-ui3/src/views/product/info/index.vue
index 75f0bad..0691e0c 100644
--- a/gear-ui3/src/views/product/info/index.vue
+++ b/gear-ui3/src/views/product/info/index.vue
@@ -185,6 +185,7 @@ export default {
innerDiameter: undefined,
isEnabled: undefined,
},
+ categoryList: [],
// 表单参数
form: {},
// 表单校验