From bb7fe42b169bd8a95e80640d6633c743ed7fe023 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Thu, 25 Apr 2024 09:04:29 +0800
Subject: [PATCH] =?UTF-8?q?[update]=E4=B8=9A=E5=8A=A1=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=9A=E5=8A=A1=E5=9B=A2=E9=98=9F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=983~=E4=B8=9A=E5=8A=A1=E5=91=988,?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=9C=8D=E5=8A=A1=E5=91=981~=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=9C=8D=E5=8A=A1=E5=91=984=E5=AD=97=E6=AE=B5,?=
 =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/erp/domain/ErpUtbItem.java |  4 +-
 .../main/resources/templates/erp/utb/add.html | 18 ++---
 .../resources/templates/erp/utb/edit.html     | 71 ++++++++++++++++---
 .../main/resources/templates/erp/utb/utb.html |  4 +-
 4 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java
index 2b37721c..96a10746 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpUtbItem.java
@@ -60,9 +60,9 @@ public class ErpUtbItem extends BaseEntity
     private String serverPeople1;
     @Excel(name = "业务服务员2")
     private String serverPeople2;
-    @Excel(name = "业务服务员1")
+    @Excel(name = "业务服务员3")
     private String serverPeople3;
-    @Excel(name = "业务服务员2")
+    @Excel(name = "业务服务员4")
     private String serverPeople4;
 
     /** 经理 */
diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/add.html b/ruoyi-admin/src/main/resources/templates/erp/utb/add.html
index 9950d44c..575e470d 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/utb/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/utb/add.html
@@ -53,23 +53,23 @@
                         </div>
                         <label class="col-sm-4 control-label">业务员3：</label>
                         <div class="col-sm-8">
-                            <input name="salesman3" class="form-control" type="text">
+                            <input name="salesman4" class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员4：</label>
                         <div class="col-sm-8">
-                            <input name="salesman4" class="form-control" type="text">
+                            <input name="salesman5" class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员5：</label>
                         <div class="col-sm-8">
-                            <input name="salesman5" class="form-control" type="text">
+                            <input name="salesman6" class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员6：</label>
                         <div class="col-sm-8">
-                            <input name="salesman6" class="form-control" type="text">
+                            <input name="salesman7" class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员7：</label>
                         <div class="col-sm-8">
-                            <input name="salesman7" class="form-control" type="text">
+                            <input name="salesman8" class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员8：</label>
                         <div class="col-sm-8">
@@ -86,19 +86,19 @@
                     <div class="col-xs-8">
                         <label class="col-sm-4 control-label">业务服务员1：</label>
                         <div class="col-sm-8">
-                            <input  class="form-control" type="text">
+                            <input name="serverPeople1" class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员服务2：</label>
                         <div class="col-sm-8">
-                            <input  class="form-control" type="text">
+                            <input name="serverPeople2"  class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员服务3：</label>
                         <div class="col-sm-8">
-                            <input  class="form-control" type="text">
+                            <input  name="serverPeople3" class="form-control" type="text">
                         </div>
                         <label class="col-sm-4 control-label">业务员服务4：</label>
                         <div class="col-sm-8">
-                            <input  class="form-control" type="text">
+                            <input name="serverPeople4"  class="form-control" type="text">
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/edit.html b/ruoyi-admin/src/main/resources/templates/erp/utb/edit.html
index c422c34e..f0399c32 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/utb/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/utb/edit.html
@@ -7,49 +7,104 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-utb-edit" th:object="${erpUtbItem}">
             <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">业务团队ID：</label>
                 <div class="col-sm-8">
                     <input name="utbId" th:field="*{utbId}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">团队名称：</label>
                 <div class="col-sm-8">
                     <input name="utbName" th:field="*{utbName}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">业务员1：</label>
                 <div class="col-sm-8">
                     <input name="salesman1" th:field="*{salesman1}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">业务员2：</label>
                 <div class="col-sm-8">
                     <input name="salesman2" th:field="*{salesman2}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">业务员3：</label>
                 <div class="col-sm-8">
                     <input name="salesman3" th:field="*{salesman3}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
+                <label class="col-sm-3 control-label">业务员4：</label>
+                <div class="col-sm-8">
+                    <input name="salesman1" th:field="*{salesman4}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">业务员5：</label>
+                <div class="col-sm-8">
+                    <input name="salesman2" th:field="*{salesman5}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">业务员6：</label>
+                <div class="col-sm-8">
+                    <input name="salesman3" th:field="*{salesman6}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">业务员7：</label>
+                <div class="col-sm-8">
+                    <input name="salesman1" th:field="*{salesman7}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">业务员8：</label>
+                <div class="col-sm-8">
+                    <input name="salesman2" th:field="*{salesman8}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="container">
+                <div class="form-header">
+                    <h4>业务服务员</h4>
+                </div>
+                <div class="form-row">
+                    <div class="col-xs-8">
+                        <label class="col-sm-4 control-label">业务服务员1：</label>
+                        <div class="col-sm-8">
+                            <input name="serverPeople1" th:field="*{serverPeople1}" class="form-control" type="text">
+                        </div>
+                        <label class="col-sm-4 control-label">业务员服务2：</label>
+                        <div class="col-sm-8">
+                            <input name="serverPeople2" th:field="*{serverPeople2}"  class="form-control" type="text">
+                        </div>
+                        <label class="col-sm-4 control-label">业务员服务3：</label>
+                        <div class="col-sm-8">
+                            <input  name="serverPeople3" th:field="*{serverPeople3}" class="form-control" type="text">
+                        </div>
+                        <label class="col-sm-4 control-label">业务员服务4：</label>
+                        <div class="col-sm-8">
+                            <input name="serverPeople4" th:field="*{serverPeople4}" class="form-control" type="text">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
                 <label class="col-sm-3 control-label">经理：</label>
                 <div class="col-sm-8">
                     <input name="manage" th:field="*{manage}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">主管：</label>
                 <div class="col-sm-8">
                     <input name="manager" th:field="*{manager}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">备注：</label>
                 <div class="col-sm-8">
                     <input name="remark" th:field="*{remark}" class="form-control" type="text">
diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
index b76f1de2..5488eb76 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
@@ -20,11 +20,11 @@
                             </li>
                             <li>
                                 <label>业务员：</label>
-                                <input type="text" name="salesMan"/>
+                                <input type="text" name="salesman"/>
                             </li>
                             <li>
                                 <label>业务服务员2：</label>
-                                <input type="text" name="serverMan"/>
+                                <input type="text" name="serverPeople"/>
                             </li>
                             <li class="select-time">
                                 <label>录入时间：</label>