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

yusijie

2024-03-15 53b2c932f1fe0624221e3fdff9c8cbba11b2e9af

 WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html

@@ -230,6 +230,13 @@
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -244,6 +251,7 @@
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [500, 2000, 5000, 50000]
                                , limit: 500
                                , cellMinWidth: 90
@@ -344,7 +352,7 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
                        , title: '鐢熶骇宸ヤ綅鍒楄〃-缂栬緫'
                        , shift: 0//寮瑰嚭鍔ㄧ敾
                        , content: './Gy_SourceWorkStationSet.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
@@ -364,7 +372,7 @@
                        var wait = layer.load();
                        //閫昏緫鍒犻櫎鏂规硶
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_PackType',
                            url: GetWEBURL() + 'DeltetGy_SourceWorkStation',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {