From 3425237a2b54ca28fc3e3c5f7c35a7fbef4e15fa Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:19:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html |   70 +++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 31 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index ea71a3d..d660f01 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -45,6 +45,7 @@
                 <form class="layui-form" lay-filter="component-form-group" action="">
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
                             <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
                             <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
                             <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
@@ -400,7 +401,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1102";       //瀹氫箟涓�涓瓧绗︿覆璧嬪��  绫诲瀷缁檋moduletype  鍙橀噺
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);  //閫氳繃HModuleType  鍗曟嵁绫诲瀷鑾峰彇骞跺彲鑳藉紩鐢ㄤ簡涓�涓悕涓� PageTitle.js 鐨凧avaScript鏂囦欢鏍规嵁get_PageTitle鍑芥暟鏂规硶鑾峰彇HModuleType 
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();  //閫氳繃HModuleType  鍗曟嵁绫诲瀷鑾峰彇骞跺彲鑳藉紩鐢ㄤ簡涓�涓悕涓� PageTitle.js 鐨凧avaScript鏂囦欢鏍规嵁get_PageTitle鍑芥暟鏂规硶鑾峰彇HModuleType 
             $("h1").html('<b>' + HPageTitle + '</b>'); //鍊兼潵鏄剧ずh1椤甸潰
             //#endregion
 
@@ -532,6 +533,13 @@
             });
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 鏂板
+            form.on('submit(set_AddNew)', function (data) {
+                const url = new URL(location.href);
+                location.href = url.origin + url.pathname;
+            });
+            //#endregion
 
             //#region 瀹℃牳鎸夐挳
             form.on('submit(set_CheckBill)', function (data) {
@@ -1384,11 +1392,11 @@
                     layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); 
                     return; //return; 闃绘鍑芥暟缁х画鎵ц
                 }
-                if ($("#HExRate").val() == 0) {
-                     //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
-                    layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if ($("#HExRate").val() == 0) {
+                //     //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
+                //    layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 //澶勭悊閲囪喘鏂瑰紡鍜岀粨绠楁柟寮忓�奸槻姝㈠悗绔痠nt杞瑂ting鎶ラ敊
                 if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
                     $("#HPSStyleID").val(0)
@@ -1777,7 +1785,7 @@
                                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                                     , area: ["90%", "90%"] //绐椾綋澶у皬
                                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']   //椤甸潰鍔犺浇
+                                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID + '&openType2=POOrder', 'yes']   //椤甸潰鍔犺浇
                                     , btn: ["纭畾", "鍙栨秷"]  //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
                                     , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
                                         //鎸夐挳涓�  鐨勫洖璋�
@@ -2002,7 +2010,7 @@
                             , shift: 2 //寮瑰嚭鍔ㄧ敾
                             , area: ["90%", "90%"] //绐椾綋澶у皬
                             , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']   //椤甸潰鍔犺浇
+                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID + '&openType2=POOrder', 'yes']   //椤甸潰鍔犺浇
                             , btn: ["纭畾", "鍙栨秷"]  //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
                             , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
                                 //鎸夐挳涓�  鐨勫洖璋�
@@ -2177,29 +2185,29 @@
                 });
 
                 //鐗╂枡琛ㄦ牸涓嬫媺鎼滅储妗�
-                //tableSelect.render({
-                //    elem: 'td[data-field="鐗╂枡浠g爜"] .layui-table-edit',
-                //    checkedKey: 'HItemID',
-                //    searchKey: '鐗╂枡浠g爜',
-                //    sWhere: '',//table鎼滅储sWhere鏉′欢
-                //    table: {
-                //        url: GetWEBURL() + 'Gy_Material/page',
-                //        where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
-                //        cols: [[
-                //            { type: 'checkbox',fixed:'left' },
-                //            { field: 'HItemID', title: 'HItemID' },
-                //            { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' },
-                //            { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' },
-                //        ]],
-                //        page: true,
-                //        limit: 5,
-                //        limits: [5]
-                //    },
-                //    done: function (elem, data) {
-                //        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
-                //        setTableByHMater(obj, data);
-                //    }
-                //})
+                tableSelect.render({
+                    elem: 'td[data-field="鐗╂枡浠g爜"] .layui-table-edit',
+                    checkedKey: 'HItemID',
+                    searchKey: '鐗╂枡浠g爜,鐗╂枡鍚嶇О',
+                    sWhere: " and 鐗╂枡灞炴��='澶栬喘'",//table鎼滅储sWhere鏉′欢
+                    table: {
+                        url: GetWEBURL() + 'Gy_Material/page',
+                        where: { user: sessionStorage["HUserName"], Organization: sessionStorage["Organization"] },
+                        cols: [[
+                            { type: 'checkbox',fixed:'left' },
+                            { field: 'HItemID', title: 'HItemID' },
+                            { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' },
+                            { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' },
+                        ]],
+                        page: true,
+                        limit: 5,
+                        limits: [5]
+                    },
+                    done: function (elem, data) {
+                        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+                        setTableByHMater(obj, data);
+                    }
+                })
             }
             //閫夋嫨鐗╂枡鍗曢�夋垨澶氶�夋敼鍙樿〃鏍间俊鎭�
             function setTableByHMater(obj, data) {

--
Gitblit v1.9.1