仓库管理选择基础资料的界面增加双击返回的功能

陈雯静

2024-04-11 c9fb987e601aa708250efe8c2b41c370fc385efa

仓库管理选择基础资料的界面增加双击返回的功能

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\MES-WEB\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,8 +5,8 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html

@@ -931,7 +931,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调入仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -954,7 +954,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调出仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HSCWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -977,7 +977,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '验收员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1000,7 +1000,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1023,7 +1023,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1048,7 +1048,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1099,9 +1099,21 @@
                                        "HMaterID": checkStatus.data[0].HItemID,
                                        "物料代码": checkStatus.data[0].物料代码,
                                        "物料名称": checkStatus.data[0].物料名称,
                                        "规格型号": checkStatus.data[0].规格型号
                                        "规格型号": checkStatus.data[0].规格型号,
                                        "HUnitID": checkStatus.data[0].HUnitID,
                                        "计量单位": checkStatus.data[0].计量单位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                }
                            });
                        }
@@ -1133,6 +1145,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HPropertyID": OptionData.HItemID
                                    , "辅助属性": OptionData.辅助属性名称
                                })
                            }
                            })
                        }
                        //计量单位
@@ -1165,6 +1183,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //调入仓库
@@ -1195,6 +1219,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                            }
                            })
                            
                        }
@@ -1226,6 +1256,12 @@
                                        })
                                        layer.close(index);//关闭弹窗
                                    }
                                 , end: function () {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                            }
                                })
                            }
                        //仓位
@@ -1256,6 +1292,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            , end: function () {
                                obj.update({
                                    "HSPID": OptionData.HItemID
                                    , "仓位名称": OptionData.仓位名称
                                })
                            }
                            })
                        }
                       
@@ -1524,7 +1566,67 @@

            //以上是layui模块
        });
       
      // åŸºç¡€èµ„料返回数据

        function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回调入仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

         function GetHSCWHValue(obj)  //返回调出仓库
        {
            $("#HSCWHName").val(obj[0].仓库名称);
            $("#HSCWHID").val(obj[0].HItemID);
        }

         function GetHEmpValue(obj)  //返回业务员
        {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        } 

         function GetHManagerValue(obj)  //返回主管
        {
            $("#HMangerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         }  
        
         //双击返回辅助属性
         function GetGyProperty(data) {
             OptionData = data
         } 

         //双击返回仓位
         function GetGyStockPlace(data) {
             OptionData = data
         } 
    </script>
</body>
</html>

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillEdit.html

@@ -700,6 +700,14 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                })
                                }
                            })
                        }                        
                        //计量单位
@@ -729,6 +737,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //辅助计量单位
@@ -758,6 +772,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        } 
                        //调入仓库
@@ -787,9 +807,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                            }
                            })
                        } 
                        //调入仓库
                        //调出仓库
                        if (obj.event == "HSCWHID") {
                            layer.open({
                                type: 2
@@ -816,6 +842,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                            }
                            })
                        } 
                        //基本计量单位
@@ -845,6 +877,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HBASEUNITID": OptionData.HItemID
                                    , "基本计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        } 
                        //辅单位
@@ -874,6 +912,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HEXTAUXUNITID": OptionData.HItemID
                                    , "辅单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }

@@ -909,7 +953,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -932,7 +976,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '往来单位列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html', 'yes']
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html?Type=HSup', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -955,7 +999,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '验收人列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1001,7 +1045,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1023,8 +1067,8 @@
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , shift: 2//弹出动画/
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1046,7 +1090,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调入仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1069,7 +1113,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调出仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HSCWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1098,6 +1142,69 @@

            //以上是layui模块
        });

         // åŸºç¡€èµ„料返回数据
        function GetHSupNameValue(obj)  //返回往来单位
       {
            $("#HSupName").val(obj[0].供应商名称);
            $("#HSupID").val(obj[0].HItemID);
        } 

        function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回调入仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

         function GetHSCWHValue(obj)  //返回调出仓库
        {
            $("#HSCWHName").val(obj[0].仓库名称);
            $("#HSCWHID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHEmpValue(obj)  //返回仓管员
        {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        } 

         function GetHManagerValue(obj)  //返回主管
        {
            $("#HMangerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
    </script>
</body>
</html>

 WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html

@@ -750,9 +750,21 @@
                                        "HMaterID": checkStatus.data[0].HItemID,
                                         "物料代码": checkStatus.data[0].物料代码,
                                        "物料名称": checkStatus.data[0].物料名称,
                                        "规格型号": checkStatus.data[0].规格型号
                                        "规格型号": checkStatus.data[0].规格型号,
                                        "HUnitID": checkStatus.data[0].HUnitID,
                                        "计量单位": checkStatus.data[0].计量单位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                }
                            })
                        }
