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

zzr99

2022-06-13 49b3d32e375ce994f793a231f17e5603982c5ec1

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -79,7 +79,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 48px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -244,6 +244,14 @@
                                            <label class="layui-form-label" style="width: 85px;">减资源减量</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0"> <!--style="background-color:#efefef4d;"-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
@@ -457,6 +465,8 @@

            //制单人
            $("#HMaker").val(sessionStorage["HUserName"]);
            //组织
            Organ();

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            //if (sessionStorage.login != "login") {
@@ -488,10 +498,11 @@
                });
            }
            else {//如果修改则走下面 new
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                RoadBillMain(linterid, linteridSub);
                //RoadBillSub(linterid);
            }


            var option = {
                elem: '#mainTable'
@@ -971,6 +982,28 @@

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //产品选择页面
            function get_checkSearchMater() {
                layer.open({
@@ -1341,6 +1374,7 @@
                            , "HMaterTexture": d.data[0].材质
                            , "HProductNum": d.data[0].成品编号
                            , "HVerNum": d.data[0].版本
                            , "HOrgID": d.data[0].HOrgID
                        });

                        //子表  èµ‹å€¼