From 1e6419c90c76fafe5508da8746edf3aaad6d2a30 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 26 五月 2023 15:32:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2 +-
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_SourceList.aspx | 2 +-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_SourceList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_SourceList.aspx"
index c8aaa28..5ad6b5d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_SourceList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_SourceList.aspx"
@@ -13,7 +13,7 @@
//涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- SqlXMLReportData.GenOneRecordset(this, "select a.HItemID 璁惧缂栧彿,a.HName 璁惧鍚嶇О,g.HName 鎵�灞炶溅闂�,e.HName 璐ｄ换浜� from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on a.HEmpID=e.HItemID where a.HItemID=" + Request.Params["linterid"]);
+ SqlXMLReportData.GenOneRecordset(this, "select a.hnumber 鐢熶骇璧勬簮缂栫爜,a.HItemID 璁惧缂栧彿,a.HName 璁惧鍚嶇О,g.HName 鎵�灞炶溅闂�,e.HName 璐ｄ换浜� from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on a.HEmpID=e.HItemID where a.HItemID in(" + Request.Params["linterid"]+")");
}
</script>
</head>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 5b9f447..c467abf 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -506,6 +506,7 @@
, { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
, { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true }
+ , { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', sort: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
, { field: '鐘舵��', title: '鐘舵��', sort: true }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 23ff723..bb4ba90 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -999,7 +999,7 @@
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
--
Gitblit v1.9.1