MES-WEB-LayUI.git

parent: 31ed6f35 | 补丁 | 提交 | ignore whitespace

杨乐

2022-01-10 2eafe8be7e906512b7235cebdc2b5f4b56286c76

完善 生产用料清单
组装追溯单
不良品处理单

4个文件已修改

	WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdCheckBillList.html	496 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html	351 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/组装单/Sc_GroupOrderBillList.html	387 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/Ôö¼Ó²»Á¼ÆÀÉóµ¥/QC_NoPassProdCheckBillList.html

@@ -1,7 +1,7 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>ä¸åæ ¼è¯å®¡åè¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,11 @@
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -27,49 +31,83 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate1">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">è®¢åè·è¸ªå·</label>
                                <div class="layui-inline">
                                    <label class="layui-form-label">åæ®å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>-->
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <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-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>å¶ä»æ¡ä»¶></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">åæ®å·</label>
                                        <label class="layui-form-label">é¨é¨</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
                                        </div>
                                    </div>
                                </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æä»£ç </label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
                                        </div>
                                    </div>
                                    <!--<hr />-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æåç§°</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="MaterialName" id="MaterialName" 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="SpecificationModel" id="SpecificationModel" 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="HSourceBillNo" id="HSourceBillNo" 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="Warehouse" id="Warehouse" 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="Hmaker" id="Hmaker" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>æ·»å </button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>æ·»å </button>-->

                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                            </div>
                        </script>
                    </form>
@@ -78,72 +116,232 @@
        </div>
    </div>

    <script type="text/html" id="barDemo">
    <!--<script type="text/html" id="barDemo">
  <a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>
  <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
</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>-->

  
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

             //#region å¬å±åé

            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            //var sWhere = " äº§åä»£ç  = 'BX0002'";
            var sWhere = "";
            var option = [];

            var option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                ,height: 'full-50' 
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    //{ type: 'checkbox' }
                    
                      { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
                    , { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120 }
                    , { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
                    , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
                    , { field: 'çäº§èµæºåç§° ', title: 'çäº§èµæºåç§° ', width: 115 }
                    , { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
                    , { field: 'ç©æåç ', title: 'ç©æåç ', width: 100 }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
                    , { field: 'æ£éªåä»£ç ', title: 'æ£éªåä»£ç ' }
                    , { field: 'æ£éªååç§°', title: 'æ£éªååç§°' }
                    , { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ' }
                    , { field: 'åä½åç§°', title: 'åä½åç§°' }
                    , { field: 'ä¸è¯åå ä»£ç  ', title: 'ä¸è¯åå ä»£ç ' }
                    , { field: 'ä¸è¯åå ', title: 'ä¸è¯åå ' }
                    , { field: 'å¶åäºº', title: 'å¶åäºº' }
                    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
                    , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
                    , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
                    , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
                    , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ' }
                    , { field: 'å³éäºº', title: 'å³éäºº' }
                    , { field: 'å³éæ¥æ', title: 'å³éæ¥æ' }
                    , { field: 'ä½åºäºº', title: 'ä½åºäºº' }
                    , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
                    , { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
                    , { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }
              //#endregion

                     //,{fixed: 'right', title:'æä½', toolbar: '#barDemo', width:150}
                ]]
            };
             //#region åå§åçé¢
            set_ClearBill();
              //#endregion

   
             //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    case 'btn-Add':
                        layer.open({
                            type: 2 //Pageå±ç±»å
                            , area: ['100%', '100%']
                            , title: 'æ°å¢æ´¾å·¥å'
                            , shade: 0.6 //é®ç½©éæåº¦
                            , maxmin: false //åè®¸å¨å±æå°å
                            , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                            , content: ['../å¢å ä¸è¯è¯å®¡å/QC_Add_NoPassProdCheckBill.html', 'yes']
                            , resize: false
                            , cancel: function () {
                                //$(".layui-btn").removeClass("layui-btn-disabled");
                            }

                        });
                        break;
                    case '':
                        layer.msg('');
                        break;

                };
            });

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
                get_FastQuery();
            });

              //#endregion

             //#region æ¤é¡µé¢ææçæ¹æ³


            // åå§åçé¢
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_Display(sWhere);
                //åå§åæ¥æ
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            }

            //è¡¨æ ¼æ°æ®
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , cols: [[
                        //{ type: 'checkbox' }
                        { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
                        , { field: 'çäº§èµæºåç§° ', title: 'çäº§èµæºåç§° ', width: 115 }
                        , { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
                        , { field: 'ç©æåç ', title: 'ç©æåç ', width: 100 }
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
                        , { field: 'æºååå·', title: 'æºååå·' }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                        , { field: 'æ£éªåä»£ç ', title: 'æ£éªåä»£ç ' }
                        , { field: 'æ£éªååç§°', title: 'æ£éªååç§°' }
                        , { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ' }
                        , { field: 'åä½åç§°', title: 'åä½åç§°' }
                        , { field: 'ä¸è¯åå ä»£ç  ', title: 'ä¸è¯åå ä»£ç ' }
                        , { field: 'ä¸è¯åå ', title: 'ä¸è¯åå ' }
                        , { field: 'å¶åäºº', title: 'å¶åäºº' }
                        , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
                        , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
                        , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
                        , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
                        , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'å³éäºº', title: 'å³éäºº' }
                        , { field: 'å³éæ¥æ', title: 'å³éæ¥æ' }
                        , { field: 'ä½åºäºº', title: 'ä½åºäºº' }
                        , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
                        , { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }

                        //,{fixed: 'right', title:'æä½', toolbar: '#barDemo', width:150}
                    ]]
                };
            }

            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            function get_Display(sWhere) {
                var index0 = layer.load(0, { shade: false });
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index0);
                        } else {
                            layer.close(index0);
                            layer.msg(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index0);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }

            // å¿«éè¿æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HDeptID = $("#HDeptID").val();//é¨é¨
                var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç 
                var MaterialName = $("#MaterialName").val();//ç©æåç§°
                var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
                var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
                var Warehouse = $("#Warehouse").val();//ä»åº
                var Hmaker = $("#Hmaker").val();//å¶åäºº

                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HDeptID) {
                    sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
                }
                if (MaterialCode) {
                    sWhere += " and ç©æä»£ç  like '%" + MaterialCode + "%'";
                }
                if (MaterialName) {
                    sWhere += " and ç©æåç§° like '%" + MaterialName + "%'";
                }
                if (SpecificationModel) {
                    sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
                }
                if (Warehouse) {
                    sWhere += " and åè´§ä»åº like '%" + Warehouse + "%'";
                }
                if (Hmaker) {
                    sWhere += " and å¶åäºº like '%" + Hmaker + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }

            // éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//åæ®å·
                $("#HDeptID").val("");//é¨é¨
                $("#MaterialCode").val("");//ç©æä»£ç 
                $("#MaterialName").val("");//ç©æåç§°
                $("#SpecificationModel").val("");//è§æ ¼åå·
                $("#HSourceBillNo").val("");//æºååå·
                $("#Warehouse").val("");//ä»åº
                $("#Hmaker").val("");//å¶åäºº

                sWhere = "";
            }

              //#endregion

            //ä»¥ä¸æ¯layuiæ¨¡å
        });


