Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

LR-20210131IOQH\Administrator

2021-08-10 d4a6d65f5e449c3e5464aa18ae97bf8953987217

 zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml

@@ -283,11 +283,6 @@

            });






        var delPosition = function () {
            if (id == null || id == '') {
                toastr.warning("请先保存");
@@ -373,15 +368,15 @@
                        if (data.Result) {
                            //  parent._afterSave(true);
                            parent.layer.msg('成功保存', { icon: 6 });
                            //window.location = "/Project/add?id=" + data.ReturnID;
                            window.location = "/AdmGoodsManage/Edit";


                            try {
                                _pageAutoClose();//自动关闭页面方法
                            }
                            catch (err) {
                                parent._CloseTab1("/AdmGoodsManage/Edit/");
                            }
                            //try {
                            //    _pageAutoClose();//自动关闭页面方法
                            //}
                            //catch (err) {
                            //    parent._CloseTab1("/AdmGoodsManage/Edit/");
                            //}

                        }
                        else {