From 1cd5e3fcca7259e85f87737d1df4a7945d5684fb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 13 十一月 2024 09:50:18 +0800
Subject: [PATCH] 班组职员清单删除首行控制优化；计划导入每次导入100行；工艺路线编辑列设置bug优化；工序出站汇报单隐藏单价；计划达成率报表导出功能
---
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport.html | 4 +
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 58 ++++++++++++++++------------
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 6 ++-
WebTM/views/工资管理/班组职员清单/Gy_GroupEmpBillEdit.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 1
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_ICMO.html | 2
WebTM/views/车间管理/报表分析/Sc_PlanAchievementRateReport.html | 21 ++++++++++
7 files changed, 63 insertions(+), 31 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
index fee5c57..7058040 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillEdit.html"
@@ -339,7 +339,7 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- if (rowIndex === '0') {
+ if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
//obj.del();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index c1ccb28..1a0081d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -244,33 +244,41 @@
num.push(table.cache["mainTable"][i])
}
}
- data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(num);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
- var index = layer.load();
-
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
- async: true,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
+
+ var HDataSub = [];
+
+ //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
+ for (var i = 0; i < num.length; i += 100) {
+ HDataSub = num.slice(i, i + 100)
+
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(HDataSub);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ });
+ }
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index fdf75bf..348ce2d 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -2766,8 +2766,10 @@
if (i >= dataCol.length) {
continue;
}
-
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index dd7c76a..6d257f6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -2127,6 +2127,7 @@
for (let i = 0; i < option.cols[0].length; i++) {
if (option.cols[0][i].field == '宸ュ簭宸ヤ环') {
option.cols[0][i].hide = true; //闅愯棌宸ヤ环瀛楁
+ titleData.push("宸ュ簭宸ヤ环");
}
}
}
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/Mes_OrderProcFlowAllReport.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/Mes_OrderProcFlowAllReport.html"
index 157b66e..98b957f 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/Mes_OrderProcFlowAllReport.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/Mes_OrderProcFlowAllReport.html"
@@ -449,7 +449,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
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/Mes_OrderProcFlowAllReport_ICMO.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/Mes_OrderProcFlowAllReport_ICMO.html"
index f4b8fd3..c207d66 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/Mes_OrderProcFlowAllReport_ICMO.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/Mes_OrderProcFlowAllReport_ICMO.html"
@@ -104,7 +104,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "Mes_OrderProcFlowAllReport";
+ var HModName = "Mes_OrderProcFlowAllReport_ICMO";
var ins;
//#endregion
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/Sc_PlanAchievementRateReport.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/Sc_PlanAchievementRateReport.html"
index 21bdb4c..9e0f8cc 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/Sc_PlanAchievementRateReport.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/Sc_PlanAchievementRateReport.html"
@@ -87,6 +87,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_export" id="get_export" style="padding:0 5px">瀵煎嚭</button>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
@@ -217,6 +218,7 @@
var option = [];
var HModName = "Sc_PlanAchievementRateReport";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -249,6 +251,23 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
+ //瀵煎嚭
+ form.on('submit(get_export)', function (data) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','锛�'); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ });
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
@@ -416,7 +435,7 @@
});
}
}
- table.render(option);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
--
Gitblit v1.9.1