yxj
2022-03-29 8d50a0db5f56d49599bcd979b1b0916808fedbd4
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
8个文件已修改
1个文件已添加
504 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill_Sc.html 189 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_HlpBillList.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/叫料管理/叫料退料单/JIT_BackGoods.html 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -796,6 +796,7 @@
    <Content Include="views\生产管理\报工平台功能页\LineBindStep.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsBill.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsBill_Sc.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsList.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - å¤åˆ¶.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsBill.html
@@ -146,7 +146,7 @@
        //仓库发料
        form.on('submit(Ckfl)', function () {
            get_Ckfl();
        })
        //行内事件
@@ -172,7 +172,7 @@
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 400
                , height: 420
                , page: true
                , cellMinWidth: 90
                , limit: 50
@@ -262,7 +262,7 @@
            option1 = {
                elem: '#mainTable1'
                //, toolbar: '#toolbarDemo'
                , height: 350
                , height: 420
                , page: true
                , cellMinWidth: 90
                , limit: 50
@@ -336,6 +336,45 @@
            return vars;
        }
        //仓库发料
        function get_Ckfl() {
            if (table.cache['mainTable1'].length == 0) {
                return layer.msg("无数据,无法发料!");
            }
            else {
                layer.confirm("确定要配送生成调拨单", {
                    btn: ['确定', '取消']
                    , btn1: function () {
                        var sMainStr = JSON.stringify(table.cache['mainTable1']) + ";" + sessionStorage["HUserName"] + ";" + $("#HInterID").val() + ";" + $("#HRemark").val();//sessionStorage["HUserName"]
                        $.ajax(
                            {
                                type: "POST",
                                url: GetWEBURL() + "Sc_ComplementGoods/JIT_SendGoodsBill", //方法所在页面和方法名
                                async: true,
                                data: { "msg": sMainStr },
                                dataType: "json",
                                success: function (data) {
                                    if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        layer.msg(data.Message, { icon: 1 });
                                    }
                                    else {
                                        layer.alert(data.Message, { icon: 5 });
                                        console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                    }
                                    layer.closeAll("loading");
                                },
                                error: function (err) {
                                    layer.alert("错误:" + err, { icon: 5 });
                                    console.log("Reason" + sMainStr);
                                }
                            });
                    }
                })
            }
        }
        //#endregion
    });
WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsBill_Sc.html
New file
@@ -0,0 +1,189 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>叫料单清单</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                </div>
                            </div>
                        </div>
                    </div>-->
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //查询条件
        var sWhere = "";
        var option = [];
        var HInterID = 0;
        var HEntryID = 0;
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //获取页面跳转参数
        var params = get_UrlVars();
        if (typeof (params[params[0]]) != "undefined") {
            HInterID= params[params[0]];
            HEntryID= params[params[2]];
        }
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //退出
        form.on('submit(Cancel)', function () {
            Pub_Close(1);
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //初始化界面
        function set_ClearBill()
        {
            set_InitGrid();
            get_Display(sWhere);
        }
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 550
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                    /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                     { field: '单据号', title: '单据号', sort: true, width: 165 }
                    , { field: '日期', title: '日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '源单单号', title: '源单单号', width: 170 }
                    , { field: '部门代码', title: '部门代码', width: 170 }
                    , { field: '部门名称', title: '部门名称', width: 170 }
                    , { field: '物料代码', title: '物料代码', width: 170 }
                    , { field: '物料名称', title: '物料名称', width: 170 }
                    , { field: '规格型号', title: '规格型号', width: 215 }
                    , { field: '数量', title: '数量', width: 170 }
                    , { field: '工序代码', title: '工序代码', width: 170 }
                    , { field: '工序名称', title: '工序名称', width: 170 }
                    , { field: '仓库代码', title: '仓库代码', width: 170 }
                    , { field: '单据类型', title: '单据类型' }
                    , { field: '表头备注', title: '表头备注', width: 170 }
                    , { field: '退回人', title: '退回人', width: 170 }
                    , { field: '退回日期', title: '退回日期', width: 200, templet: "<div>{{d.退回日期 ==null ?'':layui.util.toDateString(d.退回日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '退回原因', title: '退回原因', width: 170 }
                    , { field: '审核人', title: '审核人' }
                    , { field: '审核日期', title: '审核日期', width: 200, templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '制单人', title: '制单人' }
                    , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '修改人', title: '修改人' }
                    , { field: '修改日期', title: '修改日期', width: 200, templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '关闭人', title: '关闭人', width: 170 }
                    , { field: '关闭日期', title: '关闭日期', width: 200, templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '关闭类型', title: '关闭类型', width: 170 }
                    , { field: '作废人', title: '作废人' }
                    , { field: '作废日期', title: '作废日期', width: 200, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '源单类型', title: '源单类型', width: 170 }
                    , { field: '源单子内码', title: '源单子内码', width: 170 }
                    , { field: '源单号', title: '源单号', width: 170 }
                    , { field: '打印次数', title: '打印次数', width: 170 }
                    , { field: '叫料人代码', title: '叫料人代码', width: 170 }
                    , { field: '叫料人', title: '叫料人', width: 170 }
                    , { field: '配送人代码', title: '配送人代码', width: 170 }
                    , { field: '配送人', title: '配送人', width: 170 }
                    , { field: '保管人代码', title: '保管人代码', width: 170 }
                    , { field: '保管人', title: '保管人', width: 170 }
                    , { field: '叫料模式', title: '叫料模式', width: 170 }
                    , { field: '表体备注', title: '表体备注', width: 170 }
                    , { field: '仓库名称', title: '仓库名称', width: 170 }
                    , { field: '仓位名称', title: '仓位名称', width: 170 }
                ]]
            };
        }
        //查询加载数据
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsList_Sc',
                type: "GET",
                data: { "HInterID": HInterID, "HEntryID": HEntryID},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //获取传递数据
        function get_UrlVars() {
            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
    });
