Merge branch 'master' of http://101.37.171.70:10101/r/zymesSrmLayUi

yusijie

2024-09-26 301c9ba4bfa1af5547d723c2fbdbfb35071dab3b

Merge branch 'master' of http://101.37.171.70:10101/r/zymesSrmLayUi

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html

@@ -82,6 +82,12 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">供应商</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HSupName" id="HSupName">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">开始日期</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HDate1" id="HDate1">
@@ -489,6 +495,8 @@
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")
                    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                if ($("#HSupName").val() != "")
                    sqlWhere += " and 供应商 like ^^%" + $("#HSupName").val() + "%^^";
                if ($("#HModel").val() != "")
                    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
                //if ($("#HClStatus").val() != "")

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html

@@ -78,7 +78,13 @@
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HName" id="HName">
                                        </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="HSupName" id="HSupName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -515,6 +521,8 @@
                    sqlWhere += " and 送货单号 like ^^%" + $("#HInnerBillNo").val() + "%^^";
                if ($("#HOldMaterNumber").val() != "")
                    sqlWhere += " and 旧物料编码 like ^^%" + $("#HOldMaterNumber").val() + "%^^";
                if ($("#HSupName").val() != "")
                    sqlWhere += " and 供应商 like ^^%" + $("#HSupName").val() + "%^^";
                if ($("#HMaterNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HMaterNumber").val() + "%^^";
                if ($("#HNumber").val() != "")

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html

@@ -136,6 +136,14 @@
                                            </select>
                                        </div>
                                    </div>

                                    <div class="layui-inline">
                                        <label class="layui-form-label">供应商名称</label>
                                        <div class="layui-input-block" style="width:130px;">
                                            <input type="text" class="layui-input" name="HSupName" id="HSupName">
                                        </div>
                                    </div>

                                    <div class="layui-inline">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -568,6 +576,8 @@
                    sqlWhere += " and 旧物料编码 like ^^%" + $("#HOldMaterNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HSupName").val() != "")
                    sqlWhere += " and 供应商 like ^^%" + $("#HSupName").val() + "%^^";
                if ($("#HName").val() != "")
                    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                if ($("#HModel").val() != "")