From 947948502ab12731dd7d9f984b17d01a0313e299 Mon Sep 17 00:00:00 2001
From: wangjiuyun <1595161655@qq.com>
Date: Fri, 23 May 2025 11:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/manage/order/add.html |   2 +-
 .../templates/manage/order/edit.html          |   2 +-
 .../templates/system/agent/agent.html         |  26 +++-
 .../templates/system/customer/add.html        | 128 +++++++++---------
 .../templates/system/customer/info.html       |  42 ++++--
 .../templates/system/partner/partner.html     |  33 ++++-
 6 files changed, 156 insertions(+), 77 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
index c8d43b08..7d8d943c 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
@@ -105,7 +105,7 @@
                     <div class="input-group">
                         <input name="customerName" class="form-control" type="text" required
                                onclick="selectCustomer()">
-                        <span class="input-group-addon" style="width: 40px !important;"><i
+                        <span class="input-group-addon"><i
                                 class="fa fa-search"></i></span>
                     </div>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index f8fd060c..5f82f359 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -109,7 +109,7 @@
                     <div class="input-group">
                         <input name="customerName" th:field="*{customerName}" class="form-control" type="text"
                                required onclick="selectCustomer()">
-                        <span class="input-group-addon" style="width: 40px !important;"><i
+                        <span class="input-group-addon"><i
                                 class="fa fa-search"></i></span>
                     </div>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
index bb39c136..a2754640 100644
--- a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
+++ b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
@@ -3,13 +3,14 @@
 <head>
     <th:block th:include="include :: header('办事处信息列表')" />
 </head>
+
 <body class="gray-bg">
      <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse">
                 <form id="formId">
                     <div class="select-list">
-                        <ul>
+                        <ul id="element1">
                             <li>
                                 <label>办事处编码：</label>
                                 <input type="text" name="agentCode"/>
@@ -18,6 +19,18 @@
                                 <label>办事处名称：</label>
                                 <input type="text" name="agentName"/>
                             </li>
+                            <li>
+                                <label>所在省：</label>
+                                <select name="province" class="province form-control" data-first-title="选择省">
+                                    <option value="">请选择</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>所在市：</label>
+                                <select name="city" class="city form-control" data-first-title="选择省">
+                                    <option value="">请选择</option>
+                                </select>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -47,6 +60,8 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: jquery-cxselect-js"/>
+
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:agent:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:agent:remove')}]];
@@ -100,6 +115,15 @@
                 }]
             };
             $.table.init(options);
+
+            var urlChina = '/cnarea/select';
+            $.cxSelect.defaults.url = urlChina;
+            // $.cxSelect.defaults.jsonSpace = 'data';
+            $('#element1').cxSelect({
+                selects: ['province', 'city'],
+                nodata: 'none'
+
+            });
         });
     </script>
 </body>
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
index d9ffb032..3394e06e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -1,58 +1,58 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('新增客户信息')" />
-    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: header('新增客户信息')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
 </head>
 <body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-info-add">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-info-add">
+        <div class="col-xs-6">
+            <div class="form-group">
+                <label class="col-sm-4 control-label is-required">客户编码：</label>
+                <div class="col-sm-8">
+                    <input name="customerCode" class="form-control" type="text" required>
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6">
+            <div class="form-group">
+                <label class="col-sm-4 control-label">客户名称：</label>
+                <div class="col-sm-8">
+                    <input name="customerName" class="form-control" type="text">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6">
+            <div class="form-group">
+                <label class="col-sm-4 control-label">客户邮编：</label>
+                <div class="col-sm-8">
+                    <input name="customerPostcode" class="form-control" type="text">
+                </div>
+            </div>
+        </div>
+        <div id="element1" class="col-xs-12" style="padding: 0">
             <div class="col-xs-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">客户编码：</label>
+                    <label class="col-sm-4 control-label">省：</label>
                     <div class="col-sm-8">
-                        <input name="customerCode" class="form-control" type="text" required>
+                        <select name="province" class="province form-control m-b" data-first-title="选择省">
+                            <option value="">请选择</option>
+                        </select>
                     </div>
                 </div>
             </div>
             <div class="col-xs-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">客户名称：</label>
+                    <label class="col-sm-4 control-label">市：</label>
                     <div class="col-sm-8">
-                        <input name="customerName" class="form-control" type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="col-xs-6">
-                <div class="form-group">
-                    <label class="col-sm-4 control-label">客户邮编：</label>
-                    <div class="col-sm-8">
-                        <input name="customerPostcode" class="form-control" type="text">
-                    </div>
-                </div>
-            </div>
-            <div id="element1" class="col-xs-12" style="padding: 0">
-                <div class="col-xs-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">省：</label>
-                        <div class="col-sm-8">
-                            <select name="province"  class="province form-control m-b" data-first-title="选择省">
-                                <option value="">请选择</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-            <div class="col-xs-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">市：</label>
-                        <div class="col-sm-8">
-                            <select name="city" class="city form-control m-b" data-first-title="选择省">
-                                <option value="">请选择</option>
-                            </select>
+                        <select name="city" class="city form-control m-b" data-first-title="选择省">
+                            <option value="">请选择</option>
+                        </select>
 
-                        </div>
                     </div>
                 </div>
+            </div>
             <div class="col-xs-6">
                 <div class="form-group">
                     <label class="col-sm-4 control-label">详细地址：</label>
