From aa95c69b8ab25f467c82364e4bd102525289ce5a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 06 三月 2024 17:30:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
index 81ffdf1..014ee03 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
@@ -230,6 +230,13 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                             break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                     }
@@ -244,6 +251,7 @@
                                 , data: data1.data
                                 , height: 'full-80'
                                 , page: true
+                                , totalRow: true
                                 , limits: [500, 2000, 5000, 50000]
                                 , limit: 500
                                 , cellMinWidth: 90

--
Gitblit v1.9.1