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

chenhaozhe

2025-11-21 136e21779cad4e747cc27bff0f1cd4dff4914d24

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_UnbindList.html

@@ -342,7 +342,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_KeyElementBinding/list',
                    url: GetWEBURL() + '/Cj_SingleStation/UnbindBarList',
                    async: false,
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
@@ -364,15 +364,7 @@
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', filter: true});
                                }
                                else if (data[i].name == '配件条码') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '配件条码', filter: true });
                                }
                                else if (data[i].name == '日期') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' }, sort: true, width: 200 });
                                }
                                } 
                                else {
                                    switch (data[i].Type) {
                                        //int
@@ -394,8 +386,8 @@
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , limit: 200
                                , limits: [50, 200, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
@@ -511,7 +503,7 @@
                    sWhere += " and ç”Ÿäº§è®¢å•å· like '%" + HICMOBillNo + "%'";
                }
                if (HBarcode_SN) {
                    sWhere += " and SN码 like '%" + HBarcode_SN + "%'";
                    sWhere += " and DSN like '%" + HBarcode_SN + "%'";
                }
                if (HBarcode_ZB) {
                    sWhere += " and æ ˆæ¿ç  like '%" + HBarcode_ZB + "%'";
@@ -572,8 +564,10 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length >= 1) {
                    HSN = [];
                    HBarCodeID = [];
                    for (var i = 0; i < data.length; i++) {
                        HSN.push(data[i].产品条码);
                        HSN.push(data[i].DSN);
                        HBarCodeID.push(data[i].HBarInterID);
                    }

                    layer.open({
@@ -584,7 +578,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: './Cj_ProcessItemStationPlatform_UnbindEdit.html?OperationType=3&HBarcode_SN=' + HSN.toString()
                        , content: './Cj_ProcessItemStationPlatform_UnbindEdit.html?OperationType=3&HBarcode_SN=' + HSN.toString() + '&HBarCodeID=' + HBarCodeID.toString()
                        , resize: false,
                        end: function () {
                            //刷新页面,