//çå¬è¡å·¥å·äºä»¶
  //table.on('tool(mainTable)', function(obj){
  //  var data = obj.data;
@@ -166,154 +364,6 @@
  //      //layer.alert('ææ¯ç¼è¾ä¸');
  //  }
  //});
            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    case 'btn-Pushdown':
    //                    var checkStatus = table.checkStatus('mainTable')
    //                    , data = checkStatus.data;
    //                    ajaxLabelData = data;
    //                    var rows = '';
    //                    var HEntry = '';
    //                      for (var i = 0; i < data.length; i++) {
    //                            rows += data[i].hmainid.toString() + ',' ;
                            
    //                    }

    //                    if (checkStatus.data.length < 1)
    //                    {
    //                        layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨');
    //                    } else
    //                    {
                  
                ////é¡µé¢å±
                //layer.open({
                //               type: 2 //Pageå±ç±»å
                //               ,area: ['100%', '100%']
                //               ,title: 'æ°å¢æ´¾å·¥å'
                //               ,shade: 0.6 //é®ç½©éæåº¦
                //               ,maxmin: false //åè®¸å¨å±æå°å
    //                , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
    //                , content: ['../å·¥åºæ´¾å·¥å/Sc_Add_ProcessSendWork.html?HInterID=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString().substring(0, rows.length - 1), '&PlanBeginDate=' + data[0].è®¡åå¼å·¥æ¥æ.toString(), '&PlanEndDate=' + data[0].è®¡åå®å·¥æ¥æ.toString(), 'yes']
    //                           , resize: false
    //                         , cancel: function () {
    //                            //$(".layui-btn").removeClass("layui-btn-disabled");
    //                        }
                             
                //           });
  		
    //                    }
                          layer.msg('åååï¼ï¼ï¼ï¼ï¼ï¼');
                        break;
                    case 'btn-Add':
                         layer.open({
                               type: 2 //Pageå±ç±»å
                               ,area: ['100%', '100%']
                               ,title: 'æ°å¢æ´¾å·¥å'
                               ,shade: 0.6 //é®ç½©éæåº¦
                               ,maxmin: false //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: ['../å¢å ä¸è¯è¯å®¡å/QC_Add_NoPassProdCheckBill.html' , 'yes']
                               , resize: false
                             , cancel: function () {
                                //$(".layui-btn").removeClass("layui-btn-disabled");
                            }
                             
                           });
                        break;
                    case '':
                        layer.msg('');
                        break;

                };
            });

            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            var index0 = layer.load(0, { shade: false });
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index0);
                    } else {
                        layer.close(index0);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index0);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            }); 

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                $("#HDate").val("");//å¼å§æ¥æ
                $("#HDate1").val("");//ç»ææ¥æ
                //$("#HOrderProcNO").val("");//è®¢åè·è¸ªå·
                //$("#WorkCenter").val("");//åæ®å·
                $("#btnSearch").click();
            });

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
                var HDate = $("#HDate").val();//å¼å§æ¥æ
                var HDate1 = $("#HDate1").val();//ç»ææ¥æ
                //var HOrderProcNO = $("#HOrderProcNO").val();//è®¢åè·è¸ªå·
                //var WorkCenter = $("#WorkCenter").val();//åæ®å·
                if (HDate) {
                    sWhere += " and æ¥æ >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and æ¥æ <= '" + HDate1 + "'";
                }
                //if (HOrderProcNO) {
                //    sWhere += " and è®¢åè·è¸ªå· like '%" + HOrderProcNO + "%'";
                //}
                //if (WorkCenter) {
                //    sWhere += " and HBillNo like '%" + WorkCenter + "%'";
                //}
                var index = layer.load(0, { shade: false });
                $.ajax({
                    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                            layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            });


            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});


            //ä»¥ä¸æ¯layuiæ¨¡å
        });

        


    </script>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ¶ÁÏµ¥/Sc_PPBomBillList.html

@@ -1,15 +1,20 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>çäº§ç¨ææ¸ååè¡¨</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>çäº§ç¨ææ¸ååè¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

</head>
<body>
    <div class="layui-fluid">
@@ -21,26 +26,76 @@
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">åæ®å·</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HMaterialName" id="HMaterialName">
                                    <label class="layui-form-label">ç»ææ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" 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="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <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">
                                        <label class="layui-form-label">é¨é¨</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" 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="MaterialCode" id="MaterialCode" style="width:190px;">
                                        </div>
                                    </div>
                                    <!--<hr />-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æåç§°</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="MaterialName" id="MaterialName" 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="SpecificationModel" id="SpecificationModel" 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="HSourceBillNo" id="HSourceBillNo" 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="Warehouse" id="Warehouse" 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="Hmaker" id="Hmaker" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -52,6 +107,13 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>

                            </div>