@@ -89,8 +89,10 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">所属行业：</label>
                     <div class="col-sm-8">
-                        <select name="industryType" class="form-control" th:with="type=${@dict.getType('industry_code')}" required>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        <select name="industryType" class="form-control"
+                                th:with="type=${@dict.getType('industry_code')}" required>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                    th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
                 </div>
@@ -103,33 +105,33 @@
                     </div>
                 </div>
             </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <th:block th:include="include :: jquery-cxselect-js" />
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: jquery-cxselect-js"/>
 
-    <script th:inline="javascript">
-        var prefix = ctx + "system/customer"
-        $("#form-info-add").validate({
-            focusCleanup: true
-        });
+<script th:inline="javascript">
+    var prefix = ctx + "system/customer"
+    $("#form-info-add").validate({
+        focusCleanup: true
+    });
 
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-info-add').serialize());
-            }
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/add", $('#form-info-add').serialize());
         }
+    }
 
-        var urlChina = '/cnarea/select';
-        $.cxSelect.defaults.url = urlChina;
-        // $.cxSelect.defaults.jsonSpace = 'data';
-        $('#element1').cxSelect({
-            selects: ['province', 'city'],
-            nodata: 'none'
+    var urlChina = '/cnarea/select';
+    $.cxSelect.defaults.url = urlChina;
+    // $.cxSelect.defaults.jsonSpace = 'data';
+    $('#element1').cxSelect({
+        selects: ['province', 'city'],
+        nodata: 'none'
 
-        });
+    });
 
-    </script>
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/info.html b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
index 83b21b7a..efa82ab1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
@@ -9,7 +9,7 @@
             <div class="col-sm-12 search-collapse">
                 <form id="formId">
                     <div class="select-list">
-                        <ul>
+                        <ul id="element1">
                             <li>
                                 <label>客户编码：</label>
                                 <input type="text" name="customerCode"/>
@@ -22,18 +22,23 @@
                                 <label>客户邮编：</label>
                                 <input type="text" name="customerPostcode"/>
                             </li>
-                            <li>
-                                <label>所在省：</label>
-                                <input type="text" name="province"/>
-                            </li>
-                            <li>
-                                <label>所在市：</label>
-                                <input type="text" name="city"/>
-                            </li>
                             <li>
                                 <label>详细地址：</label>
                                 <input type="text" name="address"/>
                             </li>
+                            <li>
+                                <label>所在省：</label>
+                                <select name="province" class="province form-control" data-first-title="选择省">
+                                    <option value="">请选择</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>所在市：</label>
+                                <select name="city" class="city form-control" data-first-title="选择省">
+                                    <option value="">请选择</option>
+                                </select>
+                            </li>
+
                             <li>
                                 <label>联系人：</label>
                                 <input type="text" name="contactPerson"/>
@@ -48,7 +53,11 @@
                             </li>
                             <li>
                                 <label>所属行业：</label>
-                                <input type="text" name="industryType"/>
+                                <select name="industryType" class="form-control"
+                                        th:with="type=${@dict.getType('industry_code')}" required>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                            th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
                             <li>
                                 <label>创建时间：</label>
@@ -83,6 +92,8 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: jquery-cxselect-js"/>
+
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:customer:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:customer:remove')}]];
@@ -175,7 +186,18 @@
                 }]
             };
             $.table.init(options);
+
+            var urlChina = '/cnarea/select';
+            $.cxSelect.defaults.url = urlChina;
+            // $.cxSelect.defaults.jsonSpace = 'data';
+            $('#element1').cxSelect({
+                selects: ['province', 'city'],
+                nodata: 'none'
+
+            });
         });
+
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index 1a456b27..75e3c63f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -3,13 +3,21 @@
 <head>
     <th:block th:include="include :: header('代理商管理列表')" />
 </head>
+<style>
+    #element1{
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        flex-wrap: wrap;
+    }
+</style>
 <body class="gray-bg">
      <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse">
                 <form id="formId">
                     <div class="select-list">
-                        <ul>
+                        <ul id="element1">
                             <li>
                                 <label>代理商编码：</label>
                                 <input type="text" name="partnerCode"/>
@@ -18,6 +26,19 @@
                                 <label>代理商名称：</label>
                                 <input type="text" name="partnerName"/>
                             </li>
+
+                            <li>
+                                <label>所在省：</label>
+                                <select name="province" class="province form-control" data-first-title="选择省">
+                                    <option value="">请选择</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>所在市：</label>
+                                <select name="city" class="city form-control" data-first-title="选择省">
+                                    <option value="">请选择</option>
+                                </select>
+                            </li>
                             <li>
                                 <label>认证级别：</label>
                                 <select name="level" th:with="type=${@dict.getType('identify_level')}">
@@ -54,6 +75,8 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: jquery-cxselect-js"/>
+
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:partner:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:partner:remove')}]];
@@ -127,6 +150,14 @@
                 }]
             };
             $.table.init(options);
+            var urlChina = '/cnarea/select';
+            $.cxSelect.defaults.url = urlChina;
+            // $.cxSelect.defaults.jsonSpace = 'data';
+            $('#element1').cxSelect({
+                selects: ['province', 'city'],
+                nodata: 'none'
+
+            });
         });
     </script>
 </body>
