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

zzr99

2022-07-28 e570b232bc6b7aa8c46c73f87caa1cb89f90dcff

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

@@ -53,6 +53,15 @@
                                        <input type="hidden" name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                    </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: 85px;">
                                        <select name=" HTProcessFlag" id="HTProcessFlag">
                                            <option value="1">是</option>
                                            <option value="0">否</option>
                                        </select>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -146,6 +155,7 @@

        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
          
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }
@@ -250,16 +260,16 @@
        //导入(保存)
        function set_AddNew(data) {

            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }
            //var num = [];
            //for (var i = 0; i < table.cache["mainTable"].length; i++) {
            //    if (table.cache["mainTable"][i] != "") {
            //        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
            //        num.push(table.cache["mainTable"][i])
            //    }
            //}
            data.field.HOrgID = sessionStorage["OrganizationID"];//组织
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sSubStr = '1';//JSON.stringify(num)
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
            var index = layer.load();

@@ -273,6 +283,8 @@
                    if (data.count == 1) {
                        layer.close(index);
                        layer.msg(data.Message);
                        option.data = null;
                        table.render(option);
                    }
                    else {
                        layer.close(index);