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

wtt

2024-09-13 43745249ed7ed29629a65a07623a0f47bb37b289

 WebTM/views/ϵͳ¹ÜÀí/°´Å¥ÉèÖÃ/Xt_ModuleButtonSet.html

@@ -182,15 +182,15 @@
                        for (var j = 0; j < data1.count; j++) {
                            if (btnIdLists[i] == data1.data[j]["HButtonID"]) {
                                if (data1.data[j]["HEditFlag"] == false) {
                                    no_edit.push({ "HBillType": data1.data[j]["HBillType"], "HModuleName": data1.data[j]["HModuleName"], "HButtonID": data1.data[j]["HButtonID"], "HButtonName": data1.data[j]["HButtonName"], "HOrder": data1.data[j]["HOrder"], "HHideFlag": data1.data[j]["HHideFlag"], "HEditFlag": data1.data[j]["HEditFlag"] });
                                    no_edit.push({ "HBillType": data1.data[j]["HBillType"], "HModuleName": data1.data[j]["HModuleName"], "HButtonID": data1.data[j]["HButtonID"], "HButtonName": data1.data[j]["HButtonName"], "HOrder": data1.data[j]["HOrder"], "HHideFlag": data1.data[j]["HHideFlag"], "HEditFlag": data1.data[j]["HEditFlag"], "HOtherName": data1.data[j]["HOtherName"] });
                                } else {
                                    data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": data1.data[j]["HHideFlag"] });
                                    data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": data1.data[j]["HHideFlag"], "HOrder": btnOrderLists[i], "HOtherName": data1.data[j]["HOtherName"] });
                                }
                                break;
                            }
                        }
                        if (data.length + no_edit.length == i) {
                            data.push({ "BtnID": btnIdLists[i],"BtnName": btnNameLists[i], "IsHide": false });
                            data.push({ "BtnID": btnIdLists[i], "BtnName": btnNameLists[i], "IsHide": false, "HOtherName": "" });
                        }
                    }
                    option.data = data;
@@ -225,7 +225,9 @@
                , cols: [[
                    { field: 'BtnID', title: '按钮ID', width: 100, hide: false }
                    ,{ field: 'BtnName', title: '按钮名', width: 100 }
                    , { file: 'IsHide', title: '是否隐藏', width: 100, templet: '#IsHide' }
                    , { field: 'IsHide', title: '是否隐藏', width: 100, templet: '#IsHide' }
                    , { field: 'HOtherName', title: '别名', width: 100, edit: true }
                    , { field: 'HOrder', title: '次序', width: 100, edit:true }
                ]]
            };
        }
@@ -242,6 +244,13 @@
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    tableData.push(table.cache["mainTable"][i])


                    //更新次序列表
                    var index_temp = $.inArray(table.cache["mainTable"][i].BtnID, btnIdLists);
                    if (index_temp != -1) {
                        btnOrderLists[index_temp] = (table.cache["mainTable"][i].HOrder == "" ? 0 : table.cache["mainTable"][i].HOrder);
                    }
                }
            }