@@ -783,6 +795,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //辅助计量单位
@@ -812,6 +830,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.辅助属性名称
                                })
                            }
                            })
                        }
                        //调入仓库
@@ -841,6 +865,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //调出仓库
@@ -870,6 +900,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        obj.event = "";
@@ -1025,7 +1061,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1048,7 +1084,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '供应商列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html', 'yes']
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html?Type=HSup', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1071,7 +1107,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '验收人列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1117,7 +1153,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '负责人列表'//标题
                    , shift: 2//弹出动画
                    ,content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    ,content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1140,7 +1176,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    ,content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    ,content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1162,7 +1198,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调入仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1185,7 +1221,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调出仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HSCWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1238,6 +1274,68 @@

            //以上是layui模块
        });
         // åŸºç¡€èµ„料返回数据
        function GetHSupNameValue(obj)  //返回供应商
       {
            $("#HSupName").val(obj[0].供应商名称);
            $("#HSupID").val(obj[0].HItemID);
        } 

        function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回调入仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

         function GetHSCWHValue(obj)  //返回调出仓库
        {
            $("#HSCWHName").val(obj[0].仓库名称);
            $("#HSCWHID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHEmpValue(obj)  //返回仓管员
        {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        } 

         function GetHManagerValue(obj)  //返回负责人
        {
            $("#HManagerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EmployeeList.html

@@ -266,6 +266,9 @@
                    case "HProjectMember":  //返回项目成员
                        parent.GetHProjectMemberValue(data);
                        break;
                    case "HMaterEmp":  //返回打浆人
                        parent.GetHMaterEmpValue(data);
                        break;

                    case "HEmpList":  //返回职员    åˆ—表
                        var dataList = obj.data;

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -274,6 +274,15 @@
                btnrowDouble(obj);
            })

           function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetGyMaterial(data);
                parent.layer.close(index);
            }



            table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable', {
@@ -286,6 +295,8 @@
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });



            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
@@ -309,13 +320,13 @@
            //#endregion

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                parent.GetMaterValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            //table.on('rowDouble(mainTable)', function (obj) {
              //  var data = [];
             //   data.push(obj.data);
              //  parent.GetMaterValue(data);
              //  var index = parent.layer.getFrameIndex(window.name);
             //   parent.layer.close(index);
         //   });
            //#endregion

            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -477,13 +488,7 @@
            //#endregion


              function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetGyMaterial(data);
                parent.layer.close(index);
            }
             

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_PropertyList.html

@@ -302,6 +302,20 @@
            });
            //#endregion

              //双击表格事件
            table.on('rowDouble(mainTable)', function (obj) {
                btnrowDouble(obj);
            })


            function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetGyProperty(data);
                parent.layer.close(index);
            }

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Unit.html

@@ -371,13 +371,24 @@

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                parent.GetUnitValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                //var data = [];
               // data.push(obj.data);
               // parent.GetUnitValue(data);
               // var index = parent.layer.getFrameIndex(window.name);
                btnrowDouble(obj);  
                parent.layer.close(index);
            });
            //#endregion


        
         function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetGyUnit(data);
                parent.layer.close(index);
            }

            //重新同步按钮
            function set_ResCnz() {
@@ -443,13 +454,6 @@
            //#endregion


         function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetGyUnit(data);
                parent.layer.close(index);
            }


            //#region å¿«é€Ÿè¿‡æ»¤

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Warehouse.html

