From 3d924910f164951f905e3c6965fd58522179a23c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 27 八月 2024 14:19:14 +0800
Subject: [PATCH] 采购订单新增bug修复

---
 WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html      |   23 ++++-
 WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html |   28 +++++++
 WebTM/views/基础资料/公用基础资料/Gy_PoStockStyle.html   |   28 +++++++
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html  |   26 ++++-
 WebTM/Vlog/webapi20240827.txt                  |    9 ++
 WebTM/views/基础资料/采购基础资料/Gy_Supplier.html       |   45 ++++++++---
 WebTM/views/基础资料/公用基础资料/Gy_Currency.html       |   28 +++++++
 7 files changed, 162 insertions(+), 25 deletions(-)

diff --git a/WebTM/Vlog/webapi20240827.txt b/WebTM/Vlog/webapi20240827.txt
new file mode 100644
index 0000000..3c50fd4
--- /dev/null
+++ b/WebTM/Vlog/webapi20240827.txt
@@ -0,0 +1,9 @@
+2024/8/27 9:52:12 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid =  order by hmainid desc
+
+2024/8/27 9:54:09 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid =  order by hmainid desc
+
+2024/8/27 10:01:34 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = 1516 order by hmainid desc
+
+2024/8/27 10:01:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 10:01:34 ReportDataSet:1
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
index b040f98..40b01c4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -211,6 +211,7 @@
             //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
+                sWhere += addSWhereByOpenType();
                 $.ajax({
                     url: GetWEBURL() + '/Gy_Currency/list1',
                     type: "GET",
@@ -1057,6 +1058,33 @@
                 })
             }
 
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+                var addSWhere = "";
+
+                if (openType == 2) {
+                    addSWhere = " and 绂佺敤鏍囪 = '' ";
+                }
+                return addSWhere;
+            }
+            //#endregion
+
             //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index a77c380..bf5f0aa 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -325,6 +325,7 @@
             //#region 鏌ヨ
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
+                sWhere += addSWhereByOpenType();
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + '/Gy_Department/list',
@@ -1082,7 +1083,34 @@
                     }
                 })
             }
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var HOrgName = decodeURI(params[params[1]]);
 
+                var addSWhere = "";
+
+                if (openType == 2 && HOrgName != undefined) {
+                    addSWhere = " and 绂佺敤鏍囪 = '' ";
+                    Organization = HOrgName.toString();
+                }
+                return addSWhere;
+            }
+            //#endregion
             //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html"
index 9595a44..dca547d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html"
@@ -283,6 +283,7 @@
             function get_Display(sWhere) {
                 var index = layer.load(0, { shade: false });
                 var ajaxLoad = layer.load();
+                sWhere += addSWhereByOpenType();
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -907,6 +908,33 @@
                 })
             }
 
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var HOrgName = decodeURI(params[params[1]]);
+
+                var addSWhere = "";
+
+                if (openType == 2 && HOrgName != undefined) {
+                    addSWhere = " and 绂佺敤鏍囧織 = '鍚�' and 浣跨敤缁勭粐 = '" + HOrgName + "'";
+                }
+                return addSWhere;
+            }
+            //#endregion
             //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 265cecb..a63ac98 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -195,11 +195,7 @@
 
             var ins;                        //鐢ㄤ簬瀵煎嚭excel
 
-            var params = getUrlVars();
-            var Type = params[params[0]];
-            //#endregion
-            var params = getUrlVars();
-            var Type = params[params[0]];
+            
             //#region 杩涘叆椤甸潰鍗冲姞杞�
             var params = getUrlVars();
             var Type = params[params[0]];
@@ -417,6 +413,7 @@
             //#region 鏌ヨ
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
+                sWhere += addSWhereByOpenType();
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Gy_Warehouse/list',
@@ -1214,6 +1211,22 @@
                 })
             }
 
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var HOrgName = decodeURI(params[params[1]]);
+
+                var addSWhere = "";
+
+                if (openType == "2" && HOrgName != undefined) {
+                    addSWhere = " and 绂佺敤鏍囪 = '' ";
+                    Organization = HOrgName.toString();
+                }
+                return addSWhere;
+            }
+            //#endregion
             //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 0a2ac95..3bfaa19 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -145,6 +145,7 @@
     <script src="../../../layuiadmin/layui/layui1.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>-->
     <script>
