From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 326 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 295 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 7160c02..7b86cdc 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"
@@ -446,6 +446,11 @@
OperationType = 1;//鎿嶄綔绫诲瀷鍒濆鍖�
}
+ var rowdata = [{
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": "0", "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": 1, "HRelTaxPrice": "0", "HTaxRate": 0, "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd"),
+ }]; //瀹氫箟涓�涓寘鍚暟缁� 璁剧疆鍒濆鍖栧�� 涓� 鈥�0鈥欙紝 绌猴紝鐘舵�佷负1 璁剧疆鏃堕棿绫诲瀷yyyy-mm-dd
+
// 鍒濆鍖栫晫
set_InitGrid();//鎵ц鍒濆鍖栫晫闈㈡柟娉�
@@ -460,7 +465,7 @@
//鏍规嵁鐢ㄦ埛缁戝畾淇℃伅鍔犺浇涓氬姟鍛樸�侀儴闂ㄣ�佷富绠�
setInitPageData();
-
+ /*set_InitGrid();//鎵ц鍒濆鍖栫晫闈㈡柟娉�*/
}
else if (OperationType == 2) { //澶嶅埗
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
@@ -476,11 +481,6 @@
RoadBillMain(linterid);//璋冪敤涓�涓悕涓篟oadBillMain鐨勫嚱鏁帮紝骞跺皢linterid浣滀负鍙傛暟浼犻��
}
//#endregion
-
- var rowdata = [{
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": "0", "HRemark": ""
- , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": 1, "HRelTaxPrice": "0", "HTaxRate": 0, "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd"),
- }]; //瀹氫箟涓�涓寘鍚暟缁� 璁剧疆鍒濆鍖栧�� 涓� 鈥�0鈥欙紝 绌猴紝鐘舵�佷负1 璁剧疆鏃堕棿绫诲瀷yyyy-mm-dd
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) { //鐩戝惉mainTable琛ㄦ牸涓婄殑宸ュ叿鏍忎簨浠� 瑙﹀彂鍥炶皟鍑芥暟obj鍙傛暟
@@ -1219,7 +1219,7 @@
, "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID
, "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HWHID": data[i].HWHID, "HWHName": data[i].浠撳簱鍚嶇О, "HQty": data[i].鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
, "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HTaxRate": data[i].绋庣巼
- , "HTaxMoney": data[i].閲戦 * data[i].绋庣巼, "HlineTotal": data[i].閲戦 + data[i].绋庨, "HlineTotalBB": (data[i].閲戦 + data[i].绋庨) * data[i].姹囩巼
+ , "HTaxMoney": data[i].绋庨, "HlineTotal": data[i].浠风◣鍚堣, "HlineTotalBB": data[i].鏈綅甯佷环绋庡悎璁�
, "HTaxPrice": data[i].鍚◣鍗曚环, "HDiscountRate": data[i].鎶樻墸鐜�, "HRelTaxPrice": data[i].瀹為檯鍚◣鍗曚环
, "HDate": Format(new Date(data[i].浜よ揣鏃ユ湡), "yyyy-MM-dd")
}
@@ -1764,6 +1764,221 @@
obj.event = ""; //鎶奲oj.event灞炴�� 鍒濆鍖栦负绌�
return false;
}
+
+ if (event.key == "F8") {//妫�鏌ヨЕ鍙戜簨浠剁殑閿洏鎸夐敭鏄惁鏄疐7閿�
+ //鐗╂枡
+ if (obj.event == "HMaterID") {//鍒ゆ柇浼犲叆鐨刼bj瀵硅薄鐨別vent灞炴�ф槸鍚︾瓑浜庡瓧绗︿覆"HMaterID"
+ var HOrgID = $("#HOrgID").val(); //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
+ layer.open({ //鎵撳紑灞�
+ type: 2 // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID + '&openType2=POOrder', 'yes'] //椤甸潰鍔犺浇
+ , btn: ["纭畾", "鍙栨秷"] //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
+ , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ var TaxRate = getHTaxRateByHSupID();
+ //閫変腑澶氳鏃�
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+ for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ }; // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁� 鍏跺垵濮嬪�间负绌烘垨鑰�0 鎴栬�呮槸鏃堕棿鏍煎紡
+
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+ table.render(option);//娓叉煋鐣岄潰
+ }
+ var HMaterID = checkStatus.data[i].HItemID; //checkStatus.data鏁扮粍涓殑褰撳墠鍏冪礌锛堢储寮曚负i锛変腑鑾峰彇HItemID灞炴�х殑鍊� 骞惰祴鍊肩粰HMaterID
+ var resultData = getMaterialByMaterID(HMaterID); //浣跨敤HMaterID浣滀负鍙傛暟鏉ヨ皟鐢╣etMaterialByMaterID鍑芥暟鏉ヨ幏鍙栬鐗╂枡鐨勮缁嗕俊鎭�
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID; //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠ｇ爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡鍚嶇О 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel; //灏唎ption.data鏁扮粍涓搴旇鐨� 瑙勬牸鍨嬪彿 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HUnitID = resultData.HPOUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HPOUnitName; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁￠噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID 鏇存柊璁￠噺鍗曚綅灞炴��
+ option.data[rowIndex + i].HQty = 1; //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠ｈ〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
+ option.data[rowIndex + i].HTaxRate = TaxRate;
+ }
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+ }
+
+ layer.closeAll(); //鍏抽棴鎵�鏈夐�氳繃layer
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { //褰撶偣鍑烩�滃彇娑堚�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+ var Dec = getDecByMaterID(OptionData.HItemID) //鑾峰彇绮惧害
+ var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
+ var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
+ var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ if (d.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
+ HTaxRate = 0;
+ if (typeof (d.data[0].澧炲�肩◣鐜�) == undefined || d.data[0].澧炲�肩◣鐜� == null) {
+ layer.alert("鍙戠敓閿欒鏁版嵁搴撹〃澧炲�肩◣鐜囧瓧娈垫湁璇�!", { icon: 5 });
+ } else {
+ HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�);
+ }
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+ HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HPOUnitID
+ , "璁￠噺鍗曚綅": OptionData.閲囪喘璁￠噺鍗曚綅
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ })
+ }
+ else {
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); //result.msg瀵硅薄锛屾彁绀哄脊绐� 绫诲瀷涓�5锛� 鎸夐挳锛屽拰鎸夐挳鐨勫悕绉颁负閫�鍑� 鏃堕棿 涓�100绉掞紝浠ュ強鍋忕Щ閲忥紙`offset: 't'
+ }
+
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HPOUnitID
+ , "璁￠噺鍗曚綅": OptionData.閲囪喘璁￠噺鍗曚綅
+ })
+ }
+ }
+ });
+ }
+ //璁￠噺鍗曚綅
+ if (obj.event == "HUnitID") { //鍒ゆ柇 obj.event浜嬩欢 鏄惁绛変簬瀛楃涓� 'HUnitID'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ layer.open({
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'] //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , btn: ["纭畾", "鍙栨秷"] //鑷畾涔夐�夋嫨鎸夐挳 鍏舵寜閽殑鍚嶇О涓� 纭畾锛屽彇娑�
+ , btn1: function (index, laero) { //鎸夐挳鐩戝惉 璋冪敤鍥炶皟
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) { //鍒ゆ柇閫変腑鐨勬暟鎹槸鍚︿负涓�鏉�
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�"); //鎻愮ず璇烽�変腑涓�鏉�
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": checkStatus.data[0].HItemID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ })
+ }
+
+ //浠撳簱
+ if (obj.event == "HWHID") { //鍒ゆ柇obj.event浜嬩欢 鐨勫瓧绗︿覆鏄惁==HWHID
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
+ layer.open({ //鎵撳紑灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , btn: ["纭畾", "鍙栨秷"] //鑷畾涔夐�夋嫨鎸夐挳 鍏舵寜閽殑鍚嶇О涓� 纭畾锛屽彇娑�
+ , btn1: function (index, laero) { //褰撲负涓虹‘璁ゆ椂
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWHID": checkStatus.data[0].HItemID
+ , "HWHName": checkStatus.data[0].浠撳簱鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "HWHName": OptionData.浠撳簱鍚嶇О
+ })
+ }
+ })
+ }
+ obj.event = ""; //鎶奲oj.event灞炴�� 鍒濆鍖栦负绌�
+ return false;
+ }
// 澶勭悊璧勬簮鐨勪唬鐮�
} catch (error) {
// 澶勭悊寮傚父鐨勪唬鐮�
@@ -1787,7 +2002,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) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
//鎸夐挳涓� 鐨勫洖璋�
@@ -1912,30 +2127,79 @@
});
+ $('.layui-table-box tbody td[data-field="HWHName"]').off('dblclick').on('dblclick', function () {
+
+ try {
+ //鎵嬪姩澶辩劍
+ var element = document.getElementById("HBillNo");
+ element.focus();
+
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
+ layer.open({ //鎵撳紑灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , btn: ["纭畾", "鍙栨秷"] //鑷畾涔夐�夋嫨鎸夐挳 鍏舵寜閽殑鍚嶇О涓� 纭畾锛屽彇娑�
+ , btn1: function (index, laero) { //褰撲负涓虹‘璁ゆ椂
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWHID": checkStatus.data[0].HItemID
+ , "HWHName": checkStatus.data[0].浠撳簱鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "HWHName": OptionData.浠撳簱鍚嶇О
+ })
+ }
+ })
+
+ obj.event = "";
+ } catch (error) {
+ layer.alert("鍙戠敓閿欒!" + error, { icon: 5 });
+ }
+
+ });
+
//鐗╂枡琛ㄦ牸涓嬫媺鎼滅储妗�
- //tableSelect.render({
- // elem: 'td[data-field="鐗╂枡浠ｇ爜"] .layui-table-edit',
- // checkedKey: 'HItemID',
- // searchKey: '鐗╂枡浠ｇ爜',
- // sWhere: '',//table鎼滅储sWhere鏉′欢
- // table: {
- // url: GetWEBURL() + 'Gy_Material/page',
- // where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
- // cols: [[
- // { type: 'checkbox',fixed:'left' },
- // { field: 'HItemID', title: 'HItemID' },
- // { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' },
- // { 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="鐗╂枡浠ｇ爜"] .layui-table-edit',
+ checkedKey: 'HItemID',
+ searchKey: '鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О',
+ 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: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' },
+ { 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