@@ -61,112 +123,114 @@
            </div>
        </div>
    </div>
    <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>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å¬å±åé
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            //#endregion

            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                ,height: 'full-50' 
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                    , { field: 'æ¥æ', title: 'æ¥æ' }
                    , { field: 'åæ®å·', title: 'åæ®å·' }
                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ' }
                    , { field: 'é¨é¨', title: 'é¨é¨' }
                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                    , { field: 'äº§ååç§°', title: 'äº§ååç§°' }
                    , { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼' }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'ä¸»è¡¨è®¡éåä½ä»£ç ', title: 'ä¸»è¡¨è®¡éåä½ä»£ç ' }
                    , { field: 'ä¸»è¡¨è®¡éåä½', title: 'ä¸»è¡¨è®¡éåä½' }
                    , { field: 'çäº§æ°é', title: 'çäº§æ°é' }
                    , { field: 'hsubid', title: 'hsubid', hide: true }
                    , { field: 'hmaterid2', title: 'hmaterid2', hide: true }
                    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
                    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                    , { field: 'hunitid2', title: 'hunitid2', hide: true }
                    , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
                    , { field: 'è®¡éåä½', title: 'è®¡éåä½' }
                    , { field: 'æ°é', title: 'æ°é' }
                    , { field: 'æèç', title: 'æèç' }
                    , { field: 'HWHID', title: 'HWHID', hide: true }
                    , { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ' }
                    , { field: 'ä»åº', title: 'ä»åº' }
                    , { field: 'HSPID', title: 'HSPID', hide: true }
                    , { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ' }
                    , { field: 'ä»ä½', title: 'ä»ä½' }
                    , { field: 'çäº§ä»»å¡åå·', title: 'çäº§ä»»å¡åå·' }
                    , { field: 'å¶åäºº', title: 'å¶åäºº' }
                    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
                    , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
                    , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
                    , { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·' }
                    , { field: 'è®¡åæ¨¡å¼', title: 'è®¡åæ¨¡å¼' }
                ]]
            };
             //#region åå§åçé¢
            set_ClearBill();
             //#endregion

            var index = layer.load(0, { shade: false });
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Sc_PPBomBill/list',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            }); 

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#btnSearch").click();
            });
             //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                var HBillNo = $("#HBillNo").val();
                var HMaterialName = $("#HMaterialName").val();
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HMaterialName) {
                    sWhere += " and ç©æåç§° like '%" + HMaterialName + "%'";
                }
                get_FastQuery();
            });

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });

             //#endregion

             //#region æ¤é¡µé¢ææçæ¹æ³

            // åå§åçé¢
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_Display(sWhere);
                //åå§åæ¥æ
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            }

            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , cols: [[
                        { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 150, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 150 }
                        , { field: 'é¨é¨', title: 'é¨é¨' }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
                        , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                        , { field: 'äº§ååç§°', title: 'äº§ååç§°' }
                        , { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼' }
                        , { field: 'æºååå·', title: 'æºååå·', width: 150 }
                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
                        , { field: 'ä¸»è¡¨è®¡éåä½ä»£ç ', title: 'ä¸»è¡¨è®¡éåä½ä»£ç ' }
                        , { field: 'ä¸»è¡¨è®¡éåä½', title: 'ä¸»è¡¨è®¡éåä½' }
                        , { field: 'çäº§æ°é', title: 'çäº§æ°é' }
                        , { field: 'hsubid', title: 'hsubid', hide: true }
                        , { field: 'hmaterid2', title: 'hmaterid2', hide: true }
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                        , { field: 'hunitid2', title: 'hunitid2', hide: true }
                        , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
                        , { field: 'è®¡éåä½', title: 'è®¡éåä½' }
                        , { field: 'æ°é', title: 'æ°é' }
                        , { field: 'æèç', title: 'æèç' }
                        , { field: 'HWHID', title: 'HWHID', hide: true }
                        , { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ' }
                        , { field: 'ä»åº', title: 'ä»åº' }
                        , { field: 'HSPID', title: 'HSPID', hide: true }
                        , { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ' }
                        , { field: 'ä»ä½', title: 'ä»ä½' }
                        , { field: 'çäº§ä»»å¡åå·', title: 'çäº§ä»»å¡åå·', width: 150 }
                        , { field: 'å¶åäºº', title: 'å¶åäºº' }
                        , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 150, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
                        , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 150, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"  }
                        , { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·' }
                        , { field: 'è®¡åæ¨¡å¼', title: 'è®¡åæ¨¡å¼' }
                    ]]
                };
            }


            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_PPBomBill/list',
@@ -176,31 +240,84 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("æ¥è¯¢æå", { icon: 1 });
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }

            // å¿«éè¿æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HDeptID = $("#HDeptID").val();//é¨é¨
                var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç 
                var MaterialName = $("#MaterialName").val();//ç©æåç§°
                var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
                var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
                var Warehouse = $("#Warehouse").val();//ä»åº
                var Hmaker = $("#Hmaker").val();//å¶åäºº

                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HDeptID) {
                    sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
                }
                if (MaterialCode) {
                    sWhere += " and ç©æä»£ç  like '%" + MaterialCode + "%'";
                }
                if (MaterialName) {
                    sWhere += " and ç©æåç§° like '%" + MaterialName + "%'";
                }
                if (SpecificationModel) {
                    sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
                }
                if (Warehouse) {
                    sWhere += " and åè´§ä»åº like '%" + Warehouse + "%'";
                }
                if (Hmaker) {
                    sWhere += " and å¶åäºº like '%" + Hmaker + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            });
            }

            // éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//åæ®å·
                $("#HDeptID").val("");//é¨é¨
                $("#MaterialCode").val("");//ç©æä»£ç 
                $("#MaterialName").val("");//ç©æåç§°
                $("#SpecificationModel").val("");//è§æ ¼åå·
                $("#HSourceBillNo").val("");//æºååå·
                $("#Warehouse").val("");//ä»åº
                $("#Hmaker").val("");//å¶åäºº

            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
                sWhere = "";
            }


             //#endregion
            //ä»¥ä¸æ¯layuiæ¨¡å
        });

        


    </script>


 WebTM/views/Éú²ú¹ÜÀí/×é×°µ¥/Sc_GroupOrderBillList.html

@@ -1,15 +1,17 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>äº§çº¿ç»æååè¡¨</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>äº§çº¿ç»æååè¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

</head>
<body>
    <div class="layui-fluid">
@@ -27,19 +29,19 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¶é´</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="å¼å§æ¶é´" id="å¼å§æ¶é´">
                                        <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¶é´</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="ç»ææ¶é´" id="ç»ææ¶é´">
                                        <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»æåå·</label>
                                    <label class="layui-form-label">åæ®å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="ç»æåå·" id="ç»æåå·">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -49,27 +51,9 @@

                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>å¶ä»æ¡ä»¶></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¶åäºº</label>
                                        <label class="layui-form-label">ç»æåå·</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="å¶åäºº" id="å¶åäºº">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç»æåå¯ä¸æ¡ç </label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="ç»æåå¯ä¸æ¡ç " id="ç»æåå¯ä¸æ¡ç ">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>å¶ä»æ¡ä»¶></span>
                                            <input type="text" class="layui-input" name="ç»æåå·" id="ç»æåå·">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -84,21 +68,71 @@
                                            <input type="text" class="layui-input" name="åè£åå¯ä¸æ¡ç " id="åè£åå¯ä¸æ¡ç ">
                                        </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="ç»æåå¯ä¸æ¡ç " id="ç»æåå¯ä¸æ¡ç ">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">é¨é¨</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HDeptID" id="HDeptID" 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="MaterialCode" id="MaterialCode" style="width:190px;">
                                        </div>
                                    </div>
                                    <!--<hr />-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æåç§°</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="MaterialName" id="MaterialName" 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="hmodel" id="hmodel">
                                            <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
                                        </div>
                                    </div>-->
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">æºååå·</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" 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="Warehouse" id="Warehouse" 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="Hmaker" id="Hmaker" style="width:190px;">
                                        </div>
                                    </div>
                                </div>

                            </div>
                        </div>
                        <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container layui-form-item">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print">
                                    <i class="layui-icon layui-icon-file"></i>æå°
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print"><i class="layui-icon layui-icon-file"></i>æå° </button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                            </div>
                        </script>
                    </form>
@@ -119,6 +153,9 @@
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å¬å±åé

            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
