From 55feb08407eda2423df30c0b0692f1d0b1f0e6cb Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 20 Oct 2024 15:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/customer/vo/CustomerSaveReqVO.java  | 18 ++++++
 .../dal/dataobject/customer/CustomerDO.java   | 15 +++++
 .../src/views/oms/customer/CustomerForm.vue   | 56 +++++++++++++++----
 .../components/CustomerAddressForm.vue        |  2 +-
 4 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java
index 5ca029f..8be19ab 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java
@@ -54,6 +54,24 @@ public class CustomerSaveReqVO {
     @Schema(description = "备注")
     private String remarks;
 
+    /**
+     * 发票抬头
+     */
+    @Schema(description = "发票抬头")
+    private String invoiceCode;
+
+    /**
+     * 发票名称
+     */
+    @Schema(description = "发票名称")
+    private String invoiceName;
+
+    /**
+     * 发票地址
+     */
+    @Schema(description = "发票地址")
+    private String invoiceAddress;
+
     @Schema(description = "订单地址列表")
     private List<CustomerAddressDO> customerAddresss;
 
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java
index b90f744..a0019e6 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java
@@ -79,6 +79,21 @@ public class CustomerDO extends BaseDO {
      * 备注
      */
     private String remarks;
+
+    /**
+     * 发票抬头
+     */
+    private String invoiceCode;
+
+    /**
+     * 发票名称
+     */
+    private String invoiceName;
+
+    /**
+     * 发票地址
+     */
+    private String invoiceAddress;
     /**
      * 数据状态
      *
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue
index 596f1f0..969fb4e 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue
@@ -7,37 +7,66 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="编码" prop="number">
-        <div class="flex w-full">
-          <el-input v-model="formData.number" :placeholder="formData.id==null?'编码为空时自动生成':''" :disabled="!inputCode" />
-          <el-button @click=" inputCode = true">手动输入</el-button>
-        </div>
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入名称" />
-      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="编码" prop="number">
+            <div class="flex w-full">
+              <el-input v-model="formData.number" :placeholder="formData.id==null?'编码为空时自动生成':''" :disabled="!inputCode" />
+              <el-button @click=" inputCode = true">手动输入</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
       <el-form-item label="公司" prop="company">
         <el-input v-model="formData.company" placeholder="请输入公司" />
       </el-form-item>
+        </el-col>
+          <el-col :span="12">
       <el-form-item label="公司地址" prop="companyAddress">
         <el-input v-model="formData.companyAddress" placeholder="请输入公司地址" />
       </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
       <el-form-item label="邮箱" prop="email">
         <el-input v-model="formData.email" placeholder="请输入邮箱" />
       </el-form-item>
+        </el-col>
+        <el-col :span="12">
       <el-form-item label="联系人" prop="contacts">
         <el-input v-model="formData.contacts" placeholder="请输入联系人" />
       </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
       <el-form-item label="联系人手机号" prop="phone">
         <el-input v-model="formData.phone" placeholder="请输入联系人手机号" />
       </el-form-item>
+        </el-col>
+          <el-col :span="12">
       <el-form-item label="跟单员" prop="gdperson">
         <el-input v-model="formData.gdperson" placeholder="请输入跟单员" />
       </el-form-item>
+          </el-col>
+      </el-row>
 
+      <el-row>
+        <el-col :span="12">
       <el-form-item label="销售员" prop="saleperson">
         <el-input v-model="formData.saleperson" placeholder="请输入销售员" />
       </el-form-item>
+        </el-col>
+          <el-col :span="12">
       <el-form-item label="所属地区" prop="areaId">
         <el-cascader
           v-model="formData.areaId"
@@ -49,14 +78,21 @@
           placeholder="请选择城市"
         />
       </el-form-item>
+        </el-col>
+      </el-row>
 
+      <el-row>
+        <el-col :span="12">
       <el-form-item label="发票抬头" prop="invoiceCode">
         <el-input v-model="formData.invoiceCode" placeholder="请输入发票抬头" />
       </el-form-item>
-
+        </el-col>
+        <el-col :span="12">
       <el-form-item label="发票名称" prop="invoiceName">
         <el-input v-model="formData.invoiceName" placeholder="请输入发票名称" />
       </el-form-item>
+        </el-col>
+      </el-row>
 
       <el-form-item label="发票地址" prop="invoiceAddress">
         <el-input v-model="formData.invoiceAddress" placeholder="请输入发票地址" />
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/components/CustomerAddressForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/components/CustomerAddressForm.vue
index 8a0f6d6..530b956 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/components/CustomerAddressForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/components/CustomerAddressForm.vue
@@ -78,7 +78,7 @@
     </el-table>
   </el-form>
   <el-row justify="center" class="mt-3">
-    <el-button @click="handleAdd" round>+ 添加用户地址</el-button>
+    <el-button @click="handleAdd" round>+ 添加客户地址</el-button>
   </el-row>
 </template>
 <script setup lang="ts">