From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 9bc9c7f..03f475d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -358,7 +358,7 @@
//, cellMinWidth: 90
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
// , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
// , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
// , { field: '缁勭粐', title: '缁勭粐' }
@@ -470,25 +470,25 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
} else if (data[i].name == '宸ュ簭浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '宸ュ簭浠ｇ爜' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '宸ュ簭浠ｇ爜' });
} else {
switch (data[i].Type) {
//int
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:120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
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 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
}
}
}
@@ -1192,6 +1192,7 @@
if (typeof (openType) != "undefined") {
return " and 鏄庣粏鏍囪 = 'Y' ";
}
+ return "";
}
//#endregion
});
--
Gitblit v1.9.1