MES-WEB-LayUI.git

parent: acefd130 | 补丁 | 提交 | ignore whitespace

对巡检记录单,工序检验单,首件检验单优化,在巡检记录单的保存和添加的时候保存判定结论,在页面跟视图进行修改,添加头部要查询数据的字段内容,对部门设置添...

zrg

2024-01-11 0dc8bb45d9e39d3432ecc0b688881228d08c5b85

对巡检记录单,工序检验单,首件检验单优化,在巡检记录单的保存和添加的时候保存判定结论,在页面跟视图进行修改,添加头部要查询数据的字段内容,对部门设置添加按钮设置

5个文件已修改

	WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html	98 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html	88 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html	91 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -13,6 +13,7 @@
    <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/HideButton.js"></script>

</head>
<body>
@@ -87,15 +88,16 @@
                        <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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></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-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn_deaudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn_stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn_destop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_hidecolumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
@@ -180,6 +182,11 @@
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                        var HBillType = "Gy_DepartmentList";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
            });
@@ -310,6 +317,12 @@
                            }
                            table.render(option);

                            //å·æ°æé®æ¾ç¤º
                            var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                            var HBillType = "Gy_DepartmentList";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);


                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();


 WebTM/views/ÖÊÁ¿¹ÜÀí/Ñ²¼ì¼ÇÂ¼µ¥/QC_Add_Edit_PatrolProcCheckBill.html

@@ -93,6 +93,13 @@
                                                        <input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">å¤æç»è®º</label>
                                                    <div class="layui-input-block">
                                                        <input type="radio" name="HLastResult" id="HLastResult" value="1" title="åæ ¼" checked>
                                                        <input type="radio" name="HLastResult" id="HLastResult" value="0" title="ä¸åæ ¼">
                                                    </div>
                                                </div>
                                                <div class="layui-colorpicker-xs" style="margin-top:15px">
                                                    <label class="layui-form-label"> å¤æ³¨</label>
                                                    <div class="layui-input-block">

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ñ²¼ì¼ÇÂ¼µ¥/QC_PatrolProcCheckBillList.html

