From 90333851c92a2fcb27e65c91e46e7e6c59fbb49c Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 9 Sep 2024 16:09:34 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BD=95=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=8B=E5=8A=A8=E8=BF=9B=E8=A1=8C=E5=8D=87?=
 =?UTF-8?q?=E5=BA=8F=E5=92=8C=E9=99=8D=E5=BA=8F=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=8E=E7=AB=AF=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8E=92=E5=BA=8F=E4=B8=BA=E5=BD=95=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=99=8D=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/erp/material/material.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
index 3383dec2..9d78ef7a 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -158,6 +158,9 @@
                             return $.table.imageView(value);
                     }
                     },
+                    {title: '使用状态',field: 'useStatus',
+                        formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
+                    },
                     {title: '<span style="color: red;">申请人</span>',field: 'applyUserName',
                         formatter: function(value, row, index) {return '<span style="color: red;">' + (value ? value : "-") + '</span>';}
                     },
@@ -175,9 +178,6 @@
                     {title: '审核状态',field: 'auditStatus',visible: false,
                         formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
                     },
-                    {title: '使用状态',field: 'useStatus',visible: false,
-                       formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
-                    },
                     {title: '工程员',field: 'businessMembers',visible: false},
                     {title: '关联bom号',field: 'bomNo',visible: false},
                     {title: '物料类型',field: 'materialType',visible: false,
@@ -189,7 +189,7 @@
                     },
                     {title: '技术团队id',field: 'productItem',visible: false,},
                     {title: '技术团队名称',field: 'itemName',visible: false},
-                    {title: '录入时间',field: 'createTime',visible: false},
+                    {title: '录入时间',field: 'createTime',sortable: true},
                     {title: '更新人',field: 'updateBy',visible: false},
                     {title: '删除标志', field: 'delFlag',visible: false},
                     {title: '入库部门', field: 'warehouseDept',visible: false,