From 38f2930d61b2ebcbcb8bd4f85d35b07db61a9968 Mon Sep 17 00:00:00 2001
From: wangjiuyun <1595161655@qq.com>
Date: Fri, 23 May 2025 14:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/order/selectCustomer.html          | 27 ++++++++++++++++---
 .../templates/system/customer/add.html        |  3 ++-
 .../templates/system/customer/info.html       |  1 +
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/selectCustomer.html b/ruoyi-admin/src/main/resources/templates/manage/order/selectCustomer.html
index d6485c45..cb34a9e5 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/selectCustomer.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/selectCustomer.html
@@ -31,6 +31,19 @@
                             <label>联系人：</label>
                             <input type="text" name="contactPerson"/>
                         </li>
+                        <li>
+                            <label>联系电话：</label>
+                            <input type="text" name="contactPhone"/>
+                        </li>
+                        <li>
+                            <label>所属行业：</label>
+                            <select name="industryType" class="form-control"
+                                    th:with="type=${@dict.getType('industry_code')}" required>
+                                <option  value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
                         <li style="width: 46%;text-align: right;">
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
@@ -48,8 +61,6 @@
 </div>
 
 <th:block th:include="include :: footer"/>
-
-
 <script>
     var prefix = ctx + "system/customer";
     $(function () {
@@ -95,7 +106,17 @@
                 },
                 {
                     field: 'industryType',
-                    title: '所属行业'
+                    title: '所属行业',
+                    formatter:(value,row)=>{
+                        const arr=[]
+                        $('[name="industryType"] option').each((index,item)=>{
+                            arr.push({
+                                text:$(item).text(),
+                                value:$(item).val()
+                            })
+                        })
+                        return arr.find((ele)=>ele.value==value)?.text
+                    }
                 },
                 {
                     field: 'remark',
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 3394e06e..cfec85ed 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -87,10 +87,11 @@
             </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 is-required">所属行业：</label>
                     <div class="col-sm-8">
                         <select name="industryType" class="form-control"
                                 th:with="type=${@dict.getType('industry_code')}" required>
+                            <option  value="">请选择</option>
                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                     th:value="${dict.dictValue}"></option>
                         </select>
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 efa82ab1..828006ff 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
@@ -55,6 +55,7 @@
                                 <label>所属行业：</label>
                                 <select name="industryType" class="form-control"
                                         th:with="type=${@dict.getType('industry_code')}" required>
+                                    <option  value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                             th:value="${dict.dictValue}"></option>
                                 </select>