@@ -136,7 +136,8 @@

            var ins;                        //用于导出excel
            //#endregion

            var params = getUrlVars();
            var Type = params[params[0]];
            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            //初始化界面
@@ -239,17 +240,39 @@


        //#region åŒå‡»è¿”回数据
           //table.on('rowDouble(mainTable)', function (obj) {
           //     var data = [];
           //     data.push(obj.data);
           //     parent.GetHWHValue(data);
           //     var index = parent.layer.getFrameIndex(window.name);
           //     btnrowDouble(obj);
                //parent.layer.close(index);

          //  });
            //#endregion

         //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                parent.GetHWHValue(data);
                switch (Type) {
                    case "HWH":  //返回调入仓库
                        parent.GetHWHValue(data);
                        break;
                    case "HSCWH":  //返回调出仓库
                        parent.GetHSCWHValue(data);
                        break;
                    case "HEmpList":  //返回职员    åˆ—表
                        var dataList = obj.data;
                        //返回方法
                        parent.GetHWHListValue(dataList);
                        break;
                }
                var index = parent.layer.getFrameIndex(window.name);
                btnrowDouble(obj);
                //parent.layer.close(index);

                 btnrowDouble(obj);
                parent.layer.close(index);
            });
            //#endregion


            function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
@@ -414,6 +437,19 @@
            }
            //#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

            //重新同步按钮
            function set_ResCnz() {
                var HNumber2 = $('#HNumber2').val();

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍË¿âµ¥/Sc_ProductionReturnEdit.html

@@ -397,7 +397,7 @@
            }

            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0,"辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0, "辅助属性": "","辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                "HSecUnitRate":0,"HQtyMust": "0","HQty": "0","HPrice": "0","HMoney": "0","HWHID": 0, "收料仓库": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
            }];
@@ -409,7 +409,7 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0,"辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0, "辅助属性": "","辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                "HSecUnitRate":0,"HQtyMust": "0","HQty": "0","HPrice": "0","HMoney": "0","HWHID": 0, "收料仓库": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
                };
@@ -1219,7 +1219,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1368,6 +1368,14 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {
                                 obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                }
                                });
                        }
@@ -1398,6 +1406,49 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                         //辅助属性
                        if (obj.event == "HPropertyID") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "辅助属性列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_PropertyList.html', 'yes']
                                , 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({

                                        "HPropertyID": checkStatus.data[0].HItemID,
                                        "辅助属性": checkStatus.data[0].辅助属性名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                obj.update({
                                    "HPropertyID": OptionData.HItemID
                                    , "辅助属性": OptionData.辅助属性名称
                                })
                            }
                            })
                        }
                        //收料仓库
@@ -1427,6 +1478,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "收料仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //辅助计量单位
@@ -1456,6 +1513,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.计量单位名称
                                })
                            }   
                            })
                        }
                        obj.event = "";
@@ -1751,8 +1814,23 @@
            $("#HDeptID").val(obj[0].HItemID);
        }

           //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }


           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
          //双击返回辅助属性
         function GetGyProperty(data) {
             OptionData = data
         } 
        //#region å¤„理小数显示位数（data：需要处理的数据；num：数据的类型(如1:数量；2:金额；3:单价)）
        function dealDoubleToFixed(data, num) {
            //用于设置小数位数

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -1278,7 +1278,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html

@@ -1123,7 +1123,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Add_Edit_Kf_OtherOutBill.html

@@ -916,7 +916,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -939,7 +939,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '验收员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -962,7 +962,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1008,7 +1008,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1059,9 +1059,21 @@
                                        "HMaterID": checkStatus.data[0].HItemID,
                                        "物料代码": checkStatus.data[0].物料代码,
                                        "物料名称": checkStatus.data[0].物料名称,
                                        "规格型号": checkStatus.data[0].规格型号
                                        "规格型号": checkStatus.data[0].规格型号,
                                        "HUnitID": checkStatus.data[0].HUnitID,
                                        "计量单位": checkStatus.data[0].计量单位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                }
                            });
                        }
