From af1f2a18699b2082804ad55320c6768c714f8125 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期六, 20 五月 2023 04:35:38 +0800
Subject: [PATCH] 1
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 4 ++--
WebTM/views/车间管理/报表分析/Kf_MaterOutSumReport_Cloth.html | 3 +++
WebTM/views/车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index ae47294..c38d2cc 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4098,10 +4098,10 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutEntryReport_Cloth.html">
- <publishTime>05/20/2023 04:21:05</publishTime>
+ <publishTime>05/20/2023 04:33:37</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutSumReport_Cloth.html">
- <publishTime>05/20/2023 04:14:40</publishTime>
+ <publishTime>05/20/2023 04:34:18</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">
<publishTime>04/11/2023 16:34:43</publishTime>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
index 1f7cbb3..5cb6ffa 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
@@ -240,6 +240,9 @@
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
+ else if (data[i].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: data[i].width, totalRow:true });
+ }
else {
switch (data[i].Type) {
//int
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
index abd72a7..8fa3020 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutSumReport_Cloth.html"
@@ -240,6 +240,9 @@
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true, width: data[i].width }); //闅愯棌id鍒�
}
+ else if (data[i].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: data[i].width, totalRow: true });
+ }
else {
switch (data[i].Type) {
//int
--
Gitblit v1.9.1