优化

王 垚

2022-07-14 d0cb515dae7ef450a58e8aa7a251406ca36fc36a

优化

 WebSRM/WebSRM.csproj

@@ -867,7 +867,6 @@
    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_PODemandPlanBillList.html" />
    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_EntrustOrderTrackBill.html" />
    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockTrackBill.html" />
    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList - å¤åˆ¶.html" />
    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList_Excel.html" />
    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_SystemLogList.html" />
    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderTrackBill.html" />

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html

@@ -585,7 +585,7 @@
                    , { field: 'HMinQty', title: '内箱包装数', width: 100, edit: 'text' }
                    , { field: 'HBQty', title: '内箱数', width: 100 }
                    , { field: 'HWXQty', title: '外箱包装数', width: 100, edit: 'text' }
                    , { field: 'HWBQty', title: '外箱数', width: 100}
                    , { field: 'HWBQty', title: '外箱数', width: 100 }
                    , { field: 'HPrice', title: '单价', width: 100, hide: true }
                    , { field: 'HMoney', title: '金额', width: 100, hide: true }
                    , { field: 'HMTONO', title: '计划跟踪单号', width: 100 }
@@ -791,21 +791,11 @@
                    });
                }
            });
            //table.on('tool(mainTable)', function (d) {
            //    switch (d.event) {
            //        case "inputHKFPeriod":
            //            $(d.tr).find(".layui-table-edit").keyup(function () {
            //                var $input = $(this), val = $input.val();
            //                if (!val) val = "1";
            //                $input.val(val.replace(/[^\d]/g, ''));
            //            });
            //            break;
            //    }
            //});
            table.on('edit(mainTable)', function (obj) { //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值"
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段
           
                var HMinQty = 0;
                var HWXQty = 0;
                var HKFPeriod = 0;
@@ -826,41 +816,45 @@
                if (obj.data.HBQty != undefined) {
                    HBQty = parseFloat(obj.data.HBQty);
                }
                //HMinQty å†…箱包装数
                //HBQty å†…箱数
                //HWXQty å¤–箱包装数
                //HWBQty å¤–箱数 HWBQty
                switch (field) {
                    case "HMinQty":
                    case "HQty":
                        obj.update({
                            HMinQty: 0,
                            HBQty: 0,
                            HWXQty: 0,
                            HWBQty: 0,
                        });
                        break;
                    case "HMinQty": //内箱包装数
                        if (HMinQty < 0) {
                            f_alert("内箱包装数不能为负数!");
                        }
                        else if (HWBQty > HBQty) {
                            f_alert("外箱数量不能超出内箱数量")
                        else if (HWXQty > 0 && HMinQty > HWXQty) {
                            f_alert("内箱包装数量不能超出外箱包装数量")
                            obj.update({
                                HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                                HWXQty: 0,
                                HWBQty: 0,
                            });
                            return;
                        }
                        else (HWXQty >= 0)
                        else (HWXQty > 0)//外箱包装数大于0时候
                        {
                            obj.update({
                                //外箱包装总数 =  å†…箱数量/外箱数量 * å†…箱包装数量
                                HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                                HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),

                            });
                            if (parseFloat(obj.data.HWBQty) > 0)
                                obj.update({
                                    HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
                                });
                        }
                        break;
                    //case "HWBQty": //外箱个数发生变化
                    //    if (HWBQty < 0) {
                    //        f_alert("外箱数量不能为负数")
                    //        return;
                    //    }
                    //    else if (HWBQty > HBQty) {
                    //        f_alert("外箱数量不能超出内箱数量")
                    //        return;
                    //    }
                    //    else {
                    //        obj.update({
                    //            //外箱包装总数 =  å†…箱数量/外箱数量 * å†…箱包装数量
                    //            HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
                    //            //HWXQty: 12
                    //        });
                    //    }
                    //    break;
                    case "HWXQty":
                        if (HWXQty > 0) {
                            if (HMinQty >= 0) {

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html

@@ -300,7 +300,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=SRM_POOrderBillList', 'yes']
                                , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=HBarCodePrint', 'yes']
                                , resize: false
                                //, cancel: function () {
                                //    $(".layui-btn").removeClass("layui-btn-disabled");

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList - ¸´ÖÆ.html

File was deleted