@@ -1085,6 +1097,7 @@
                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                     OptionData = checkStatus.data[0];
                                    //更新表格缓存的数据
                                    obj.update({

@@ -1093,6 +1106,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                obj.update({
                                    "HPropertyID": OptionData.HItemID
                                    , "辅助属性": OptionData.辅助属性名称
                                })
                            }
                            })
                        }
                        //计量单位
@@ -1125,6 +1144,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //收料仓库
@@ -1155,6 +1180,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "收料仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //仓位
@@ -1185,6 +1216,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            , end: function () {
                                obj.update({
                                    "HSPID": OptionData.HMainID
                                    , "仓位名称": OptionData.仓位名称
                                })
                            }
                            })
                        }
                       
@@ -1429,7 +1466,60 @@

            //以上是layui模块
        });
       
         function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHManagerValue(obj)  //返回主管
        {
            $("#HMangerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

         //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 


        //双击返回收料仓位
         function GetGyStockPlace(data) {
             OptionData = data
         } 

        //双击返回辅助属性
         function GetGyProperty(data) {
             OptionData = data
         } 
    </script>
</body>
</html>

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillEdit.html

@@ -708,6 +708,16 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                  , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                }
                            })
                        }
                        //计量单位
@@ -737,6 +747,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //辅助计量单位
@@ -766,6 +782,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                         , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.辅助属性名称
                                })
                            }
                            })
                        }
                        //调入仓库
@@ -795,6 +817,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //调出仓库
@@ -824,6 +852,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        obj.event = "";
@@ -858,7 +892,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -881,7 +915,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '供应商列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html', 'yes']
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html?Type=HSup', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -904,7 +938,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '验收人列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -950,7 +984,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '负责人列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -973,7 +1007,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -995,7 +1029,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调入仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1018,7 +1052,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '调出仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HSCWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1047,6 +1081,68 @@

            //以上是layui模块
        });
           // åŸºç¡€èµ„料返回数据
        function GetHSupNameValue(obj)  //返回供应商
       {
            $("#HSupName").val(obj[0].供应商名称);
            $("#HSupID").val(obj[0].HItemID);
        } 

        function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回调入仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

         function GetHSCWHValue(obj)  //返回调出仓库
        {
            $("#HSCWHName").val(obj[0].仓库名称);
            $("#HSCWHID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHEmpValue(obj)  //返回仓管员
        {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        } 

         function GetHManagerValue(obj)  //返回负责人
        {
            $("#HManagerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
    </script>
</body>
</html>

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBackBillEdit.html

@@ -273,7 +273,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                   content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes'],
                   content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -310,7 +310,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -347,7 +347,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -384,7 +384,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -939,7 +939,12 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                  obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"HMaterCode" : OptionData.物料代码
                                       , "HMaterName" :OptionData.物料名称
                                        ,"HMaterSpec" : OptionData.规格型号
                                })
                                }
                            });
                        }
@@ -980,7 +985,11 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                     obj.update({
                                    "HUnitID": OptionData.HItemID
                                    ,"HUnitCode": OptionData.计量单位代码
                                    , "HUnitName": OptionData.计量单位名称
                                })
                                }
                            });
                        }
@@ -1029,7 +1038,11 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                 obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "HWHCode": OptionData.仓库代码
                                    , "HWHName": OptionData.仓库名称
                                })
                                }
                            });
                        }
@@ -1098,6 +1111,53 @@


        });

           // åŸºç¡€èµ„料返回数据

        function GetHSecManagerValue(obj)  //返回领料员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }


        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

         function GetHManagerValue(obj)  //返回主管
        {
            $("#HMangerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
    </script>
</body>
</html>

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillLEdit.html

@@ -470,7 +470,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HMaterEmp', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -1559,7 +1559,14 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                     obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"HMaterCode" : OptionData.物料代码
                                       , "HMaterName" :OptionData.物料名称
                                        ,"HMaterSpec" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"HUnitName" : OptionData.计量单位名称
                                })
                                }
                            });
                        }
@@ -1600,7 +1607,11 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                     obj.update({
                                     "HPropertyID" :OptionData.HItemID
                                        ,"HPropertyCode" : OptionData.HNumber
                                       , "辅助属性" :OptionData.HName
                                })
                                }
                            });
                        }