@@ -128,122 +165,27 @@
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util;
            //var sWhere = " äº§åä»£ç  = 'BX0002'";
            var sWhere = "";
            var option = [];

            var option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , cols: [[
                    { type: 'radio' }
                    , { field: 'ç»æåç±»å', title: 'ç»æåç±»å', sort: true, hide: true }
                    , { field: 'ç»æåä¸»ID', title: 'ç»æåä¸»ID', sort: true, hide: true }
                    , { field: 'ç»æåå·', title: 'ç»æåå·', sort: true, width:155 }
                    , { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
                    , {
                        field: 'å¶åæ¶é´', title: 'ç»ææ¶é´', sort: true, templet: function (d) {
                            if (d.å¶åæ¶é´ == null) {
                                return "";
                            }
                            return util.toDateString(d.å¶åæ¶é´, "yyyy-MM-dd");
                        }
                    }
                    , { field: 'ç»æåå¯ä¸æ¡ç ', title: 'ç»æç ', sort: true }
                    , { field: 'åè£åå·', title: 'åè£åå·', sort: true }
                    , { field: 'åè£åç±»å', title: 'åè£åç±»å', hide: true }
                    , { field: 'åè£åå¯ä¸æ¡ç ', title: 'åè£ç ', width: 165 }
                    , { toolbar: '#toolBar', title: 'æä½', width: 115, fixed: 'right' }
                ]]
                , text: {
                    none: 'ææ ç¸å³æ°æ®ï¼'
                }
            };
            //#endregion

            option.data = [];
            table.render(option);
            //#region åå§åçé¢
            set_ClearBill();
            //#endregion


            //è¿å¥é¡µé¢æ¾ç¤ºçåè¡¨
            layer.load(3);
            $.ajax({
                url: GetWEBURL() + '/GroupOrderBill/List',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.closeAll("loading");
                    } else {
                        layer.closeAll("loading");
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.alert("æ¥å£å¤±æ!", { icon: 5 });
                }
            });
            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                $("#å¼å§æ¶é´").val("");
                $("#ç»ææ¶é´").val("");
                $("#ç»æåå·").val("");
                $("#å¶åäºº").val("");
                $("#ç»æåå¯ä¸æ¡ç ").val("");
                $("#åè£åå·").val("");
                $("#åè£åå¯ä¸æ¡ç ").val("");
                $("#btnSearch").click();
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                var å¼å§æ¶é´ = $("#å¼å§æ¶é´").val();
                var ç»ææ¶é´ = $("#ç»ææ¶é´").val();
                var ç»æåå· = $("#ç»æåå·").val();
                var å¶åäºº = $("#å¶åäºº").val();
                var ç»æåå¯ä¸æ¡ç  = $("#ç»æåå¯ä¸æ¡ç ").val();
                var åè£åå· = $("#åè£åå·").val();
                var åè£åå¯ä¸æ¡ç  = $("#åè£åå¯ä¸æ¡ç ").val();
                if (å¼å§æ¶é´) {
                    sWhere += " and å¶åæ¶é´ > '" + å¼å§æ¶é´ + "'";
                }
                if (ç»ææ¶é´) {
                    sWhere += " and å¶åæ¶é´ < '" + ç»ææ¶é´ + "'";
                }
                if (ç»æåå·) {
                    sWhere += " and ç»æåå· like '%" + ç»æåå· + "%'";
                }
                if (å¶åäºº) {
                    sWhere += " and å¶åäºº like '%" + å¶åäºº + "%'";
                }
                if (ç»æåå¯ä¸æ¡ç ) {
                    sWhere += " and ç»æåå¯ä¸æ¡ç  like '%" + ç»æåå¯ä¸æ¡ç  + "%'";
                }
                if (åè£åå·) {
                    sWhere += " and åè£åå· like '%" + åè£åå· + "%'";
                }
                if (åè£åå¯ä¸æ¡ç ) {
                    sWhere += " and åè£åå¯ä¸æ¡ç  like '%" + åè£åå¯ä¸æ¡ç  + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/GroupOrderBill/List',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
                    }
                });
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
                get_FastQuery();
               
            });
            //è·åéä¸è¡æ°æ®
            table.on('row(mainTable)', function (obj) {
@@ -317,14 +259,173 @@
                }
            });

            //#endregion

            //#region æ¤é¡µé¢ææçæ¹æ³

            // åå§åçé¢
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_Display(sWhere);
                //åå§åæ¥æ
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
            //è¡¨æ ¼æ°æ®
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'radio' }
                        , { field: 'ç»æåç±»å', title: 'ç»æåç±»å', sort: true, hide: true }
                        , { field: 'ç»æåä¸»ID', title: 'ç»æåä¸»ID', sort: true, hide: true }
                        , { field: 'ç»æåå·', title: 'ç»æåå·', sort: true, width: 155 }
                        , { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
                        , {
                            field: 'å¶åæ¶é´', title: 'ç»ææ¶é´', sort: true, templet: function (d) {
                                if (d.å¶åæ¶é´ == null) {
                                    return "";
                                }
                                return util.toDateString(d.å¶åæ¶é´, "yyyy-MM-dd");
                            }
                        }
                        , { field: 'ç»æåå¯ä¸æ¡ç ', title: 'ç»æç ', sort: true }
                        , { field: 'åè£åå·', title: 'åè£åå·', sort: true }
                        , { field: 'åè£åç±»å', title: 'åè£åç±»å', hide: true }
                        , { field: 'åè£åå¯ä¸æ¡ç ', title: 'åè£ç ', width: 165 }
                        , { toolbar: '#toolBar', title: 'æä½', width: 115, fixed: 'right' }
                    ]]
                    , text: {
                        none: 'ææ ç¸å³æ°æ®ï¼'
                    }
                };
            }

            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            function get_Display(sWhere) {
                layer.load(3);
                $.ajax({
                    url: GetWEBURL() + '/GroupOrderBill/List',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.closeAll("loading");
                        } else {
                            layer.closeAll("loading");
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
                    }
                });
            }

            // å¿«éè¿æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HDeptID = $("#HDeptID").val();//é¨é¨
                var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç 
                var MaterialName = $("#MaterialName").val();//ç©æåç§°
                var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
                var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
                var Warehouse = $("#Warehouse").val();//ä»åº
                var Hmaker = $("#Hmaker").val();//å¶åäºº

                var ç»æåå· = $("#ç»æåå·").val();
                var ç»æåå¯ä¸æ¡ç  = $("#ç»æåå¯ä¸æ¡ç ").val();
                var åè£åå· = $("#åè£åå·").val();
                var åè£åå¯ä¸æ¡ç  = $("#åè£åå¯ä¸æ¡ç ").val();

                if (ç»æåå·) {
                    sWhere += " and ç»æåå· like '%" + ç»æåå· + "%'";
                }
             
                if (ç»æåå¯ä¸æ¡ç ) {
                    sWhere += " and ç»æåå¯ä¸æ¡ç  like '%" + ç»æåå¯ä¸æ¡ç  + "%'";
                }
                if (åè£åå·) {
                    sWhere += " and åè£åå· like '%" + åè£åå· + "%'";
                }
                if (åè£åå¯ä¸æ¡ç ) {
                    sWhere += " and åè£åå¯ä¸æ¡ç  like '%" + åè£åå¯ä¸æ¡ç  + "%'";
                }


                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HDeptID) {
                    sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
                }
                if (MaterialCode) {
                    sWhere += " and ç©æä»£ç  like '%" + MaterialCode + "%'";
                }
                if (MaterialName) {
                    sWhere += " and ç©æåç§° like '%" + MaterialName + "%'";
                }
                if (SpecificationModel) {
                    sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
                }
                if (Warehouse) {
                    sWhere += " and åè´§ä»åº like '%" + Warehouse + "%'";
                }
                if (Hmaker) {
                    sWhere += " and å¶åäºº like '%" + Hmaker + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }

            // éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#ç»æåå·").val("");
                $("#ç»æåå¯ä¸æ¡ç ").val("");
                $("#åè£åå·").val("");
                $("#åè£åå¯ä¸æ¡ç ").val("");
                $("#btnSearch").click();

                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//åæ®å·
                $("#HDeptID").val("");//é¨é¨
                $("#MaterialCode").val("");//ç©æä»£ç 
                $("#MaterialName").val("");//ç©æåç§°
                $("#SpecificationModel").val("");//è§æ ¼åå·
                $("#HSourceBillNo").val("");//æºååå·
                $("#Warehouse").val("");//ä»åº
                $("#Hmaker").val("");//å¶åäºº

                sWhere = "";
            }

            function Print(data) {
                console.log("data=", data);
            }
            //#endregion
            //option.data = [];
            //table.render(option);
            //ä»¥ä¸æ¯layuiæ¨¡å
        });

        function Print(data) {
            console.log("data=", data);
        }


    </script>


 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛÍË»õµ¥/Kf_ICStockBillMainList.html

