Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

ch

2022-09-15 ca774213e1f714dd5e21e6fc93f2f31a1f2508b5

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(ÆäËû)/Pay_OtherBalBillList.html

@@ -381,6 +381,14 @@
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
               
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                var contentUrl = "";
                for (var i = 0; i < urlLen.length-4; i++) {
                    contentUrl += "../";
                }
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + ' & colName=' + colName;
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
@@ -389,7 +397,7 @@
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -69,9 +69,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                            <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -93,9 +93,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">销售单号</label>
                                            <label class="layui-form-label" style="width: 85px;">唯一ID</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                                <input type="text" class="layui-input" name="F_BSV_WYID" id="F_BSV_WYID">
                                            </div>
                                        </div>
                                    </div>
@@ -287,9 +287,10 @@
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//流转卡号
                var HICMOBillNo = $("#HICMOBillNo").val(); //批号
                var HWorkShopID = $("#HWorkShopID").val();//班组
                var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售单号
                var F_BSV_WYID = $("#F_BSV_WYID").val();//唯一ID
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HOrgID = sessionStorage["OrganizationID"];

@@ -298,9 +299,10 @@
                    , HEndDate: HEndDate
                    , HICMOBillNo: HICMOBillNo
                    , HWorkShopID: HWorkShopID
                    , HSeOrderBillNo: HSeOrderBillNo
                    , F_BSV_WYID: F_BSV_WYID
                    , HMaterNumber: HMaterNumber
                    , HOrgID: HOrgID
                    , HBillNo: HBillNo
                }

                get_Display(JSON.stringify(sWhere));
@@ -314,6 +316,8 @@
                $("#HICMOBillNo").val("");
                $("#HProcExchBillNo").val("");
                $("#HName").val("");
                $("#HBillNo").val("");
                $("#F_BSV_WYID").val("");
                sWhere = " where 1 = 1 ";
                get_Display(sWhere);
            }
@@ -338,7 +342,6 @@
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HModel").val(checkStatus.data[0].HModel);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的