From f5812de379ee3e1329ccd22230a5a119918f9821 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期四, 27 三月 2025 15:54:11 +0800 Subject: [PATCH] 收料通知单:维护页面、编辑页面只有单据已审核才能打印 采购入库单:编辑页面打印在新增保存后直接打印无数据问题解决 --- WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 12 +++--- WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 41 ++++++++++++++++++++ WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 11 +++++ WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 5 ++ 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user index ea5e21a..3da8f0e 100644 --- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user +++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user @@ -7475,12 +7475,12 @@ <publishTime>07/31/2024 13:38:19</publishTime> </File> <File Include="views/閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html"> - <publishTime>03/19/2025 10:10:14</publishTime> + <publishTime>03/27/2025 15:52:55</publishTime> </File> <File Include="views/閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html"> <publishTime>04/16/2021 10:32:11</publishTime> <publishTime>04/16/2021 10:32:11</publishTime> - <publishTime>03/24/2025 13:06:33</publishTime> + <publishTime>03/27/2025 15:35:04</publishTime> </File> <File Include="views/閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillQuery.html"> <publishTime>03/03/2025 08:46:28</publishTime> @@ -7547,7 +7547,7 @@ <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html"> <publishTime>04/16/2021 10:32:11</publishTime> <publishTime>04/16/2021 10:32:11</publishTime> - <publishTime>03/27/2025 13:53:19</publishTime> + <publishTime>03/27/2025 15:19:02</publishTime> </File> <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillQuery.html"> <publishTime>12/05/2024 08:36:48</publishTime> @@ -8158,7 +8158,7 @@ <publishTime>04/11/2023 16:34:43</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html"> - <publishTime>03/19/2025 10:10:14</publishTime> + <publishTime>03/27/2025 15:43:39</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html"> <publishTime>04/12/2021 11:31:26</publishTime> @@ -8168,7 +8168,7 @@ <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html"> <publishTime>04/12/2021 11:31:26</publishTime> <publishTime>04/12/2021 11:31:26</publishTime> - <publishTime>03/13/2025 15:34:26</publishTime> + <publishTime>03/27/2025 15:27:34</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill_Add_Up.html"> <publishTime>03/17/2025 10:25:47</publishTime> @@ -8176,7 +8176,7 @@ <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html"> <publishTime>04/15/2021 16:31:28</publishTime> <publishTime>04/15/2021 16:31:28</publishTime> - <publishTime>03/27/2025 13:53:19</publishTime> + <publishTime>03/27/2025 15:25:30</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillListQuery.html"> <publishTime>12/05/2024 08:36:48</publishTime> diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" index 8dfc171..5294b68 100644 --- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" +++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" @@ -1098,6 +1098,23 @@ //#region 鎵撳嵃 function get_PrintReport() { + //#region 鍒ゆ柇婧愬崟鐘舵�� + var HSourceBillData = ""; + var HSourceBillData = getSourceBillStatus_POInStockBill(); + if (HSourceBillData != "none") { + if (HSourceBillData.length == 0) { + layer.alert("鎵撳嵃澶辫触!鏈煡璇㈠埌鍗曟嵁淇℃伅!", { icon: 5 }); + return; + } else if (HSourceBillData[0]["鐘舵��"] != "宸插鏍�") { + layer.alert("鎵撳嵃澶辫触!鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 }); + return; + } + } else { + return; + } + //#endregion + + //if (linterid == null || linterid == "") { // linterid = $("#HInterID").val(); //} @@ -2741,6 +2758,30 @@ return res; } //#endregion + + + //#region 鑾峰彇鏈崟鍗曟嵁鐘舵�� + function getSourceBillStatus_POInStockBill() { + var HSourceBillData = "none"; + var sWhere = " and hmainid = " + $("#HInterID").val(); + $.ajax({ + url: GetWEBURL() + '/Cg_POInStockBill/list', + async: false, + type: "GET", + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.count == 1) { + HSourceBillData = data1.data; + } else { + layer.alert(data1.code + "鍗曟嵁鐘舵�佸垽鏂け璐ワ紒", { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + return HSourceBillData; + } + //#endregion //#endregion diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" index ec74976..4b8607e 100644 --- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" +++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" @@ -1464,6 +1464,11 @@ var hmainid = []; for (var i = 0; i < checkStatus.data.length; i++) { + if (checkStatus.data[i].鐘舵�� != "宸插鏍�" && checkStatus.data[i].鐘舵��!="") { + layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 }); + return; + } + hmainid.push(data[i].hmainid.toString() + padStart(data[i].hsubid.toString(),8)) } layer.open({ @@ -1495,6 +1500,12 @@ return layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒'); } else { + + if (data[0].鐘舵�� != "宸插鏍�") { + layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 }); + return; + } + layer.open({ type: 2 , area: ['50%', '50%'] diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" index 24d1044..4b6edd9 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" @@ -1041,6 +1041,11 @@ //#region 鎵撳嵃 function get_PrintReport() { + var temp = $("#HInterID").val(); + if (typeof (temp) != "undefined" && temp != null && temp != "") { + linterid = temp; + } + layer.open({ type: 2 , area: ['50%', '50%'] -- Gitblit v1.9.1