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 @@
@@ -253,7 +253,7 @@
field: 'discount',
align: 'center',
title: '折扣',
- width: 60,
+ width: 70,
formatter: function (value, row, index) {
var html = $.common.sprintf("", 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 @@
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 @@
@@ -61,9 +61,8 @@
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 @@
@@ -61,9 +61,7 @@