@@ -1642,7 +1653,10 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                 obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                }
                            });
                        }
@@ -1691,7 +1705,6 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                }
                            });
                        }
@@ -2062,6 +2075,27 @@


        });

          function GetHDeptNameValue(obj)  //返回车间
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHMaterEmpValue(obj)  //返回打浆人
        {
            $("#HMaterEmpName").val(obj[0].职员名称);
            $("#HMaterEmpID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }
    </script>
</body>
</html>

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutRequestBill.html

@@ -737,6 +737,14 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                  , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                })
                                }
                            })
                        }
                        //计量单位
@@ -766,6 +774,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //仓库
@@ -795,6 +809,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //仓位
@@ -824,6 +844,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HSPID": OptionData.HItemID
                                    , "仓位": OptionData.仓位名称
                                })
                            }
                            })
                        }
                        //库存辅单位
@@ -853,6 +879,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "库存辅单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //基本单位
@@ -882,6 +914,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HBASEUNITID": OptionData.HItemID
                                    , "基本单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //辅单位
@@ -911,6 +949,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            , end: function () {
                                obj.update({
                                    "HEXTAUXUNITID": OptionData.HItemID
                                    , "辅单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }

@@ -946,7 +990,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -969,7 +1013,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -992,7 +1036,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '往来单位列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html', 'yes']
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html?Type=HSup', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1038,7 +1082,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '领料员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1061,7 +1105,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1084,7 +1128,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1113,6 +1157,68 @@

            //以上是layui模块
        });

           // åŸºç¡€èµ„料返回数据
        function GetHSupNameValue(obj)  //返回供应商
       {
            $("#HSupName").val(obj[0].供应商名称);
            $("#HSupID").val(obj[0].HItemID);
        } 

        function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHEmpValue(obj)  //返回仓管员
        {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        } 

         function GetHManagerValue(obj)  //返回负责人
        {
            $("#HMangerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 

          //双击返回仓位
         function GetGyStockPlace(data) {
             OptionData = data
         }
    </script>
</body>
</html>

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_StockOutRequestBill.html

@@ -680,6 +680,14 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                })
                                }
                            })
                        }
                        //计量单位
@@ -709,6 +717,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //仓库
@@ -738,6 +752,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //仓位
@@ -767,6 +787,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                  , end: function () {
                                obj.update({
                                    "HSPID": OptionData.HItemID
                                    , "仓位": OptionData.仓位名称
                                })
                            }
                            })
                        }
                        //库存辅单位
@@ -796,6 +822,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "库存辅单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //基本单位
@@ -825,6 +857,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                  , end: function () {
                                obj.update({
                                    "HBASEUNITID": OptionData.HItemID
                                    , "基本单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //辅单位
@@ -854,6 +892,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HEXTAUXUNITID": OptionData.HItemID
                                    , "辅单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }

@@ -889,7 +933,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -912,7 +956,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -935,7 +979,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '往来单位列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html', 'yes']
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html?Type=HSup', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -981,7 +1025,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '验收列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1004,7 +1048,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1027,7 +1071,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1056,6 +1100,68 @@

            //以上是layui模块
        });

          // åŸºç¡€èµ„料返回数据
        function GetHSupNameValue(obj)  //返回供应商
       {
            $("#HSupName").val(obj[0].供应商名称);
            $("#HSupID").val(obj[0].HItemID);
        } 

        function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

       function GetHKeeperValue(obj)  //返回保管员
       {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

        function GetHWHValue(obj)  //返回仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHEmpValue(obj)  //返回仓管员
        {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        } 

         function GetHManagerValue(obj)  //返回负责人
        {
            $("#HMangerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 

          //双击返回仓位
         function GetGyStockPlace(data) {
             OptionData = data
         }
    </script>
</body>
</html>

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBillEdit.html

@@ -397,7 +397,7 @@
            }

            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0,"辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0, "辅助属性": "","辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                "HSecUnitRate":0,"HQtyMust": "0","HQty": "0","HPrice": "0","HMoney": "0","HWHID": 0, "收料仓库": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
            }];