</script>
WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsList.html
@@ -207,6 +207,11 @@
            set_GridCellCheck(obj); //行内快捷键筛选
        })
        //上查
        form.on('submit(Sc)', function () {
            set_Sc();
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
@@ -527,6 +532,27 @@
            })
        }
        //上查
        function set_Sc() {
            var CheckStatus = table.checkStatus("mainTable");
            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据!")
            } else {
                var HInterID = CheckStatus.data[0].hmainid; //获取编号
                var HEntryID = CheckStatus.data[0].Hsubid;
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '叫料单清单'
                    , shift: 0//弹出动画
                    , content: '../拣料配送单/JIT_ComplementGoodsBill_Sc.html?HSourceInterID=' + HInterID + '&&HEntryID=' + HEntryID
                })
            }
        }
        //#endregion
    });
WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_ComplementGoodBillMain.html
@@ -295,8 +295,8 @@
                , cellMinWidth: 90
                , limit: 500
                , cols: [[
                    //{ type: 'checkbox', fixed: 'left' }
                     { field: '销售订单号', title: '销售订单号',width: 150 }
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '销售订单号', title: '销售订单号',width: 150 }
                    , { field: '生产订单号', title: '生产订单号', width: 170}
                    , { field: '产品代码', title: '产品代码', width: 170 }
                    , { field: '产品名称', title: '产品名称', width: 260, }
WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_HlpBillList.html
@@ -82,16 +82,6 @@
        form.on('submit(Cancel)', function () {
            Pub_Close(1);
        })
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        })
        //新增叫料单
        form.on('submit(Jl)', function () {
            set_AddNew_Jl();
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
@@ -157,44 +147,6 @@
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //行内快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == "Warehouse") {
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WarehouseList.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("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "调出仓库": checkStatus.data[0].HName
                                    , "调出仓库id": checkStatus.data[0].HItemID
                                })
                                console.log(checkStatus.data[0].HItemID)
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                }
            })
        }
        //获取传递数据
WebTM/views/³µ¼ä¹ÜÀí/½ÐÁϹÜÀí/½ÐÁÏÍËÁϵ¥/JIT_BackGoods.html
@@ -28,8 +28,6 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Edit" id="Edit">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="PZQR" id="PZQR">品质确认</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="CKJS" id="CKJS">仓库接收</button>
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">下查</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">预览</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">打印</button>-->
@@ -44,20 +42,17 @@
                                            <label class="layui-form-label" style="width: 80px;font-size:25px;">退料单</label>
                                        </div>
                                    </div>
                                    <!--<div class="layui-row">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 80px;">拣料配送单号</label>
                                            <label class="layui-form-label" style="width: 80px;">退料单号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;">
                                            </div>
                                            <label class="layui-form-label"></label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;display:none">
                                            </div>
                                        </div>
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ppkc" id="Ppkc">匹配库存</button>
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ckfl" id="Ckfl">仓库发料</button>
                                    </div>-->
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="PZQR" id="PZQR">品质确认</button>
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="CKJS" id="CKJS">仓库接收</button>
                                    </div>
                                    <div class="layui-tab" lay-filter="">
                                        <div class="layui-tab-content">
                                            <div class="layui-tab-item layui-show">