@@ -37,101 +37,97 @@
                                    </div>
                                    <!--ç¬¬ä¸å±è¿æ»¤-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">åæ®å·</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¼å§æ¥æ</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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="HDate1" id="HDate1">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç»ææ¥æ</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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="HDate2" id="HDate2">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¤å®ç»è®º</label>
                                        <div class="layui-input-block" style="width:120px">
                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
                                                <option value=""></option>
                                                <option value="åæ ¼">åæ ¼</option>
                                                <option value="ä¸åæ ¼">ä¸åæ ¼</option>
                                            </select>
                                        </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" style="padding: 0px; margin-left: 6%;">
                                        <div class="layui-row" style="margin-top:5px">
                                  
                                    <div class="layui-colla-content">
                                        <!--ç¬¬äºæè¿æ»¤-->
                                        <div class="layui-row" >
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ç©æç¼ç </label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HNumber" id="HNumber">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ç©æåç§°</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName" id="HName">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è§æ ¼åå·</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HModel" id="HModel">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è´¨æ£å</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName1" id="HName1">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <!--ç¬¬ä¸æè¿æ»¤-->
                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                        <!--ç¬¬ä¸æè¿æ»¤-->
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ£éªé¡¹ç®</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName2" id="HName2">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">çäº§åç§°</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName3" id="HName3">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">å·¥åºæµè½¬å¡</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HProcExchBillNo" id="HProcExchBillNo">
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="width: 85px;">
                                                <label class="layui-form-label">å¤å®ç»è®º</label>
                                                <div class="layui-input-block" style="width:190px;">
                                                    <select name="HLastResult" id="HLastResult" lay-verify="HLastResult" >
                                                        <option value=""></option>
                                                        <option value="åæ ¼">åæ ¼</option>
                                                        <option value="ä¸åæ ¼">ä¸åæ ¼</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <!--èªå®ä¹è¿æ»¤-->
                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                        <!--èªå®ä¹è¿æ»¤-->
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è¿æ»¤</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="width:120px">
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
@@ -146,7 +142,7 @@
                                                    <option value="10">ä¸åå«</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline" style="width:120px">
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
@@ -281,8 +277,12 @@
                    , { field: 'è¡¨å¤´å¤æ³¨ ', title: 'è¡¨å¤´å¤æ³¨', width: 105, sort: true }
                    , { field: 'å¶åäºº', title: 'å¶åäºº', width: 160, sort: true }
                    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160, sort: true }
                    , { field: 'å¤å®ç»è®º', title: 'å¤å®ç»è®º', sort: true }
                    , { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°', sort: true }
                    , { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', sort: true }
                    , { field: 'æ£éªé¡¹ç®ä»£ç ', title: 'æ£éªé¡¹ç®ä»£ç ', sort: true }
                    , { field: 'æ£éªé¡¹ç®åç§°', title: 'æ£éªé¡¹ç®åç§°', sort: true }
                    , { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', sort: true }
                    , { field: 'äº§ååç ', title: 'äº§ååç ', sort: true }
                    , { field: 'äº§ååç§°', title: 'äº§ååç§°', sort: true }
                    , { field: 'äº§ååå·', title: 'äº§ååå·', width: 115, sort: true }
@@ -514,21 +514,21 @@
                if (HBillNo)
                    sqlWhere += " and åæ®å· like '%" + HBillNo + "%'";
                if (HNumber)
                    sqlWhere += " and ç©æç¼ç  like '%" + HNumber + "%'";
                    sqlWhere += " and äº§ååç  like '%" + HNumber + "%'";
                if (HName)
                    sqlWhere += " and ç©æåç§° like '%" + HName + "%'";
                    sqlWhere += " and äº§ååç§° like '%" + HName + "%'";
                if (HModel)
                    sqlWhere += " and è§æ ¼åå· like '%" + HModel + "%'";
                    sqlWhere += " and äº§ååå· like '%" + HModel + "%'";
                if (HLastResult)
                    sqlWhere += " and å¤å®ç»è®º like '" + HLastResult + "%'";
                if (HName1)
                    sqlWhere += " and è´¨æ£ååç§° like '%" + HName1 + "%'";
                    sqlWhere += " and æ£éªååç§° like '%" + HName1 + "%'";
                if (HName2)
                    sqlWhere += " and æ£éªé¡¹ç® like '%" + HName2 + "%'";
                    sqlWhere += " and æ£éªé¡¹ç®åç§° like '%" + HName2 + "%'";
                if (HName3)
                    sqlWhere += " and çäº§èµæºåç§° like '%" + HName3 + "%'";
                if (HProcExchBillNo)
                    sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";
                    sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

                if (HDate1) {
                    sqlWhere += " and æ¥æ >= '" + HDate1 + "'";

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList.html

@@ -39,101 +39,97 @@
                                    </div>
                                    <!--ç¬¬ä¸å±è¿æ»¤-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" >åæ®å·</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¼å§æ¥æ</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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="HDate1" id="HDate1">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç»ææ¥æ</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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="HDate2" id="HDate2">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¤å®ç»è®º</label>
                                        <div class="layui-input-block" style="width:120px">
                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
                                                <option value=""></option>
                                                <option value="åæ ¼">åæ ¼</option>
                                                <option value="ä¸åæ ¼">ä¸åæ ¼</option>
                                            </select>
                                        </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" style="padding: 0px; margin-left: 6%;">
                                        <div class="layui-row" style="margin-top:5px">
                                 
                                    <div class="layui-colla-content">
                                        <!--ç¬¬äºæè¿æ»¤-->
                                        <div class="layui-row">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ç©æç¼ç </label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HNumber" id="HNumber">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ç©æåç§°</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName" id="HName">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è§æ ¼åå·</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HModel" id="HModel">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è´¨æ£å</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName1" id="HName1">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <!--ç¬¬ä¸æè¿æ»¤-->
                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                        <!--ç¬¬ä¸æè¿æ»¤-->
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ£éªé¡¹ç®</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName2" id="HName2">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">çäº§åç§°</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName3" id="HName3">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">å·¥åºæµè½¬å¡</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HProcExchBillNo" id="HProcExchBillNo">
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="width: 85px;">
                                                <label class="layui-form-label">å¤å®ç»è®º</label>
                                                <div class="layui-input-block" style="width:190px;">
                                                    <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
                                                        <option value=""></option>
                                                        <option value="åæ ¼">åæ ¼</option>
                                                        <option value="ä¸åæ ¼">ä¸åæ ¼</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <!--èªå®ä¹è¿æ»¤-->
                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                        <!--èªå®ä¹è¿æ»¤-->
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è¿æ»¤</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="width:120px">
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
@@ -148,7 +144,7 @@
                                                    <option value="10">ä¸åå«</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline" style="width:120px">
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
@@ -333,7 +329,7 @@
                if (HBillNo)
                    sqlWhere += " and åæ®å· like '%" + HBillNo + "%'";
                if (HNumber)
                    sqlWhere += " and ç©æç¼ç  like '%" + HNumber + "%'";
                    sqlWhere += " and ç©æä»£ç  like '%" + HNumber + "%'";
                if (HName)
                    sqlWhere += " and ç©æåç§° like '%" + HName + "%'";
                if (HModel)
@@ -343,11 +339,11 @@
                if (HName1)
                    sqlWhere += " and è´¨æ£ååç§° like '%" + HName1 + "%'";
                if (HName2)
                    sqlWhere += " and æ£éªé¡¹ç® like '%" + HName2 + "%'";
                    sqlWhere += " and æ£éªé¡¹ç®åç§° like '%" + HName2 + "%'";
                if (HName3)
                    sqlWhere += " and çäº§èµæºåç§° like '%" + HName3 + "%'";
                if (HProcExchBillNo)
                    sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";
                    sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

                if (HDate1) {
                    sqlWhere += " and æ¥æ >= '" + HDate1 + "'";

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList.html

@@ -39,102 +39,99 @@
                                    </div>
                                    <!--ç¬¬ä¸å±è¿æ»¤-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">åæ®å·</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¼å§æ¥æ</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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="HDate1" id="HDate1">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç»ææ¥æ</label>
                                        <div class="layui-input-block" style="width:120px">
                                        <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="HDate2" id="HDate2">
                                        </div>
                                    </div>
                                    <div class="layui-inline" >
                                        <label class="layui-form-label">å¤å®ç»è®º</label>
                                        <div class="layui-input-block" style="width:120px">
                                            <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
                                                <option value=""></option>
                                                <option value="åæ ¼">åæ ¼</option>
                                                <option value="ä¸åæ ¼">ä¸åæ ¼</option>
                                            </select>
                                        </div>
                                        
                                    </div>
                                    
                                    <div class="layui-inline">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query" id="f_Query">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                    <!--ç¬¬äºæè¿æ»¤-->
                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                        <div class="layui-row" style="margin-top:5px">
                                  
                                    <div class="layui-colla-content">
                                        <!--ç¬¬äºæè¿æ»¤-->
                                        <div class="layui-row">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ç©æç¼ç </label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HNumber" id="HNumber">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ç©æåç§°</label>
                                                <div class="layui-input-block" style="width:120px" >
                                                <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="HName" id="HName">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è§æ ¼åå·</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HModel" id="HModel">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è´¨æ£å</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName1" id="HName1">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <!--ç¬¬ä¸æè¿æ»¤-->
                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                        <!--ç¬¬ä¸æè¿æ»¤-->
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æ£éªé¡¹ç®</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName2" id="HName2">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">çäº§åç§°</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HName3" id="HName3">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">å·¥åºæµè½¬å¡</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <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="HProcExchBillNo" id="HProcExchBillNo">
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="width: 85px;">
                                                <label class="layui-form-label">å¤å®ç»è®º</label>
                                                <div class="layui-input-block" style="width:190px;">
                                                    <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
                                                        <option value=""></option>
                                                        <option value="åæ ¼">åæ ¼</option>
                                                        <option value="ä¸åæ ¼">ä¸åæ ¼</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    <!--èªå®ä¹è¿æ»¤-->
                                    <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                        <!--èªå®ä¹è¿æ»¤-->
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è¿æ»¤</label>
                                                <div class="layui-input-block" style="width:120px">
                                                <div class="layui-input-block">
                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="width:120px">
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
@@ -148,8 +145,8 @@
                                                    <option value="9">å³åå«</option>
                                                    <option value="10">ä¸åå«</option>
                                                </select>
                                            </div> 
                                            <div class="layui-inline" style="width:120px">
                                            </div>
                                            <div class="layui-inline" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
@@ -792,7 +789,7 @@
                if (HBillNo)
                    sqlWhere += " and åæ®å· like '%" + HBillNo+ "%'";
                if (HNumber)
                    sqlWhere += " and ç©æç¼ç  like '%" + HNumber + "%'";
                    sqlWhere += " and ç©æä»£ç  like '%" + HNumber + "%'";
                if (HName)
                    sqlWhere += " and ç©æåç§° like '%" + HName + "%'";
                if (HModel)
@@ -802,11 +799,11 @@
                if (HName1)
                    sqlWhere += " and è´¨æ£ååç§° like '%" + HName1 + "%'";
                if (HName2)
                    sqlWhere += " and æ£éªé¡¹ç® like '%" + HName2 + "%'";
                    sqlWhere += " and æ£éªé¡¹ç®åç§° like '%" + HName2 + "%'";
                if (HName3)
                    sqlWhere += " and çäº§èµæºåç§° like '%" + HName3 + "%'";
                if (HProcExchBillNo)
                    sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";
                    sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

                if (HDate1) {
                    sqlWhere += " and æ¥æ >= '" + HDate1 + "'";

			@@ -13,6 +13,7 @@
			<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/HideButton.js"></script>

			</head>
			<body>
			@@ -87,15 +88,16 @@
			<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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></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-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn_deaudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn_stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn_destop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_hidecolumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			@@ -180,6 +182,11 @@
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "Gy_DepartmentList";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -310,6 +317,12 @@
			}
			table.render(option);

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "Gy_DepartmentList";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);


			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			@@ -93,6 +93,13 @@
			<input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¤æç»è®º</label>
			<div class="layui-input-block">
			<input type="radio" name="HLastResult" id="HLastResult" value="1" title="åæ ¼" checked>
			<input type="radio" name="HLastResult" id="HLastResult" value="0" title="ä¸åæ ¼">
			</div>
			</div>
			<div class="layui-colorpicker-xs" style="margin-top:15px">
			<label class="layui-form-label"> å¤æ³¨</label>
			<div class="layui-input-block">

			@@ -37,101 +37,97 @@
			</div>
			<!--ç¬¬ä¸å±è¿æ»¤-->
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block" style="width:120px">
			<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">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block" style="width:120px">
			<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="HDate1" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block" style="width:120px">
			<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="HDate2" id="HDate2">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¤å®ç»è®º</label>
			<div class="layui-input-block" style="width:120px">
			<select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
			<option value=""></option>
			<option value="åæ ¼">åæ ¼</option>
			<option value="ä¸åæ ¼">ä¸åæ ¼</option>
			</select>
			</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" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">

			<div class="layui-colla-content">
			<!--ç¬¬äºæè¿æ»¤-->
			<div class="layui-row" >
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block" style="width:120px">
			<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="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName" id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block" style="width:120px">
			<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="HModel" id="HModel">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è´¨æ£å</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName1" id="HName1">
			</div>
			</div>
			</div>
			</div>
			<!--ç¬¬ä¸æè¿æ»¤-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--ç¬¬ä¸æè¿æ»¤-->
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">æ£éªé¡¹ç®</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName2" id="HName2">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§åç§°</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName3" id="HName3">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å·¥åºæµè½¬å¡</label>
			<div class="layui-input-block" style="width:120px">
			<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="HProcExchBillNo" id="HProcExchBillNo">
			</div>
			</div>
			<div class="layui-inline" style="width: 85px;">
			<label class="layui-form-label">å¤å®ç»è®º</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HLastResult" id="HLastResult" lay-verify="HLastResult" >
			<option value=""></option>
			<option value="åæ ¼">åæ ¼</option>
			<option value="ä¸åæ ¼">ä¸åæ ¼</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			<!--èªå®ä¹è¿æ»¤-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--èªå®ä¹è¿æ»¤-->
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block" style="width:120px">
			<div class="layui-input-block" style="margin-left: 120px;">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline" style="width:120px">
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			@@ -146,7 +142,7 @@
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline" style="width:120px">
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			@@ -281,8 +277,12 @@
			, { field: 'è¡¨å¤´å¤æ³¨ ', title: 'è¡¨å¤´å¤æ³¨', width: 105, sort: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 160, sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160, sort: true }
			, { field: 'å¤å®ç»è®º', title: 'å¤å®ç»è®º', sort: true }
			, { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°', sort: true }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', sort: true }
			, { field: 'æ£éªé¡¹ç®ä»£ç ', title: 'æ£éªé¡¹ç®ä»£ç ', sort: true }
			, { field: 'æ£éªé¡¹ç®åç§°', title: 'æ£éªé¡¹ç®åç§°', sort: true }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', sort: true }
			, { field: 'äº§ååç ', title: 'äº§ååç ', sort: true }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', sort: true }
			, { field: 'äº§ååå·', title: 'äº§ååå·', width: 115, sort: true }
			@@ -514,21 +514,21 @@
			if (HBillNo)
			sqlWhere += " and åæ®å· like '%" + HBillNo + "%'";
			if (HNumber)
			sqlWhere += " and ç©æç¼ç like '%" + HNumber + "%'";
			sqlWhere += " and äº§ååç like '%" + HNumber + "%'";
			if (HName)
			sqlWhere += " and ç©æåç§° like '%" + HName + "%'";
			sqlWhere += " and äº§ååç§° like '%" + HName + "%'";
			if (HModel)
			sqlWhere += " and è§æ ¼åå· like '%" + HModel + "%'";
			sqlWhere += " and äº§ååå· like '%" + HModel + "%'";
			if (HLastResult)
			sqlWhere += " and å¤å®ç»è®º like '" + HLastResult + "%'";
			if (HName1)
			sqlWhere += " and è´¨æ£ååç§° like '%" + HName1 + "%'";
			sqlWhere += " and æ£éªååç§° like '%" + HName1 + "%'";
			if (HName2)
			sqlWhere += " and æ£éªé¡¹ç® like '%" + HName2 + "%'";
			sqlWhere += " and æ£éªé¡¹ç®åç§° like '%" + HName2 + "%'";
			if (HName3)
			sqlWhere += " and çäº§èµæºåç§° like '%" + HName3 + "%'";
			if (HProcExchBillNo)
			sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";
			sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

			if (HDate1) {
			sqlWhere += " and æ¥æ >= '" + HDate1 + "'";

			@@ -39,101 +39,97 @@
			</div>
			<!--ç¬¬ä¸å±è¿æ»¤-->
			<div class="layui-inline">
			<label class="layui-form-label" >åæ®å·</label>
			<div class="layui-input-block" style="width:120px">
			<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">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block" style="width:120px">
			<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="HDate1" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block" style="width:120px">
			<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="HDate2" id="HDate2">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¤å®ç»è®º</label>
			<div class="layui-input-block" style="width:120px">
			<select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
			<option value=""></option>
			<option value="åæ ¼">åæ ¼</option>
			<option value="ä¸åæ ¼">ä¸åæ ¼</option>
			</select>
			</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" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">

			<div class="layui-colla-content">
			<!--ç¬¬äºæè¿æ»¤-->
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block" style="width:120px">
			<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="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName" id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block" style="width:120px">
			<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="HModel" id="HModel">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è´¨æ£å</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName1" id="HName1">
			</div>
			</div>
			</div>
			</div>
			<!--ç¬¬ä¸æè¿æ»¤-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--ç¬¬ä¸æè¿æ»¤-->
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">æ£éªé¡¹ç®</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName2" id="HName2">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§åç§°</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName3" id="HName3">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å·¥åºæµè½¬å¡</label>
			<div class="layui-input-block" style="width:120px">
			<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="HProcExchBillNo" id="HProcExchBillNo">
			</div>
			</div>
			<div class="layui-inline" style="width: 85px;">
			<label class="layui-form-label">å¤å®ç»è®º</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
			<option value=""></option>
			<option value="åæ ¼">åæ ¼</option>
			<option value="ä¸åæ ¼">ä¸åæ ¼</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			<!--èªå®ä¹è¿æ»¤-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--èªå®ä¹è¿æ»¤-->
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block" style="width:120px">
			<div class="layui-input-block" style="margin-left: 120px;">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline" style="width:120px">
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			@@ -148,7 +144,7 @@
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline" style="width:120px">
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			@@ -333,7 +329,7 @@
			if (HBillNo)
			sqlWhere += " and åæ®å· like '%" + HBillNo + "%'";
			if (HNumber)
			sqlWhere += " and ç©æç¼ç like '%" + HNumber + "%'";
			sqlWhere += " and ç©æä»£ç like '%" + HNumber + "%'";
			if (HName)
			sqlWhere += " and ç©æåç§° like '%" + HName + "%'";
			if (HModel)
			@@ -343,11 +339,11 @@
			if (HName1)
			sqlWhere += " and è´¨æ£ååç§° like '%" + HName1 + "%'";
			if (HName2)
			sqlWhere += " and æ£éªé¡¹ç® like '%" + HName2 + "%'";
			sqlWhere += " and æ£éªé¡¹ç®åç§° like '%" + HName2 + "%'";
			if (HName3)
			sqlWhere += " and çäº§èµæºåç§° like '%" + HName3 + "%'";
			if (HProcExchBillNo)
			sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";
			sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

			if (HDate1) {
			sqlWhere += " and æ¥æ >= '" + HDate1 + "'";

			@@ -39,102 +39,99 @@
			</div>
			<!--ç¬¬ä¸å±è¿æ»¤-->
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block" style="width:120px">
			<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">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block" style="width:120px">
			<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="HDate1" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block" style="width:120px">
			<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="HDate2" id="HDate2">
			</div>
			</div>
			<div class="layui-inline" >
			<label class="layui-form-label">å¤å®ç»è®º</label>
			<div class="layui-input-block" style="width:120px">
			<select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
			<option value=""></option>
			<option value="åæ ¼">åæ ¼</option>
			<option value="ä¸åæ ¼">ä¸åæ ¼</option>
			</select>
			</div>

			</div>

			<div class="layui-inline">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query" id="f_Query">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			<!--ç¬¬äºæè¿æ»¤-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">

			<div class="layui-colla-content">
			<!--ç¬¬äºæè¿æ»¤-->
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block" style="width:120px">
			<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="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block" style="width:120px" >
			<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="HName" id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block" style="width:120px">
			<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="HModel" id="HModel">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è´¨æ£å</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName1" id="HName1">
			</div>
			</div>
			</div>
			</div>
			<!--ç¬¬ä¸æè¿æ»¤-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--ç¬¬ä¸æè¿æ»¤-->
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">æ£éªé¡¹ç®</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName2" id="HName2">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§åç§°</label>
			<div class="layui-input-block" style="width:120px">
			<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="HName3" id="HName3">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å·¥åºæµè½¬å¡</label>
			<div class="layui-input-block" style="width:120px">
			<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="HProcExchBillNo" id="HProcExchBillNo">
			</div>
			</div>
			<div class="layui-inline" style="width: 85px;">
			<label class="layui-form-label">å¤å®ç»è®º</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
			<option value=""></option>
			<option value="åæ ¼">åæ ¼</option>
			<option value="ä¸åæ ¼">ä¸åæ ¼</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			<!--èªå®ä¹è¿æ»¤-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--èªå®ä¹è¿æ»¤-->
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block" style="width:120px">
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline" style="width:120px">
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			@@ -148,8 +145,8 @@
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline" style="width:120px">
			</div>
			<div class="layui-inline" style="margin-left: 120px;">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			@@ -792,7 +789,7 @@
			if (HBillNo)
			sqlWhere += " and åæ®å· like '%" + HBillNo+ "%'";
			if (HNumber)
			sqlWhere += " and ç©æç¼ç like '%" + HNumber + "%'";
			sqlWhere += " and ç©æä»£ç like '%" + HNumber + "%'";
			if (HName)
			sqlWhere += " and ç©æåç§° like '%" + HName + "%'";
			if (HModel)
			@@ -802,11 +799,11 @@
			if (HName1)
			sqlWhere += " and è´¨æ£ååç§° like '%" + HName1 + "%'";
			if (HName2)
			sqlWhere += " and æ£éªé¡¹ç® like '%" + HName2 + "%'";
			sqlWhere += " and æ£éªé¡¹ç®åç§° like '%" + HName2 + "%'";
			if (HName3)
			sqlWhere += " and çäº§èµæºåç§° like '%" + HName3 + "%'";
			if (HProcExchBillNo)
			sqlWhere += " and å·¥åºæµè½¬å¡ like '%" + HProcExchBillNo + "%'";
			sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

			if (HDate1) {
			sqlWhere += " and æ¥æ >= '" + HDate1 + "'";