@@ -409,7 +409,7 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0,"辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "","HPropertyID":0, "辅助属性": "","辅助单位":"","HSecUnitID": 0, "辅助计量单位": "",
                "HSecUnitRate":0,"HQtyMust": "0","HQty": "0","HPrice": "0","HMoney": "0","HWHID": 0, "收料仓库": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
                };
@@ -1219,7 +1219,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1367,7 +1367,15 @@
                                    //按钮【按钮二】的回调
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {
                               end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                }
                                });
                        }
@@ -1398,6 +1406,49 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                          //辅助属性
                        if (obj.event == "HPropertyID") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "辅助属性列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_PropertyList.html', 'yes']
                                , 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({

                                        "HPropertyID": checkStatus.data[0].HItemID,
                                        "辅助属性": checkStatus.data[0].辅助属性名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                obj.update({
                                    "HPropertyID": OptionData.HItemID
                                    , "辅助属性": OptionData.辅助属性名称
                                })
                            }
                            })
                        }
                        //收料仓库
@@ -1427,6 +1478,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "收料仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //辅助计量单位
@@ -1456,6 +1513,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        obj.event = "";
@@ -1751,7 +1814,23 @@
            $("#HDeptID").val(obj[0].HItemID);
        }

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
        //双击返回辅助属性
         function GetGyProperty(data) {
             OptionData = data
         } 

        //#region å¤„理小数显示位数（data：需要处理的数据；num：数据的类型(如1:数量；2:金额；3:单价)）
        function dealDoubleToFixed(data, num) {

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Add_Edit_Kf_OtherInBill.html

@@ -919,7 +919,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -942,7 +942,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '验收员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -965,7 +965,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '保管员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1004,14 +1004,14 @@
                })
            }
            //主管
            function get_checkManager() {
           function get_checkManager() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '主管列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1019,10 +1019,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                      
                        $("#HManagerID").val(checkStatus.data[0].HItemID);
                        $("#HMangerName").val(checkStatus.data[0].职员名称);

                        $("#HManagerID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1062,9 +1060,21 @@
                                        "HMaterID": checkStatus.data[0].HItemID,
                                        "物料代码": checkStatus.data[0].物料代码,
                                        "物料名称": checkStatus.data[0].物料名称,
                                        "规格型号": checkStatus.data[0].规格型号
                                        "规格型号": checkStatus.data[0].规格型号,
                                        "HUnitID" : checkStatus.data[0].HUnitID,
                                        "计量单位" :checkStatus.data[0].计量单位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 ,end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                }
                            });
                        }
@@ -1098,6 +1108,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                            }
                            })
                        }
                        //收料仓库
@@ -1128,6 +1144,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                 obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "收料仓库": OptionData.仓库名称
                                })
                            }
                            })
                        }
                        //仓位
@@ -1158,6 +1180,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                obj.update({
                                    "HSPID": OptionData.HMainID
                                    , "仓位名称": OptionData.仓位名称
                                })
                            }
                            })
                        }
                       
@@ -1396,12 +1424,61 @@
                })
            }
            //#endregion

            //#endregion


            //以上是layui模块
        });

         function GetHWHValue(obj)  //返回仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
            $("#HWHID").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj)  //返回部门
        {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }

        function GetHSecManagerValue(obj)  //返回验收员
        {
            $("#HSecManagerName").val(obj[0].职员名称);
            $("#HSecManagerID").val(obj[0].HItemID);
        }

        function GetHKeeperValue(obj)  //返回保管员
        {
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }

       function GetHManagerValue(obj)  //返回主管
        {
            $("#HMangerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        } 

          //双击返回物料
         function GetGyMaterial(data) {
             OptionData = data
         }
           //双击返回计量单位
         function GetGyUnit(data) {
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 


        //双击返回收料仓位
         function GetGyStockPlace(data) {
             OptionData = data
         } 
       
    </script>
</body>

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -1246,7 +1246,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBill_Add_Up.html

@@ -1152,7 +1152,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '仓库列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=HWH', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面