修改

yangle

2022-08-03 eb6a2854aa5089a87c4d1f16572ad3fd11a11b32

修改

 WebTM/views/grf/ÈðÓëì÷½­ËÕ´òÓ¡Ä£°å.grf

@@ -105,6 +105,9 @@
                Item
                    Name='子件规格'
                End
                Item
                    Name='生产数量'
                End
            End
        End
        Items Column
@@ -373,7 +376,7 @@
    Items ReportHeader
        Item
            Name='ReportHeader1'
            Height=4.39208
            Height=5.00063
            Items Control
                Item
                    Type=FreeGrid
@@ -384,6 +387,7 @@
                        Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                    End
                    ColumnCount=9
                    RowCount=6
                    Items FreeGridColumn
                        Item[1]
                            Width=2.06375
@@ -416,8 +420,8 @@
                                Item
                                    Type=Barcode
                                    Name='Barcode1'
                                    Left=5.21229
                                    Width=3.175
                                    Left=5.60917
                                    Width=3.20146
                                    Height=1.5875
                                    BarcodeType=QRCode
                                    CaptionPosition=None
@@ -426,9 +430,9 @@
                                Item
                                    Type=FieldBox
                                    Name='FieldBox1'
                                    Left=13.9965
                                    Left=10.3981
                                    Top=0.211667
                                    Width=4.39208
                                    Width=3.20146
                                    Height=1.19063
                                    ShrinkFontToFit=T
                                    DataField='单据号'
@@ -438,7 +442,7 @@
                                    Name='StaticBox1'
                                    Left=0.211667
                                    Top=0.211667
                                    Width=4.39208
                                    Width=5.00063
                                    Height=1.19063
                                    Object Font
                                        Name='宋体'
@@ -451,9 +455,9 @@
                                Item
                                    Type=StaticBox
                                    Name='StaticBox2'
                                    Left=12.991
                                    Left=8.99583
                                    Top=0.211667
                                    Width=0.820208
                                    Width=0.79375
                                    Height=1.19063
                                    Object Font
                                        Name='宋体'
@@ -462,6 +466,14 @@
                                        Charset=134
                                    End
                                    Text='ID'
                                End
                                Item
                                    Type=Barcode
                                    Name='Barcode2'
                                    Left=14.3933
                                    Width=4.41854
                                    Height=1.5875
                                    Text='单据号'
                                End
                            End
                            ColSpan=9
@@ -587,6 +599,20 @@
                            End
                            ColSpan=2
                        End
                        Item[6,1]
                            Text='数量'
                        End
                        Item[6,2]
                            FreeCell=T
                            Items Control
                                Item
                                    Type=FieldBox
                                    Name='FieldBox11'
                                    Dock=Fill
                                    DataField='生产数量'
                                End
                            End
                        End
                    End
                End
            End

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_FastList.html

@@ -237,8 +237,16 @@

        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1207'

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_FastList.html

@@ -307,6 +307,7 @@
        form.on('submit(cmdQuery)', function () {
            var HBillNo = $("#HBillNo").val();
            var HSourceBillNo = $("#HSourceBillNo").val();
            var index = layer.load();
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/Gy_Mould/list1',

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_FastList.html

@@ -262,8 +262,16 @@
        
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1203'
@@ -399,60 +407,60 @@


        //加载缓存列表数据
        //function get_Display() {
        //    var ajaxLoad = layer.load();
        //    $.ajax({
        //        url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
        //        type: "GET",
        //        data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
        //        success: function (data1) {
        //            if (data1.count == 1) {
        //                var data = [];
        //                //给空的数组赋值
        //                for (var key in data1.list) {
        //                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
        //                }
        function get_Display() {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
                type: "GET",
                data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }

        //                for (var i = 0; i < data.length; i++) {
        //                    if (data[i].name == '单据内码' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
        //                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
        //                    }
        //                    else {
        //                        switch (data[i].Type) {
        //                            //int
        //                            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;
        //                            default:
        //                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
        //                        }
        //                    }
        //                }
                        for (var i = 0; i < data.length; i++) {
                            if (data[i].name == '单据内码' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    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;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
                            }
                        }

        //                //动态显示列名
        //                table.render({
        //                    elem: '#dj-table'
        //                    , cols: [col]
        //                    , data: data1.data
        //                    , height: 550
        //                    , page: true
        //                    , cellMinWidth: 90
        //                    , limit: 50
        //                    , limits: [50, 500, 5000, 20000]
        //                });
                        //动态显示列名
                        table.render({
                            elem: '#dj-table'
                            , cols: [col]
                            , data: data1.data
                            , height: 550
                            , page: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                        });

        //                layer.close(ajaxLoad);
        //                //layer.alert("查询成功", { icon: 1 });
        //            } else {
        //                layer.close(ajaxLoad);
        //                layer.alert(data1.code + data1.Message, { icon: 5 });
        //            }
        //        }, error: function () {
        //            layer.close(ajaxLoad);
        //            layer.alert("接口请求失败!", { icon: 5 });
        //        }
        //    });
        //}
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //刷新明细页签
        table.render({