From 35bf31c49681d68df92451ca09fde5425f765a94 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 27 四月 2025 17:00:51 +0800
Subject: [PATCH] 新增缺失报表的快捷新增功能
---
WebTM/views/生产管理/宝工排产/Gy_RoutingBillReportForLack.html | 46 +++++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/生产管理/宝工排产/Cg_PODemandPlanConfigBillReportForLack.html | 82 ++++++++++++++++++++
WebTM/views/生产管理/宝工排产/JIT_NeedMaterPlanConfigBillReportForLack.html | 81 +++++++++++++++++++
4 files changed, 204 insertions(+), 7 deletions(-)
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 cd4ed16..5836dda 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"
@@ -140,6 +140,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_insert" id="get_insert"><i class="layui-icon layui-icon-export"></i>蹇嵎鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -189,6 +190,10 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //蹇嵎鏂板
+ case 'get_insert':
+ get_insert();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -320,7 +325,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -485,7 +490,18 @@
}
}
}
- table.exportFile(ins.config.id, option.data, "xls");
+ 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, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
@@ -493,6 +509,48 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+ //#endregion
+
+ //#region 蹇嵎鏂板
+ function get_insert() {
+ var CheckStatus = table.checkStatus("mainTable");
+ if (set_ModCheck("Cg_PODemandPlanConfigBill_Edit") == false) {
+ return layer.msg("鏃犳潈闄�!")
+ }
+ if (CheckStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var ajaxLoad = layer.load();
+ var message = "";
+ for (var i = 0; i < CheckStatus.data.length; i++) {
+ var sql = "exec h_p_Cg_PODemandPlanConfigBillReportForLack_Copy " + CheckStatus.data[i].HOrgID + "," + CheckStatus.data[i].HMaterID + "," + CheckStatus.data[i].HSupID
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ message += i + "." + data1.data[0].Remark + CheckStatus.data[i].鐗╂枡鍚嶇О + "\\n"
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ layer.alert(message, { icon: 5 });
+ layer.close(ajaxLoad);
+ //鍒锋柊鏁版嵁
+ get_FastQuery(2);
+ }
+ })
+ }
}
//#endregion
@@ -657,6 +715,26 @@
form.render('select');
}
//#endregion
+ //鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
});
//#endregion
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/Gy_RoutingBillReportForLack.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/Gy_RoutingBillReportForLack.html"
index 17a4349..dec49ac 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/Gy_RoutingBillReportForLack.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/Gy_RoutingBillReportForLack.html"
@@ -134,6 +134,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Copy" id="get_Copy"><i class="layui-icon layui-icon-refresh-3"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -183,6 +184,10 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //瀵煎嚭excel
+ case 'get_Copy':
+ get_Copy();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -314,7 +319,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -462,7 +467,19 @@
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- table.exportFile(ins.config.id, option.data, "xls");
+ 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, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id,data, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
@@ -473,6 +490,31 @@
}
//#endregion
+ //澶嶅埗
+ function get_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HMaterID = data[0].HMaterID;
+ var HMaterNumber = data[0].鐗╂枡浠ｇ爜;
+ var HMaterName = data[0].鐗╂枡鍚嶇О;
+ var HMaterModel = data[0].瑙勬牸鍨嬪彿;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=' + 0 + '&HSouceBillType=4610&HMaterID=' + HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
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/JIT_NeedMaterPlanConfigBillReportForLack.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/JIT_NeedMaterPlanConfigBillReportForLack.html"
index d7fb7d7..0bdad88 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/JIT_NeedMaterPlanConfigBillReportForLack.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/JIT_NeedMaterPlanConfigBillReportForLack.html"
@@ -140,6 +140,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_insert" id="get_insert"><i class="layui-icon layui-icon-export"></i>蹇嵎鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -189,6 +190,10 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //蹇嵎鏂板
+ case 'get_insert':
+ get_insert();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -320,7 +325,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -481,7 +486,18 @@
// }
// }
//}
- table.exportFile(ins.config.id, option.data, "xls");
+ 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, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
@@ -498,6 +514,47 @@
}
//#endregion
+ //#region 蹇嵎鏂板
+ function get_insert() {
+ var CheckStatus = table.checkStatus("mainTable");
+ if (set_ModCheck("JIT_NeedMaterPlanConfigBill_Edit") == false) {
+ return layer.msg("鏃犳潈闄�!")
+ }
+ if (CheckStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var ajaxLoad = layer.load();
+ var message = "";
+ for (var i = 0; i < CheckStatus.data.length; i++) {
+ var sql = "exec h_p_JIT_NeedMaterPlanConfigBillReportForLack_Copy " + CheckStatus.data[i].HOrgID + "," + CheckStatus.data[i].HMaterID + "," + CheckStatus.data[i].HDeptID
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ message += i + "." + data1.data[0].Remark + CheckStatus.data[i].鐗╂枡鍚嶇О+ "\\n"
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ layer.alert(message, { icon: 5 });
+ layer.close(ajaxLoad);
+ //鍒锋柊鏁版嵁
+ get_FastQuery(2);
+ }
+ })
+ }
+ }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -632,6 +689,26 @@
form.render('select');
}
//#endregion
+ //鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
});
//#endregion
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 f432171..b5a1f52 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"
@@ -755,7 +755,7 @@
HBillSubType = 3301
$("#HMaterID").val(params[params[3]]);//鐗╂枡ID
-
+ $("#HName").val(getParams("HMaterNumber"));//宸ヨ壓璺嚎鍚嶇О
$("#HMaterNumber").val(getParams("HMaterNumber"));//鐗╂枡浠ｇ爜
$("#HMaterName").val(getParams("HMaterName"));//鐗╂枡鍚嶇О
$("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//瑙勬牸鍨嬪彿
--
Gitblit v1.9.1