@@ -359,13 +359,13 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//åæ®å·
                $("#HCusID").val("");//å®¢æ·
                $("#HDeptID").val();//é¨é¨
                $("#MaterialCode").val();//ç©æä»£ç 
                $("#MaterialName").val();//ç©æåç§°
                $("#SpecificationModel").val();//è§æ ¼åå·
                $("#HSourceBillNo").val();//æºååå·
                $("#Warehouse").val();//ä»åº
                $("#Hmaker").val();//å¶åäºº
                $("#HDeptID").val("");//é¨é¨
                $("#MaterialCode").val("");//ç©æä»£ç 
                $("#MaterialName").val("");//ç©æåç§°
                $("#SpecificationModel").val("");//è§æ ¼åå·
                $("#HSourceBillNo").val("");//æºååå·
                $("#Warehouse").val("");//ä»åº
                $("#Hmaker").val("");//å¶åäºº

                sWhere = "";
            }

			@@ -1,7 +1,7 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>ä¸åæ ¼è¯å®¡åè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			@@ -9,7 +9,11 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<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>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -27,49 +31,83 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate1">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>-->
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<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-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			<input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
			</div>
			</div>
			<!--<hr />-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="MaterialName" id="MaterialName" 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="SpecificationModel" id="SpecificationModel" 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="HSourceBillNo" id="HSourceBillNo" 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="Warehouse" id="Warehouse" 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="Hmaker" id="Hmaker" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>æ·»å </button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon"></i>æ·»å </button>-->

			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			</div>
			</script>
			</form>
			@@ -78,72 +116,232 @@
			</div>
			</div>

			<script type="text/html" id="barDemo">
			<!--<script type="text/html" id="barDemo">
			<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</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>-->


			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

			//#region å¬å±åé

			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			//var sWhere = " äº§åä»£ç = 'BX0002'";
			var sWhere = "";
			var option = [];

			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			,height: 'full-50'
			, page: true
			,cellMinWidth: 90
			, cols: [[
			//{ type: 'checkbox' }

			{ field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'çäº§èµæºåç§° ', title: 'çäº§èµæºåç§° ', width: 115 }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
			, { field: 'ç©æåç ', title: 'ç©æåç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'æ£éªåä»£ç ', title: 'æ£éªåä»£ç ' }
			, { field: 'æ£éªååç§°', title: 'æ£éªååç§°' }
			, { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ' }
			, { field: 'åä½åç§°', title: 'åä½åç§°' }
			, { field: 'ä¸è¯åå ä»£ç ', title: 'ä¸è¯åå ä»£ç ' }
			, { field: 'ä¸è¯åå ', title: 'ä¸è¯åå ' }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ' }
			, { field: 'å³éäºº', title: 'å³éäºº' }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ' }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }
			//#endregion

			//,{fixed: 'right', title:'æä½', toolbar: '#barDemo', width:150}
			]]
			};
			//#region åå§åçé¢
			set_ClearBill();
			//#endregion


			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			case 'btn-Add':
			layer.open({
			type: 2 //Pageå±ç±»å
			, area: ['100%', '100%']
			, title: 'æ°å¢æ´¾å·¥å'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../å¢å ä¸è¯è¯å®¡å/QC_Add_NoPassProdCheckBill.html', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}

			});
			break;
			case '':
			layer.msg('');
			break;

			};
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			});

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
			get_FastQuery();
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³


			// åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			//åå§åæ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			}

			//è¡¨æ ¼æ°æ®
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, cols: [[
			//{ type: 'checkbox' }
			{ field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'çäº§èµæºåç§° ', title: 'çäº§èµæºåç§° ', width: 115 }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
			, { field: 'ç©æåç ', title: 'ç©æåç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'æºååå·', title: 'æºååå·' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'æ£éªåä»£ç ', title: 'æ£éªåä»£ç ' }
			, { field: 'æ£éªååç§°', title: 'æ£éªååç§°' }
			, { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ' }
			, { field: 'åä½åç§°', title: 'åä½åç§°' }
			, { field: 'ä¸è¯åå ä»£ç ', title: 'ä¸è¯åå ä»£ç ' }
			, { field: 'ä¸è¯åå ', title: 'ä¸è¯åå ' }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº' }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ' }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }

			//,{fixed: 'right', title:'æä½', toolbar: '#barDemo', width:150}
			]]
			};
			}

			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			var index0 = layer.load(0, { shade: false });
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index0);
			} else {
			layer.close(index0);
			layer.msg(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index0);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			// å¿«éè¿æ»¤
			function get_FastQuery() {
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HDeptID = $("#HDeptID").val();//é¨é¨
			var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç
			var MaterialName = $("#MaterialName").val();//ç©æåç§°
			var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
			var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
			var Warehouse = $("#Warehouse").val();//ä»åº
			var Hmaker = $("#Hmaker").val();//å¶åäºº

			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HDeptID) {
			sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
			}
			if (MaterialCode) {
			sWhere += " and ç©æä»£ç like '%" + MaterialCode + "%'";
			}
			if (MaterialName) {
			sWhere += " and ç©æåç§° like '%" + MaterialName + "%'";
			}
			if (SpecificationModel) {
			sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
			}
			if (HSourceBillNo) {
			sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
			}
			if (Warehouse) {
			sWhere += " and åè´§ä»åº like '%" + Warehouse + "%'";
			}
			if (Hmaker) {
			sWhere += " and å¶åäºº like '%" + Hmaker + "%'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			// éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");//åæ®å·
			$("#HDeptID").val("");//é¨é¨
			$("#MaterialCode").val("");//ç©æä»£ç
			$("#MaterialName").val("");//ç©æåç§°
			$("#SpecificationModel").val("");//è§æ ¼åå·
			$("#HSourceBillNo").val("");//æºååå·
			$("#Warehouse").val("");//ä»åº
			$("#Hmaker").val("");//å¶åäºº

			sWhere = "";
			}

			//#endregion

			//ä»¥ä¸æ¯layuiæ¨¡å
			});


			//çå¬è¡å·¥å·äºä»¶
			//table.on('tool(mainTable)', function(obj){
			// var data = obj.data;
			@@ -166,154 +364,6 @@
			// //layer.alert('ææ¯ç¼è¾ä¸');
			// }
			//});
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			case 'btn-Pushdown':
			// var checkStatus = table.checkStatus('mainTable')
			// , data = checkStatus.data;
			// ajaxLabelData = data;
			// var rows = '';
			// var HEntry = '';
			// for (var i = 0; i < data.length; i++) {
			// rows += data[i].hmainid.toString() + ',' ;

			// }

			// if (checkStatus.data.length < 1)
			// {
			// layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨');
			// } else
			// {

			////é¡µé¢å±
			//layer.open({
			// type: 2 //Pageå±ç±»å
			// ,area: ['100%', '100%']
			// ,title: 'æ°å¢æ´¾å·¥å'
			// ,shade: 0.6 //é®ç½©éæåº¦
			// ,maxmin: false //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../å·¥åºæ´¾å·¥å/Sc_Add_ProcessSendWork.html?HInterID=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString().substring(0, rows.length - 1), '&PlanBeginDate=' + data[0].è®¡åå¼å·¥æ¥æ.toString(), '&PlanEndDate=' + data[0].è®¡åå®å·¥æ¥æ.toString(), 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }

			// });

			// }
			layer.msg('åååï¼ï¼ï¼ï¼ï¼ï¼');
			break;
			case 'btn-Add':
			layer.open({
			type: 2 //Pageå±ç±»å
			,area: ['100%', '100%']
			,title: 'æ°å¢æ´¾å·¥å'
			,shade: 0.6 //é®ç½©éæåº¦
			,maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../å¢å ä¸è¯è¯å®¡å/QC_Add_NoPassProdCheckBill.html' , 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}

			});
			break;
			case '':
			layer.msg('');
			break;

			};
			});

			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			var index0 = layer.load(0, { shade: false });
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index0);
			} else {
			layer.close(index0);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index0);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HDate").val("");//å¼å§æ¥æ
			$("#HDate1").val("");//ç»ææ¥æ
			//$("#HOrderProcNO").val("");//è®¢åè·è¸ªå·
			//$("#WorkCenter").val("");//åæ®å·
			$("#btnSearch").click();
			});

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			//var HOrderProcNO = $("#HOrderProcNO").val();//è®¢åè·è¸ªå·
			//var WorkCenter = $("#WorkCenter").val();//åæ®å·
			if (HDate) {
			sWhere += " and æ¥æ >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and æ¥æ <= '" + HDate1 + "'";
			}
			//if (HOrderProcNO) {
			// sWhere += " and è®¢åè·è¸ªå· like '%" + HOrderProcNO + "%'";
			//}
			//if (WorkCenter) {
			// sWhere += " and HBillNo like '%" + WorkCenter + "%'";
			//}
			var index = layer.load(0, { shade: false });
			$.ajax({
			url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			});


			//laydate.render({
			// elem: '#HDate'
			// , type: 'datetime'
			// , trigger: 'click'
			// , format:'yyyy-MM-dd HH:mm'
			//});


			//ä»¥ä¸æ¯layuiæ¨¡å
			});




			</script>

			@@ -1,15 +1,20 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<title>çäº§ç¨ææ¸ååè¡¨</title>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>çäº§ç¨ææ¸ååè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<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>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			</head>
			<body>
			<div class="layui-fluid">
			@@ -21,26 +26,76 @@
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span></span>
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®å·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterialName" id="HMaterialName">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" 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="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<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">
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptID" id="HDeptID" 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="MaterialCode" id="MaterialCode" style="width:190px;">
			</div>
			</div>
			<!--<hr />-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="MaterialName" id="MaterialName" 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="SpecificationModel" id="SpecificationModel" 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="HSourceBillNo" id="HSourceBillNo" 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="Warehouse" id="Warehouse" 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="Hmaker" id="Hmaker" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			@@ -52,6 +107,13 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>

			</div>
			@@ -61,112 +123,114 @@
			</div>
			</div>
			</div>
			<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>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			var sWhere = "";
			var option = [];
			//#endregion

			var option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			,height: 'full-50'
			, page: true
			,cellMinWidth: 90
			, cols: [[
			{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ' }
			, { field: 'åæ®å·', title: 'åæ®å·' }
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ' }
			, { field: 'é¨é¨', title: 'é¨é¨' }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			, { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼' }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'ä¸»è¡¨è®¡éåä½ä»£ç ', title: 'ä¸»è¡¨è®¡éåä½ä»£ç ' }
			, { field: 'ä¸»è¡¨è®¡éåä½', title: 'ä¸»è¡¨è®¡éåä½' }
			, { field: 'çäº§æ°é', title: 'çäº§æ°é' }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'hmaterid2', title: 'hmaterid2', hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'hunitid2', title: 'hunitid2', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½' }
			, { field: 'æ°é', title: 'æ°é' }
			, { field: 'æèç', title: 'æèç' }
			, { field: 'HWHID', title: 'HWHID', hide: true }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ' }
			, { field: 'ä»åº', title: 'ä»åº' }
			, { field: 'HSPID', title: 'HSPID', hide: true }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ' }
			, { field: 'ä»ä½', title: 'ä»ä½' }
			, { field: 'çäº§ä»»å¡åå·', title: 'çäº§ä»»å¡åå·' }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·' }
			, { field: 'è®¡åæ¨¡å¼', title: 'è®¡åæ¨¡å¼' }
			]]
			};
			//#region åå§åçé¢
			set_ClearBill();
			//#endregion

			var index = layer.load(0, { shade: false });
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Sc_PPBomBill/list',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#btnSearch").click();
			});
			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			var HBillNo = $("#HBillNo").val();
			var HMaterialName = $("#HMaterialName").val();
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HMaterialName) {
			sWhere += " and ç©æåç§° like '%" + HMaterialName + "%'";
			}
			get_FastQuery();
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³

			// åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			//åå§åæ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			}

			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, cols: [[
			{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 150, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 150 }
			, { field: 'é¨é¨', title: 'é¨é¨' }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			, { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼' }
			, { field: 'æºååå·', title: 'æºååå·', width: 150 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'ä¸»è¡¨è®¡éåä½ä»£ç ', title: 'ä¸»è¡¨è®¡éåä½ä»£ç ' }
			, { field: 'ä¸»è¡¨è®¡éåä½', title: 'ä¸»è¡¨è®¡éåä½' }
			, { field: 'çäº§æ°é', title: 'çäº§æ°é' }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'hmaterid2', title: 'hmaterid2', hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'hunitid2', title: 'hunitid2', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½' }
			, { field: 'æ°é', title: 'æ°é' }
			, { field: 'æèç', title: 'æèç' }
			, { field: 'HWHID', title: 'HWHID', hide: true }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ' }
			, { field: 'ä»åº', title: 'ä»åº' }
			, { field: 'HSPID', title: 'HSPID', hide: true }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ' }
			, { field: 'ä»ä½', title: 'ä»ä½' }
			, { field: 'çäº§ä»»å¡åå·', title: 'çäº§ä»»å¡åå·', width: 150 }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 150, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 150, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·' }
			, { field: 'è®¡åæ¨¡å¼', title: 'è®¡åæ¨¡å¼' }
			]]
			};
			}


			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			var index = layer.load(0, { shade: false });
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Sc_PPBomBill/list',
			@@ -176,31 +240,84 @@
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.alert("æ¥è¯¢æå", { icon: 1 });
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			// å¿«éè¿æ»¤
			function get_FastQuery() {
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HDeptID = $("#HDeptID").val();//é¨é¨
			var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç
			var MaterialName = $("#MaterialName").val();//ç©æåç§°
			var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
			var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
			var Warehouse = $("#Warehouse").val();//ä»åº
			var Hmaker = $("#Hmaker").val();//å¶åäºº

			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HDeptID) {
			sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
			}
			if (MaterialCode) {
			sWhere += " and ç©æä»£ç like '%" + MaterialCode + "%'";
			}
			if (MaterialName) {
			sWhere += " and ç©æåç§° like '%" + MaterialName + "%'";
			}
			if (SpecificationModel) {
			sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
			}
			if (HSourceBillNo) {
			sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
			}
			if (Warehouse) {
			sWhere += " and åè´§ä»åº like '%" + Warehouse + "%'";
			}
			if (Hmaker) {
			sWhere += " and å¶åäºº like '%" + Hmaker + "%'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			});
			}

			// éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");//åæ®å·
			$("#HDeptID").val("");//é¨é¨
			$("#MaterialCode").val("");//ç©æä»£ç
			$("#MaterialName").val("");//ç©æåç§°
			$("#SpecificationModel").val("");//è§æ ¼åå·
			$("#HSourceBillNo").val("");//æºååå·
			$("#Warehouse").val("");//ä»åº
			$("#Hmaker").val("");//å¶åäºº

			//laydate.render({
			// elem: '#HDate'
			// , type: 'datetime'
			// , trigger: 'click'
			// , format:'yyyy-MM-dd HH:mm'
			//});
			sWhere = "";
			}


			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å
			});




			</script>

			@@ -1,15 +1,17 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<title>äº§çº¿ç»æååè¡¨</title>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>äº§çº¿ç»æååè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>

			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			</head>
			<body>
			<div class="layui-fluid">
			@@ -27,19 +29,19 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="å¼å§æ¶é´" id="å¼å§æ¶é´">
			<input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="ç»ææ¶é´" id="ç»ææ¶é´">
			<input type="date" class="layui-input" name="HEndDate" id="HEndDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»æåå·</label>
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="ç»æåå·" id="ç»æåå·">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			@@ -49,27 +51,9 @@

			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¶åäºº</label>
			<label class="layui-form-label">ç»æåå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="å¶åäºº" id="å¶åäºº">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»æåå¯ä¸æ¡ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="ç»æåå¯ä¸æ¡ç " id="ç»æåå¯ä¸æ¡ç ">
			</div>
			</div>
			</div>
			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			<input type="text" class="layui-input" name="ç»æåå·" id="ç»æåå·">
			</div>
			</div>
			<div class="layui-inline">
			@@ -84,21 +68,71 @@
			<input type="text" class="layui-input" name="åè£åå¯ä¸æ¡ç " id="åè£åå¯ä¸æ¡ç ">
			</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="ç»æåå¯ä¸æ¡ç " id="ç»æåå¯ä¸æ¡ç ">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptID" id="HDeptID" 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="MaterialCode" id="MaterialCode" style="width:190px;">
			</div>
			</div>
			<!--<hr />-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="MaterialName" id="MaterialName" 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="hmodel" id="hmodel">
			<input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºååå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" 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="Warehouse" id="Warehouse" 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="Hmaker" id="Hmaker" style="width:190px;">
			</div>
			</div>
			</div>

			</div>
			</div>
			<table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container layui-form-item">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print">
			<i class="layui-icon layui-icon-file"></i>æå°
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print"><i class="layui-icon layui-icon-file"></i>æå° </button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			</div>
			</script>
			</form>
			@@ -119,6 +153,9 @@
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

			//#region å¬å±åé

			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			@@ -128,122 +165,27 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util;
			//var sWhere = " äº§åä»£ç = 'BX0002'";
			var sWhere = "";
			var option = [];

			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'ç»æåç±»å', title: 'ç»æåç±»å', sort: true, hide: true }
			, { field: 'ç»æåä¸»ID', title: 'ç»æåä¸»ID', sort: true, hide: true }
			, { field: 'ç»æåå·', title: 'ç»æåå·', sort: true, width:155 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, {
			field: 'å¶åæ¶é´', title: 'ç»ææ¶é´', sort: true, templet: function (d) {
			if (d.å¶åæ¶é´ == null) {
			return "";
			}
			return util.toDateString(d.å¶åæ¶é´, "yyyy-MM-dd");
			}
			}
			, { field: 'ç»æåå¯ä¸æ¡ç ', title: 'ç»æç ', sort: true }
			, { field: 'åè£åå·', title: 'åè£åå·', sort: true }
			, { field: 'åè£åç±»å', title: 'åè£åç±»å', hide: true }
			, { field: 'åè£åå¯ä¸æ¡ç ', title: 'åè£ç ', width: 165 }
			, { toolbar: '#toolBar', title: 'æä½', width: 115, fixed: 'right' }
			]]
			, text: {
			none: 'ææ ç¸å³æ°æ®ï¼'
			}
			};
			//#endregion

			option.data = [];
			table.render(option);
			//#region åå§åçé¢
			set_ClearBill();
			//#endregion


			//è¿å¥é¡µé¢æ¾ç¤ºçåè¡¨
			layer.load(3);
			$.ajax({
			url: GetWEBURL() + '/GroupOrderBill/List',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.closeAll("loading");
			} else {
			layer.closeAll("loading");
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#å¼å§æ¶é´").val("");
			$("#ç»ææ¶é´").val("");
			$("#ç»æåå·").val("");
			$("#å¶åäºº").val("");
			$("#ç»æåå¯ä¸æ¡ç ").val("");
			$("#åè£åå·").val("");
			$("#åè£åå¯ä¸æ¡ç ").val("");
			$("#btnSearch").click();
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			});

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			var å¼å§æ¶é´ = $("#å¼å§æ¶é´").val();
			var ç»ææ¶é´ = $("#ç»ææ¶é´").val();
			var ç»æåå· = $("#ç»æåå·").val();
			var å¶åäºº = $("#å¶åäºº").val();
			var ç»æåå¯ä¸æ¡ç = $("#ç»æåå¯ä¸æ¡ç ").val();
			var åè£åå· = $("#åè£åå·").val();
			var åè£åå¯ä¸æ¡ç = $("#åè£åå¯ä¸æ¡ç ").val();
			if (å¼å§æ¶é´) {
			sWhere += " and å¶åæ¶é´ > '" + å¼å§æ¶é´ + "'";
			}
			if (ç»ææ¶é´) {
			sWhere += " and å¶åæ¶é´ < '" + ç»ææ¶é´ + "'";
			}
			if (ç»æåå·) {
			sWhere += " and ç»æåå· like '%" + ç»æåå· + "%'";
			}
			if (å¶åäºº) {
			sWhere += " and å¶åäºº like '%" + å¶åäºº + "%'";
			}
			if (ç»æåå¯ä¸æ¡ç ) {
			sWhere += " and ç»æåå¯ä¸æ¡ç like '%" + ç»æåå¯ä¸æ¡ç + "%'";
			}
			if (åè£åå·) {
			sWhere += " and åè£åå· like '%" + åè£åå· + "%'";
			}
			if (åè£åå¯ä¸æ¡ç ) {
			sWhere += " and åè£åå¯ä¸æ¡ç like '%" + åè£åå¯ä¸æ¡ç + "%'";
			}
			$.ajax({
			url: GetWEBURL() + '/GroupOrderBill/List',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			get_FastQuery();

			});
			//è·åéä¸è¡æ°æ®
			table.on('row(mainTable)', function (obj) {
			@@ -317,14 +259,173 @@
			}
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³

			// åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			//åå§åæ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			//è¡¨æ ¼æ°æ®
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'ç»æåç±»å', title: 'ç»æåç±»å', sort: true, hide: true }
			, { field: 'ç»æåä¸»ID', title: 'ç»æåä¸»ID', sort: true, hide: true }
			, { field: 'ç»æåå·', title: 'ç»æåå·', sort: true, width: 155 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, {
			field: 'å¶åæ¶é´', title: 'ç»ææ¶é´', sort: true, templet: function (d) {
			if (d.å¶åæ¶é´ == null) {
			return "";
			}
			return util.toDateString(d.å¶åæ¶é´, "yyyy-MM-dd");
			}
			}
			, { field: 'ç»æåå¯ä¸æ¡ç ', title: 'ç»æç ', sort: true }
			, { field: 'åè£åå·', title: 'åè£åå·', sort: true }
			, { field: 'åè£åç±»å', title: 'åè£åç±»å', hide: true }
			, { field: 'åè£åå¯ä¸æ¡ç ', title: 'åè£ç ', width: 165 }
			, { toolbar: '#toolBar', title: 'æä½', width: 115, fixed: 'right' }
			]]
			, text: {
			none: 'ææ ç¸å³æ°æ®ï¼'
			}
			};
			}

			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			layer.load(3);
			$.ajax({
			url: GetWEBURL() + '/GroupOrderBill/List',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.closeAll("loading");
			} else {
			layer.closeAll("loading");
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			}

			// å¿«éè¿æ»¤
			function get_FastQuery() {
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HDeptID = $("#HDeptID").val();//é¨é¨
			var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç
			var MaterialName = $("#MaterialName").val();//ç©æåç§°
			var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
			var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
			var Warehouse = $("#Warehouse").val();//ä»åº
			var Hmaker = $("#Hmaker").val();//å¶åäºº

			var ç»æåå· = $("#ç»æåå·").val();
			var ç»æåå¯ä¸æ¡ç = $("#ç»æåå¯ä¸æ¡ç ").val();
			var åè£åå· = $("#åè£åå·").val();
			var åè£åå¯ä¸æ¡ç = $("#åè£åå¯ä¸æ¡ç ").val();

			if (ç»æåå·) {
			sWhere += " and ç»æåå· like '%" + ç»æåå· + "%'";
			}

			if (ç»æåå¯ä¸æ¡ç ) {
			sWhere += " and ç»æåå¯ä¸æ¡ç like '%" + ç»æåå¯ä¸æ¡ç + "%'";
			}
			if (åè£åå·) {
			sWhere += " and åè£åå· like '%" + åè£åå· + "%'";
			}
			if (åè£åå¯ä¸æ¡ç ) {
			sWhere += " and åè£åå¯ä¸æ¡ç like '%" + åè£åå¯ä¸æ¡ç + "%'";
			}


			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HDeptID) {
			sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
			}
			if (MaterialCode) {
			sWhere += " and ç©æä»£ç like '%" + MaterialCode + "%'";
			}
			if (MaterialName) {
			sWhere += " and ç©æåç§° like '%" + MaterialName + "%'";
			}
			if (SpecificationModel) {
			sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
			}
			if (HSourceBillNo) {
			sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
			}
			if (Warehouse) {
			sWhere += " and åè´§ä»åº like '%" + Warehouse + "%'";
			}
			if (Hmaker) {
			sWhere += " and å¶åäºº like '%" + Hmaker + "%'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			// éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#ç»æåå·").val("");
			$("#ç»æåå¯ä¸æ¡ç ").val("");
			$("#åè£åå·").val("");
			$("#åè£åå¯ä¸æ¡ç ").val("");
			$("#btnSearch").click();

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");//åæ®å·
			$("#HDeptID").val("");//é¨é¨
			$("#MaterialCode").val("");//ç©æä»£ç
			$("#MaterialName").val("");//ç©æåç§°
			$("#SpecificationModel").val("");//è§æ ¼åå·
			$("#HSourceBillNo").val("");//æºååå·
			$("#Warehouse").val("");//ä»åº
			$("#Hmaker").val("");//å¶åäºº

			sWhere = "";
			}

			function Print(data) {
			console.log("data=", data);
			}
			//#endregion
			//option.data = [];
			//table.render(option);
			//ä»¥ä¸æ¯layuiæ¨¡å
			});

			function Print(data) {
			console.log("data=", data);
			}


			</script>

			@@ -359,13 +359,13 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");//åæ®å·
			$("#HCusID").val("");//å®¢æ·
			$("#HDeptID").val();//é¨é¨
			$("#MaterialCode").val();//ç©æä»£ç
			$("#MaterialName").val();//ç©æåç§°
			$("#SpecificationModel").val();//è§æ ¼åå·
			$("#HSourceBillNo").val();//æºååå·
			$("#Warehouse").val();//ä»åº
			$("#Hmaker").val();//å¶åäºº
			$("#HDeptID").val("");//é¨é¨
			$("#MaterialCode").val("");//ç©æä»£ç
			$("#MaterialName").val("");//ç©æåç§°
			$("#SpecificationModel").val("");//è§æ ¼åå·
			$("#HSourceBillNo").val("");//æºååå·
			$("#Warehouse").val("");//ä»åº
			$("#Hmaker").val("");//å¶åäºº

			sWhere = "";
			}