From 156beb031dcafba434de37208ab08f4075634df4 Mon Sep 17 00:00:00 2001
From: wangjiuyun <1595161655@qq.com>
Date: Tue, 20 May 2025 15:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/manage/order/add.html |  4 ++--
 .../templates/manage/order/edit.html          |  2 +-
 .../templates/system/customer/info.html       | 21 +++++++++++--------
 .../templates/system/product/add.html         |  7 +++----
 .../templates/system/product/edit.html        |  6 ++----
 5 files changed, 20 insertions(+), 20 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 39f2f41e..eeca5a60 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
@@ -38,7 +38,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">版本号：</label>
                 <div class="col-sm-8">
-                    <input name="versionCode" class="form-control" type="number" required>
+                    <input name="versionCode" class="form-control" type="number" max="100" required>
                 </div>
             </div>
         </div>
@@ -253,7 +253,7 @@
                     field: 'discount',
                     align: 'center',
                     title: '折扣',
-                    width: 60,
+                    width: 70,
                     formatter: function (value, row, index) {
                         var html = $.common.sprintf("<input class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.1' max='1' min='0'>", index, value);
                         return html;
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 5dec1a71..ab1d45ac 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -38,7 +38,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">版本号：</label>
                 <div class="col-sm-8">
-                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="text" required>
+                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="text" max="100" required>
                 </div>
             </div>
         </div>
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 e82953f5..f43bea20 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
@@ -150,7 +150,10 @@
                 },
                 {
                     field: 'industryType',
-                    title: '所属行业'
+                    title: '所属行业',
+                    formatter:(value,row)=>{
+                        return [[${@dict.getType('industry_code')}]].find((ele)=>ele.dictValue==value)?.dictLabel
+                    }
                 },
                 {
                     field: 'remark',
@@ -160,14 +163,14 @@
                     field: 'createAt',
                     title: '创建时间'
                 },
-                {
-                    field: 'updateAt',
-                    title: '更新时间'
-                },
-                {
-                    field: 'deleteAt',
-                    title: '删除时间'
-                },
+                // {
+                //     field: 'updateAt',
+                //     title: '更新时间'
+                // },
+                // {
+                //     field: 'deleteAt',
+                //     title: '删除时间'
+                // },
                 {
                     title: '操作',
                     align: 'center',
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/add.html b/ruoyi-admin/src/main/resources/templates/system/product/add.html
index d4b4b3c6..b92a3b2a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/product/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/product/add.html
@@ -52,7 +52,7 @@
                     <label class="col-sm-3 control-label is-required">产品类型：</label>
                     <div class="col-sm-8">
                         <select name="type" class="form-control" th:with="type=${@dict.getType('product_type')}" required>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
                 </div>
@@ -61,9 +61,8 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label is-required">产品类型值：</label>
                     <div class="col-sm-8">
-                        <select name="value" class="form-control" th:with="type=${@dict.getType('product_type')}" required>
-                            <option th:each="dict : ${type}" th:text="${dict.dictValue}" th:value="${dict.dictValue}"></option>
-                        </select>
+                        <input name="value" class="form-control" type="number" required>
+
                     </div>
                 </div>
             </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/edit.html b/ruoyi-admin/src/main/resources/templates/system/product/edit.html
index 0fdb9a3f..a5bc731d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/product/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/product/edit.html
@@ -52,7 +52,7 @@
                     <label class="col-sm-3 control-label is-required">产品类型：</label>
                     <div class="col-sm-8">
                         <select th:field="*{type}"  name="type" class="form-control" th:with="type=${@dict.getType('product_type')}" required>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
                 </div>
@@ -61,9 +61,7 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label is-required">产品类型值：</label>
                     <div class="col-sm-8">
-                        <select th:field="*{value}" name="value" class="form-control" th:with="type=${@dict.getType('product_type')}" required>
-                            <option th:each="dict : ${type}" th:text="${dict.dictValue}" th:value="${dict.dictValue}"></option>
-                        </select>
+                        <input name="value" th:field="*{value}" class="form-control" type="number" required>
                     </div>
                 </div>
             </div>