From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单   超出 关联数量  关闭源单 2.应收单 增加  反写源单 销售出库单 和 销售订单  超出关联数量  关闭源单 3.动态获取源单增加参数 Num 0蓝单   1红单  2全部 4.销售流程的测试并完善功能; 销售订单-》发货通知单-》销售出库单-》应收单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 )

---
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html |  172 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 150 insertions(+), 22 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 611f3f6..8deccbf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -83,6 +83,38 @@
                                                 <input type="checkbox" name="checkboxHTProcessFlag" id="checkboxHTProcessFlag" lay-filter="checkboxHTProcessFlag" lay-skin="primary" value="true" title="鏄惁杞伐搴�">
                                                 <input type="hidden" value="false" name="HTProcessFlag" id="HTProcessFlag">
                                             </div>
+                                        </div>                                       
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">棣栦欢妫�楠屾柟妗�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HQCSchemeName_Fst" id="HQCSchemeName_Fst" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">杞簭妫�楠屾柟妗�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HQCSchemeName_Proc" id="HQCSchemeName_Proc" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HQCSchemeID_Proc" id="HQCSchemeID_Proc" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸℃妫�楠屾柟妗�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HQCSchemeName_Patrol" id="HQCSchemeName_Patrol" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HQCSchemeID_Patrol" id="HQCSchemeID_Patrol" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
@@ -94,7 +126,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-col-xs8 layui-inline">
-                                        <label class="layui-form-label"style="width: 12.5%;">缁勭粐*</label>
+                                        <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
                                         <div class="layui-input-inline" style="margin-bottom: -15px;">
                                             <div class="layui-form">
                                                 <div class="layui-form-item" style=" width: 375%;">
@@ -416,6 +448,21 @@
                 get_checkDept();
             });
 
+            //閫夋嫨棣栦欢妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Fst-BT)', function () {
+                get_checkQCSchemeID_Fst();
+            });
+
+            //閫夋嫨杞簭妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Proc-BT)', function () {
+                get_checkQCSchemeID_Proc();
+            });
+
+            //閫夋嫨宸℃妫�楠屾柟妗堟寜閽�
+            form.on('submit(HQCSchemeID_Patrol-BT)', function () {
+                get_checkHQCSchemeID_Patrol();
+            });
+
             //閫夋嫨宸ヤ綔涓績鎸夐挳
             form.on('submit(HWorkCenterID-BT)', function () {
                 get_checkWorkCenter();
@@ -564,6 +611,12 @@
                                 , "HWHName": data.HWHName
                                 , "HWorkCenterID": data.HWorkCenterID
                                 , "HWorkCenterName": data.HWorkCenterName
+                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
+                                , "HQCSchemeName_Fst": data.棣栦欢妫�楠屾柟妗�
+                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
+                                , "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
+                                , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
+                                , "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -675,7 +728,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ュ簭鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -683,7 +736,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
                         $("#HProcID").val(checkStatus.data[0].HItemID);
                         $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -701,7 +754,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -709,9 +762,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -727,7 +780,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -735,8 +788,83 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
                         $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨棣栦欢妫�楠屾柟妗堟柟娉�
+            function get_checkQCSchemeID_Fst() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Fst").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
+                        $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨杞簭妫�楠屾柟妗堟柟娉�
+            function get_checkQCSchemeID_Proc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Proc").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
+                        $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸℃妫�楠屾柟妗堟柟娉�
+            function get_checkHQCSchemeID_Patrol() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCSchemeName_Patrol").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
+                        $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -752,7 +880,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐝粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -760,7 +888,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroup").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -777,7 +905,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓嶈壇浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -785,7 +913,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HBadWHName").val(checkStatus.data[0].HName);
+                        $("#HBadWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HBadWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -802,7 +930,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鎶ュ簾浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -810,7 +938,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWasterWHName").val(checkStatus.data[0].HName);
+                        $("#HWasterWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWasterWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -827,7 +955,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐮斿彂涓嶈壇鍝佷粨搴撳垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -835,7 +963,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HBadCountDevelopWHName").val(checkStatus.data[0].HName);
+                        $("#HBadCountDevelopWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HBadCountDevelopWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -852,7 +980,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '濮斿涓嶈壇浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -860,7 +988,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWWBadWHName").val(checkStatus.data[0].HName);
+                        $("#HWWBadWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWWBadWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -877,7 +1005,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '濮斿鎶ュ簾浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -885,7 +1013,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWWWasterWHName").val(checkStatus.data[0].HName);
+                        $("#HWWWasterWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWWWasterWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -902,7 +1030,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鑹搧浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -910,7 +1038,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWHName").val(checkStatus.data[0].HName);
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }

--
Gitblit v1.9.1