@@ -200,6 +195,8 @@
                data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },//
                success: function (data1) {
                    if (data1.count == 1) {
                        $("#HRemark").val(data1.data[0].单据号);
                        $("#HInterID").val(data1.data[0].hmainid);
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
@@ -241,7 +238,7 @@
            layer.confirm("确定要接收生成调拨单?", {
                btn:['确定', '取消']
                , btn1: function (index) {
                    sWhere = JSON.stringify(table.cache['mainTable']);
                    sWhere = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"];
                    $.ajax({
                        url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_CKJS',
                        type: "POST",
WebTM/views/²É¹º¹ÜÀí/ίÍâ¶©µ¥/WW_EntrustOrderBillList.html
@@ -59,10 +59,10 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content">
                                    <!--<div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>-->
        <div class="layui-inline">
            <span>其他条件></span>
        </div>
    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
@@ -71,8 +71,9 @@
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">业务员</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -85,12 +86,12 @@
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                    <!--<div class="layui-inline">
                                        <label class="layui-form-label">反馈状态</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
                                        </div>
                                    </div>
                                    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料编码</label>
                                        <div class="layui-input-block">
@@ -107,6 +108,24 @@
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">供应商</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline" style="margin-left:30px">
                                        <label class="layui-form-label">供应商反馈状态</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFeedback" lay-filter="HFeedback">
                                                <option value="" selected>全部</option>
                                                <option value="接收">接收</option>
                                                <option value="备料">备料</option>
                                                <option value="生产">生产</option>
                                                <option value="发货">发货</option>
                                            </select>
                                        </div>
                                    </div>
@@ -163,6 +182,8 @@
            set_InitGrid();
            //加载数据到网格
            get_Display(sWhere);
            //加载业务员
            get_HEmpName();
            //#endregion
            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
@@ -271,9 +292,9 @@
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }/*物料代码,物料名称,规格型号,批号,数量,单位,源单单号*/
                    , { field: '反馈状态', title: '供应商反馈状态', width: 135 }
                    , { field: '物料编码', title: '物料编码', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '物料编码', title: '物料编码', width: 130 }
                    , { field: '物料代码', title: '物料代码', width: 130 }
                    , { field: '物料名称', title: '物料名称', width: 120 }
                    , { field: '数量', title: '订单数量', width: 100}
                    , { field: '打印条码数量', title: '打印条码数量', width: 120}
                    , { field: '关联数量', title: '已发货数量', width: 120 }
@@ -281,7 +302,7 @@
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120 }
                    , { field: '计量单位', title: '计量单位', width: 100 }
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '供应商', title: '供应商', width: 150 }
                    , { field: '业务员', title: '业务员', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
@@ -960,8 +981,10 @@
                var HMaterNumber = $("#HMaterNumber").val();
                var HMaterName = $("#HMaterName").val();
                var HXTStatus = $("select[name='HXTStatus']").val();
                var HXTFKStatus = $("#HXTFKStatus").val();
                //var HXTFKStatus = $("#HXTFKStatus").val();
                var HMaterShortNumber = $("#HMaterShortNumber").val();
                var HSupName = $("#HSupName").val();//供应商
                var HFeedback = $("select[name='HFeedback']").val(); //供应商反馈状态
                if (HStatus) {
                    switch (HStatus) {
@@ -1005,8 +1028,16 @@
                    sWhere += " and ä¾›åº”商协同状态 like '%" + HXTStatus + "%'";
                }
                if (HXTFKStatus) {
                    sWhere += " and åé¦ˆçŠ¶æ€ like '%" + HXTFKStatus + "%'";
                //if (HXTFKStatus) {
                //    sWhere += " and åé¦ˆçŠ¶æ€ like '%" + HXTFKStatus + "%'";
                //}
                if (HSupName) {
                    sWhere += " and ä¾›åº”商 like '%" + HSupName + "%'";
                }
                if (HFeedback) {
                    sWhere += " and åé¦ˆçŠ¶æ€ like '%" + HFeedback + "%'";
                }
                var index = layer.load(0);
@@ -1023,6 +1054,8 @@
                $("#HEmpName").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HSupName").val("");//供应商
                $("select[name='HFeedback']").val(""); //供应商反馈状态
                sWhere = "";
                get_Display(sWhere);
            }
@@ -1031,7 +1064,26 @@
            function set_Refresh() {
                $("#btnSearch").click();
            }
            //获取业务员数据
            function get_HEmpName() {
                var HEmpName = '<option value="">全部</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetEmployeeList_Json",
                    data: { "Employee": '', "HGroupID": 0 },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HEmpName += '<option  value="' + data[i].HName + '">' + data[i].HName + '</option>';
                            }
                            $("#HEmpName").append(HEmpName);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //以上是layui模块
        });
    </script>
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -76,8 +76,10 @@
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">业务员</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -90,12 +92,12 @@
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">反馈状态</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
                                        </div>
                                    </div>
                                    <!--<div class="layui-inline">
        <label class="layui-form-label">反馈状态</label>
        <div class="layui-input-block">
            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
        </div>
    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料编码</label>
                                        <div class="layui-input-block">
@@ -112,6 +114,24 @@
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">供应商</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline" style="margin-left:30px">
                                        <label class="layui-form-label">供应商反馈状态</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFeedback" lay-filter="HFeedback">
                                                <option value="" selected>全部</option>
                                                <option value="接收">接收</option>
                                                <option value="备料">备料</option>
                                                <option value="生产">生产</option>
                                                <option value="发货">发货</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
@@ -265,6 +285,8 @@
                set_InitGrid();
                //加载数据到网格
                get_Display(sWhere);
                //加载业务员
                get_HEmpName();
            }
            //初始化表格
            function set_InitGrid() {
@@ -280,9 +302,9 @@
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }/*物料代码,物料名称,规格型号,批号,数量,单位,源单单号*/
                    , { field: '反馈状态', title: '供应商反馈状态', width: 135 }
                    , { field: '物料编码', title: '物料编码', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '物料编码', title: '物料编码', width: 120 }
                    , { field: '物料代码', title: '物料代码', width: 200 }
                    , { field: '物料名称', title: '物料名称', width: 130 }
                    , { field: '数量', title: '订单数量', width: 100 }
                    , { field: '打印条码数量', title: '打印条码数量', width: 120 }
                    , { field: '关联数量', title: '已发货数量', width: 120 }
@@ -292,7 +314,7 @@
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120 }
                    , { field: '计量单位', title: '计量单位', width: 100 }
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '供应商', title: '供应商', width: 150 }
                    , { field: '业务员', title: '业务员', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
                    , { field: '数量', title: '数量', width: 100 }
@@ -962,7 +984,9 @@
                var HMaterShortNumber = $("#HMaterShortNumber").val();
                var HMaterName = $("#HMaterName").val();
                var HXTStatus = $("select[name='HXTStatus']").val();
                var HXTFKStatus = $("#HXTFKStatus").val();
                //var HXTFKStatus = $("#HXTFKStatus").val();
                var HSupName = $("#HSupName").val();//供应商
                var HFeedback = $("select[name='HFeedback']").val(); //供应商反馈状态
                
                if (HStatus) {
                    switch (HStatus) {
@@ -1006,8 +1030,16 @@
                    sWhere += " and ä¾›åº”商协同状态 like '%" + HXTStatus + "%'";
                }
                if (HXTFKStatus) {
                    sWhere += " and åé¦ˆçŠ¶æ€ like '%" + HXTFKStatus + "%'";
                //if (HXTFKStatus) {
                //    sWhere += " and åé¦ˆçŠ¶æ€ like '%" + HXTFKStatus + "%'";
                //}
                if (HSupName) {
                    sWhere += " and ä¾›åº”商 like '%" + HSupName + "%'";
                }
                if (HFeedback) {
                    sWhere += " and åé¦ˆçŠ¶æ€ like '%" + HFeedback + "%'";
                }
                var index = layer.load(0);
@@ -1024,6 +1056,8 @@
                $("#HEmpName").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HSupName").val("");
                $("select[name='HFeedback']").val("");
                sWhere = "";
                get_Display(sWhere);
            }
@@ -1061,6 +1095,26 @@
                $("#btnSearch").click();
            }
            //获取业务员数据
            function get_HEmpName() {
                var HEmpName= '<option value="">全部</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetEmployeeList_Json",
                     data: { "Employee": '', "HGroupID": 0},
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HEmpName += '<option  value="' + data[i].HName + '">' + data[i].HName + '</option>';
                            }
                            $("#HEmpName").append(HEmpName);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //以上是layui模块
        });
    </script>