+        var Organization = sessionStorage["Organization"]
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -164,7 +165,7 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var Organization = sessionStorage["Organization"]
+            
             var HModName = "Gy_Supplier";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "HCurID", "璐у竵", "姹囩巼", "HSSID", "缁撶畻鏂瑰紡", "HAreaID", "鍦板尯","HPSStyleID","閲囪喘鏂瑰紡"];
@@ -331,6 +332,7 @@
             function get_Display(sWhere) {
                 var index = layer.load(0, { shade: false });
                 var ajaxLoad = layer.load();
+                sWhere += addSWhereByOpenType();
                 $.ajax({
                     url: GetWEBURL() + '/Gy_Supplier/list',
                     type: "GET",
@@ -882,18 +884,7 @@
             }
             //#endregion
 
-          //#region 鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
-            }
-            //#endregion
+          
 
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
@@ -1117,6 +1108,34 @@
             //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
+        //#region 鑾峰彇鍙傛暟
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+            //#endregion
+        //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+        function addSWhereByOpenType() {
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+            var HOrgName = decodeURI(params[params[1]]);
+
+            var addSWhere = "";
+
+            if (openType == "HSup" && HOrgName != undefined) {
+                addSWhere = " and 绂佺敤鏍囪 = '' ";
+                Organization = HOrgName.toString();
+            }
+            return addSWhere;
+        }
+            //#endregion
 
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
         function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
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 2bc618f..a9d280d 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"
@@ -936,6 +936,9 @@
 
             //#region 鎵撳嵃
             function get_PrintReport() {
+                if (linterid == null || linterid == "") {
+                    linterid = $("#HInterID").val();
+                }
                 layer.open({
                     type: 2
                     , area: ['50%', '50%']
@@ -1160,6 +1163,7 @@
                             layer.msg(data.Message, { icon: 1 }); //浣跨敤layer鎻掍欢鏄剧ず涓�涓秷鎭紝鍥炬爣涓�1锛堥�氬父琛ㄧず鎴愬姛锛�
 
                             $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤娣诲姞鎸夐挳锛岄槻姝㈤噸澶嶆彁浜�  
+                            $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
                             //淇濆瓨鍚庢祻瑙�
                             //ReRoadBillMain();
                         }
@@ -1603,13 +1607,14 @@
             }
             //渚涘簲鍟�
             function get_checkSup() {
+                var HOrgName = $(".layui-form-select input").val();
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
                     , title: '渚涘簲鍟嗗垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName='+ HOrgName, 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1641,7 +1646,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '甯佸埆鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1659,13 +1664,14 @@
             }
             //閲囪喘閮ㄩ棬
             function get_checkDept() {
+                var HOrgName = $(".layui-form-select input").val();
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
                     , title: '閲囪喘閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1707,13 +1713,14 @@
             }
             //閲囪喘鏂瑰紡
             function get_checkPSStyle() {
+                var HOrgName = $(".layui-form-select input").val();
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
                     , title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1754,13 +1761,14 @@
 
             //宸ョ▼椤圭洰
             function get_btnHProjectID() {
+                var HOrgID = $("#HOrgID").val();  //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
                     , title: '椤圭洰鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html', 'yes']
+                    , content: ['../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1779,13 +1787,14 @@
 
             //浠撳簱
             function get_btnHWHID() {
+                var HOrgName = $(".layui-form-select input").val();
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
                     , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=2&HOrgName=' + HOrgName, 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -2064,7 +2073,10 @@
          function GetGyUnit(data) {
              OptionData = data
          }
-
+        //鍙屽嚮杩斿洖璐у竵
+        function GetGyCur(data) {
+            OptionData = data
+        }
             //鍙屽嚮杩斿洖鐗╂枡
         function GetGyMaterial(data) {
              OptionData = data

--
Gitblit v1.9.1