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"
         <result property="orderId" column="order_id"/>
         <result property="orderCode" column="order_code"/>
         <result property="customerId" column="customer_id"/>
+        <result property="company" column="company"/>
         <result property="salesManager" column="sales_manager"/>
         <result property="orderStatus" column="order_status"/>
         <result property="tradeType" column="trade_type"/>
@@ -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 @@
                     <customer-select style="width: 60%;" v-model="form.customerId" />
                   </el-form-item>
 
+                  <el-form-item label="签约公司" prop="company">
+                      <el-select style="width: 60%;" v-model="form.company">
+                          <el-option v-for="item in order_company" :key="item.value" :label="item.label"
+                                     :value="parseInt(item.value)" />
+                      </el-select>
+                  </el-form-item>
+
                   <el-form-item label="销售经理" prop="salesManager">
                     <el-input style="width: 60%;" v-model="form.salesManager" placeholder="无" />
                   </el-form-item>
@@ -155,6 +162,14 @@
               <customer-select v-model="form.customerId" />
             </el-form-item>
           </el-col>
+            <el-col :span="12">
+                <el-form-item label="签约公司" prop="tradeType">
+                    <el-select v-model="form.company" placeholder="请选择签约公司">
+                        <el-option v-for="item in order_company" :key="item.value" :label="item.label"
+                                   :value="parseInt(item.value)" />
+                    </el-select>
+                </el-form-item>
+            </el-col>
           <el-col :span="12">
             <el-form-item label="销售经理" prop="salesManager">
               <el-input v-model="form.salesManager" style="width: 100%;" placeholder="请输入销售经理" />
@@ -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: {},
       // 表单校验