From 74a8f710b4d29ba5ada8c70873d2b3d504332adf Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 08 九月 2025 10:47:20 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/宝工排产/Cg_PODemandPlanConfigBillReportForLack.html | 8 +++++---
WebTM/views/工资管理/工资报表/Pay_PaymentEntryReport.html | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
index a259f2b..b4c470e 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
@@ -383,6 +383,7 @@
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
}
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
index 5836dda..ef1dfc9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
@@ -319,13 +319,14 @@
option.data = data1.data;
ins = table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "Cg_PODemandPlanConfigBillReportForLack";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+
layer.close(ajaxLoad);
@@ -480,7 +481,7 @@
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- var addExportStr = ["渚涘簲鍟嗕唬鐮�"];
+ var addExportStr = ["渚涘簲鍟嗕唬鐮�","缁勭粐缂栫爜"];
var data = option.data;
for (var i = 0; i < data.length; i++) {
for (var j = 0; j < addExportStr.length; j++) {
@@ -621,6 +622,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
--
Gitblit v1.9.1