瀏覽代碼

订单列表简化

chao 3 年之前
父節點
當前提交
8aa3859b46

+ 2 - 26
src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1825,7 +1825,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 order.setShopName(shopOrders.get(0).getShopName());
             }
             int count = 0;
-            Double brokerage = 0d;
             for (NewShopOrder shopOrder : order.getNewShopOrders()) {
                 shopOrder.setOrderID(order.getOrderID());
                 shopOrder.setOrderNo(order.getOrderNo());
@@ -1844,39 +1843,17 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     shopOrder.setFee(newShopOrder.getFee());
                     shopOrder.setShouldPayProduct(newShopOrder.getShouldPayProduct());
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrderID);
-//                    AtomicReference<Double> productBrokerage = new AtomicReference<>(0d);
-                    pList.forEach(p -> {
+                    pList.forEach(orderProduct -> {
                         //充值定金商品
-                        if (6060 == p.getProductID()) {
+                        if (6060 == orderProduct.getProductID()) {
                             order.setRechargeGoods(1);
                         }
-//                        Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(newShopOrder.getShopOrderID(), p.getOrderProductID());
-//                        returnNum = returnNum == null ? 0 : returnNum;
-//                        p.setReturnedNum(returnNum);
-//                        Double price = p.getDiscountPrice();
-//                        if (null != p.getTouchPrice() && p.getTouchPrice() > 0d){
-//                            price = p.getTouchPrice();
-//                        }
-//                        double tempV = (price + p.getAddedValueTax() - p.getCostPrice() - p.getSingleShouldPayTotalTax()) * (p.getNum() + p.getPresentNum() - p.getReturnedNum());
-//                        productBrokerage.updateAndGet(v -> v + tempV);
                     });
-//                    if (newShopOrder.getShopPostFee() == null) {
-//                        newShopOrder.setShopPostFee(0D);
-//                    }
-//                    if (newShopOrder.getShopOtherFee() == null) {
-//                        newShopOrder.setShopOtherFee(0D);
-//                    }
-//                    double shopBrokerage = productBrokerage.get() - newShopOrder.getShopOtherFee() - newShopOrder.getShopPostFee();
-//                    newShopOrder.setBrokerage(shopBrokerage);
-//                    brokerage += newShopOrder.getBrokerage();
-                    Integer orderID=  shopOrder.getOrderID();
                 } else {
                     shopOrder.setFee(0d);
                     shopOrder.setShouldPayProduct(0d);
                 }
             }
-
-            order.setBrokerage(cmUtilsDao.selectPayTotalFees(order.getOrderID()));
             //一个子订单只有一个商品时,不可拆分
             if (order.getProductCount() == null) {
                 order.setProductCount(1);
@@ -1921,7 +1898,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         }
         return pageResult;
     }
-
     /**
      * 判断是否是游客
      *

+ 21 - 795
src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -6,686 +6,35 @@
     <title>订单管理</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
-        .table th {
-            text-align: center;
-        }
-
-        .table td {
-            text-align: center;
-        }
-
-        .data-title {
-            width: 100%;
-            display: table;
-        }
-
-        .data-title ul li {
-            word-break: break-all;
-            display: table-cell;
-            width: 100px;
-            border: 1px solid #000;
-            text-align: center;
-            height: 35px;
-            vertical-align: middle;
-            border-right: 0;
-            border-bottom: 0
-        }
-
-        .data-title ul {
-            margin-bottom: 0 !important;
-            display: table-row;
-        }
-
-        .data-title ul li:last-of-type {
-            width: 120px;
-            border-right: 1px solid #000000;
-        }
-
-        .data-title ul:last-of-type li {
-            border-bottom: 1px solid #000000
-        }
-
-        .data-title ul li:nth-child(6) {
-            width: 80px
-        }
-
-        .spileOrder li:nth-of-type(1) {
-            position: relative
-        }
-
-        .san {
-            width: 10px;
-            height: 10px;
-            border-top: 2px solid #000;
-            border-right: 2px solid #000;
-            transform: rotate(45deg);
-            position: absolute;
-            right: -2px;
-            top: 50%;
-            margin-top: -5px;
-            cursor: pointer
-        }
-
-        .red-waring {
-            margin: 0 !important;
-            background-color: #f3f3f3 !important;
-        }
-
-        .red-waring li {
-            border-color: red !important;
-        }
-
-        #biao1 {
-            position: absolute;
-            left: -9999px;
-            top: -9999px;
-            z-index: -99;
-            width: 1px;
-            height: 1px;
-        }
-
-        .operation-btn {
-            cursor: pointer;
-        }
-
-        .operation-block {
-            background: #fff;
-            position: absolute;
-            right: 2px;
-            padding: 10px;
-            border: 1px solid #666;
-            -webkit-border-radius: 5px;
-            -moz-border-radius: 5px;
-            border-radius: 5px;
-            z-index: 100001;
-            display: none;
-        }
-
-        .operation-block a {
-            display: block;
-            padding: 3px 0;
-        }
-
-        .refund-selector {
-            width: 150px;
-            height: 26px;
-            line-height: 26px;
-            text-indent: 10px;
-            background: #fff;
-            display: inline-block;
-            -webkit-border-radius: 3px;
-            -moz-border-radius: 3px;
-            border-radius: 3px;
-            border: 1px solid #ccc;
-            vertical-align: middle;
-            position: relative;
-            cursor: pointer;
-        }
-
-        .refund-selector ul {
-            z-index: 999;
-        }
-
-        .refund-selector li {
-            width: 100%;
-            text-indent: 10px;
-        }
-
-        .refund-selector li:hover {
-            background: #3875d7;
-            color: #fff;
-        }
-
-        .refund-arrow {
-            display: inline-block;
-            width: 18px;
-            height: 100%;
-            position: absolute;
-            right: 0;
-            top: 0;
-            border-left: 1px solid #aaa;
-            border-radius: 0 4px 4px 0;
-            background-clip: padding-box;
-            background: #eee;
-            background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
-            background-image: -webkit-linear-gradient(center bottom, #ccc 0, #eee 60%);
-            background-image: -moz-linear-gradient(center bottom, #ccc 0, #eee 60%);
-            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#cccccc', GradientType=0);
-            background-image: linear-gradient(top, #ccc 0, #eee 60%);
-        }
-
-        .refund-arrow b {
-            display: block;
-            width: 100%;
-            height: 100%;
-            background: url('/static/jquery-select2/3.4/select2.png') no-repeat 0 1px;
-        }
-
-        .refund-block1, .refund-block2 {
-            width: 100%;
-            position: absolute;
-            background: #fff;
-            -webkit-border-radius: 3px;
-            -moz-border-radius: 3px;
-            border-radius: 3px;
-            border: 1px solid #ccc;
-            margin: 0;
-            color: #666;
-            display: none;
-        }
-
-        .refund-more {
-            position: relative;
-        }
-
-        .refund-block1 {
-            top: 26px;
-        }
-
-        .refund-block2 {
-            left: 100%;
-            top: 0;
-        }
-
-        .refund-selector .refund-more:hover .refund-block2 {
-            display: block;
-        }
-
-        #searchForm {
-            line-height: 40px;
-        }
-
-        #searchForm .ul-form {
-            overflow: visible;
-        }
-
-        #searchForm {
-            white-space: nowrap;
-        }
-
-        #searchForm label {
-            margin-top: 15px;
-        }
-
-        .ul-form {
-            white-space: nowrap;
-            margin-left: -10px !important;
-        }
-
-        .ul-form label {
-            width: 90px;
-            text-align: right;
-        }
-
-        .time-space-symbols {
-            width: 100px;
-            display: inline-block;
-            text-align: center;
-        }
-
-        #btnSubmit {
-            width: 128px;
-            margin-left: 152px;
-        }
-
-        .select-ele {
-            width: 177px;
-        }
-
-        #auditBox {
-            padding: 20px;
-            line-height: 30px
-        }
-
-        #auditBox p {
-            font-size: 16px;
-            margin: 0 0 0 0;
-        }
-
-        #auditBox .note-div {
-            font-size: 16px;
-        }
-
-        .weishaIcon {
-            background: darkorange;
-            color: white;
-            margin: 0 0px;
-            padding: 0 3px;
-            font-style: normal;
-            font-size: 12px;
-            display: inline-block;
-            border-radius: 2px
-        }
+        .table th{text-align:center}
+        .table td{text-align:center}
+        .data-title{width:100%;display:table}
+        .data-title ul li{word-break:break-all;display:table-cell;width:100px;border:1px solid #000;text-align:center;height:35px;vertical-align:middle;border-right:0;border-bottom:0}
+        .data-title ul{margin-bottom:0 !important;display:table-row}
+        .data-title ul li:last-of-type{width:120px;border-right:1px solid #000000}
+        .data-title ul:last-of-type li{border-bottom:1px solid #000000}
+        .data-title ul li:nth-child(6){width:80px}
+        .spileOrder li:nth-of-type(1){position:relative}
+        .san{width:10px;height:10px;border-top:2px solid #000;border-right:2px solid #000;transform:rotate(45deg);position:absolute;right:-2px;top:50%;margin-top:-5px;cursor:pointer}
+        .red-waring{margin:0 !important;background-color:#f3f3f3 !important}
+        .red-waring li{border-color:red !important}
+        #biao1{position:absolute;left:-9999px;top:-9999px;z-index:-99;width:1px;height:1px}
+        #searchForm{line-height:40px}
+        #searchForm .ul-form{overflow:visible}
+        #searchForm{white-space:nowrap}
+        #searchForm label{margin-top:15px}
+        .ul-form{white-space:nowrap;margin-left:-10px !important}
+        .ul-form label{width:90px;text-align:right}
+        #btnSubmit{width:128px;margin-left:152px}
+        .select-ele{width:177px}
     </style>
-    <script type="text/javascript" src="${ctxStatic}/QRCode/jquery.qrcode.min.js"></script>
-    <script type="text/javascript" src="static/common/clipboard.min.js"></script>
     <script type="text/javascript">
-        function copyUrl2() {
-            var Url2 = document.getElementById("biao1");
-            Url2.select(); // 选择对象
-            document.execCommand("Copy"); // 执行浏览器复制命令
-//            alert("已复制好,可贴粘。");
-        }
-
-        $(document).ready(function () {
-            var lab = '';
-            var val = '';
-            var startRefundTime = $('#startRefundTime');
-            var endRefundTime = $('#endRefundTime');
-            startRefundTime.attr('disabled', 'disabled');
-            endRefundTime.attr('disabled', 'disabled');
-            startRefundTime.val('');
-            endRefundTime.val('');
-            switch ('${orderRefundType}') {
-                case '':
-                    lab = '全部';
-                    val = '';
-                    break;
-                case '0':
-                    lab = '无';
-                    val = '0';
-                    break;
-                case '1':
-                    lab = '全部状态';
-                    val = '1';
-                    break;
-                case '11':
-                    lab = '退款(退货)中';
-                    val = '11';
-                    break;
-                case '12':
-                    lab = '已完成';
-                    val = '12';
-                    startRefundTime.removeAttr('disabled');
-                    endRefundTime.removeAttr('disabled');
-                    startRefundTime.val('${startRefundTime}');
-                    endRefundTime.val('${endRefundTime}');
-                    break;
-                case '13':
-                    lab = '已取消';
-                    val = '13';
-                    break;
-                default:
-            }
-            $("#orderRefundType").val(val);
-            $('.refund-val').text(lab);
-            $('body').click(function (e) {
-                var target = $(e.target),
-                    opBlockEle = target.siblings('.operation-block');
-                if ((target.is('.operation-btn') && opBlockEle.css('display') == 'block') ||
-                    (!target.is('.operation-block') && !target.is('.operation-btn'))) {
-                    $('.operation-block').hide();
-                } else {
-                    $('.operation-block').hide();
-                    opBlockEle.show();
-                }
-            });
-
-            $('.refund-selector').on('click', function () {
-                var block1 = $('.refund-block1');
-                if (block1.css('display') === 'none') {
-                    $('.refund-block1').show();
-                }
-            });
-
-            $('.refund-options').on('click', function (e) {
-                var val = $(this).text();
-                $("#orderRefundType").val($(this).data('v'));
-                var startRefundTime = $('#startRefundTime');
-                var endRefundTime = $('#endRefundTime');
-                if ($(this).data('v') == '12') {
-                    startRefundTime.removeAttr('disabled');
-                    endRefundTime.removeAttr('disabled');
-                } else {
-                    startRefundTime.attr('disabled', 'disabled');
-                    endRefundTime.attr('disabled', 'disabled');
-                    startRefundTime.val('');
-                    endRefundTime.val('');
-                }
-                $('.refund-val').text(val);
-                $('.refund-block1').hide();
-                e.stopPropagation();
-            })
-            if ($(".operation-block").length > 0) {
-                var length = $(".operation-block").length;
-                for (var i = 0; i < length; i++) {
-                    var b = $(".operation-block").get(i);
-                    if ($(b).html().trim() == '') {
-                        $(b).hide();
-                        $(b).prev().hide();
-                    }
-                }
-            }
-
-        });
-
         function page(n, s) {
             $("#pageNo").val(n);
             $("#pageSize").val(s);
             $("#searchForm").submit();
             return false;
         }
-
-        // 二维码分享
-        function QRCodewin(orderId, orderNo) {
-            var html = '<div style="padding:10px;">订单号:' + orderNo + '' +
-                '<div class="code" style="text-align: center;"></div>' +
-                '</div>';
-            $.jBox(html, {
-                title: "订单二维码分享",
-                width: $(top.document).width() - 1700,
-                height: $(top.document).height() - 1600,
-                buttons: {'关闭': true}
-            });
-
-            var enCodeRedirectUrl;
-            var redirectUrl = '${fns:getConfig('caimei.crm.server')}oauth.action?orderId=' + orderId;
-            $.ajax({
-                url: "${ctx}/bulkpurchase/contractOrder/enCode",
-                data: {"redirectUrl": redirectUrl},
-                type: "POST",
-                async: false,
-                success: function (data) {
-                    enCodeRedirectUrl = data.enCodeRedirectUrl;
-                }
-            });
-            var shareUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=${fns:getConfig('weixin.appId')}&redirect_uri=' + enCodeRedirectUrl + '&response_type=code&scope=snsapi_base&state=bulkpurchase#wechat_redirect';
-            $('.code').qrcode({
-                width: 150,
-                height: 150,
-                text: shareUrl
-            });
-        }
-
-        // 供应商链接
-        function shareShopLink(shopOrderID) {
-            var cpTxt = '${fns:getConfig('caimei.crm.server')}supplier/order/shopAuthorizedOrder.rpc?shopOrderID=' + shopOrderID;
-
-            var html = '<div style="padding:10px;">' + cpTxt +
-                '<div class="code" style="text-align: center;"></div>' +
-                '</div>';
-            $('#biao1').val(cpTxt);//设置值
-            $.jBox(html, {
-                title: "复制以下链接,可分享订单信息",
-                width: $(top.document).width() - 1400,
-                height: $(top.document).height() - 1600,
-                buttons: {'复制': 1, '关闭': true},
-//                buttons: { '关闭': true },
-                submit: function (v, h, f) {
-                    if (v == 1) {
-                        copyUrl2()
-//                        alert("1")
-//                        window.clipboardData.setData("text" , cpTxt);
-                    }
-                }
-            });
-        }
-
-        // 终止备注信息
-        function orderRemarkswin(orderStopRemarks) {
-            var html = "<div style='padding:10px;'><textarea id='remarks' name='remarks' rows='5' cols='12' readonly='true'>" + orderStopRemarks + "</textarea></div>";
-            $.jBox(html, {
-                title: "备注",
-                width: $(top.document).width() - 1600,
-                height: $(top.document).height() - 1600,
-                buttons: {'关闭': true}
-            });
-        }
-
-        // 订单终止弹窗
-        function orderStopwin(id, flag) {
-            var html = "<div style='padding:10px;'><font color='red'>*</font>备注:<textarea id='remarks' name='remarks' rows='5' cols='12'></textarea></div>";
-            var submit = function (v, h, f) {
-                if (f.remarks == '') {
-                    $.jBox.tip("请输入您填写备注信息", 'error', {focusId: "remarks"});
-                    return false;
-                }
-//				$.jBox.tip("备注:" + f.remarks);
-                location.href = "${ctx}/bulkpurchase/contractOrder/saveOrderStopInfo?id=" + id + "&flag=" + flag + "&orderStopRemarks=" + f.remarks;
-                return true;
-            };
-
-            $.jBox(html, {title: "确认终止订单?", submit: submit});
-        }
-
-
-        // 未分期确认订单
-        function openwin(id, flag) {
-            var submit = function (v, h, f) {
-                if (v == true) {
-                    location.href = "${ctx}/bulkpurchase/contractOrder/saveConfirmFlag?id=" + id + "&flag=" + flag;
-                }
-                return true;// close
-            };
-            // 自定义按钮
-            $.jBox.confirm("客户已确认了吗?", "确认订单", submit, {buttons: {'确认': true, '取消': false}});
-        }
-
-        // 分期确认订单
-        function stagesOpenwin(id, flag) {
-            var submit = function (v, h, f) {
-                if (v == true) {
-                    location.href = "${ctx}/bulkpurchase/contractOrder/saveStagesConfirmFlag?id=" + id + "&flag=" + flag;
-                }
-                return true;// close
-            };
-            // 自定义按钮
-            $.jBox.confirm("确认此订单可以生成?", "确认订单", submit, {buttons: {'确认': true, '取消': false}});
-        }
-
-        //编辑经理折扣
-        function modelShow(orderID) {
-            top.$.jBox("iframe:${ctx}/order/DiscountFee?orderID=" + orderID, {
-                iframeScrolling: 'yes',
-                top: 150,
-                width: 480,
-                height: 300,
-                persistent: true,
-                title: "编辑经理折扣",
-                buttons: {"确认": '1', "取消": '-1'},
-                submit: function (v, h, f) {
-                    //确定
-                    var $jboxFrame = top.$('#jbox-iframe');
-                    var $mainFrame = top.$('#mainFrame');
-                    if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-                        var rechargeInfo = $jboxFrame[0].contentWindow.submit();
-                        var split = rechargeInfo.split(",");
-                        var payTotalFee = split[0];
-                        var discountFee = split[1];
-                        //取值,然后调用后台接口传入参数,最后刷新页面
-                        if (payTotalFee <= 0) {
-                            return false;
-                        }
-                        $.post("${ctx}/order/saveDiscountFee", {
-                            'discountFee': discountFee,
-                            'orderID': orderID,
-                            'payTotalFee': payTotalFee
-                        }, function (data) {
-                            if (true == data.success) {
-                                refresh();
-                                $.jBox.tip(data.msg, 'info', {timeout: 1000});
-                            } else {
-                                alertx(data.msg, 1000);
-                            }
-                        }, "JSON");//这里返回的类型有:json,html,xml,text
-                    }
-                    return true;
-                }, loaded: function (h) {   //隐藏滚动条
-                    $(".jbox-content", top.document).css("overflow-y", "hidden");
-                }
-            });
-        }
-
-
-        //订单商品备注
-        function remarks(orderID, shopOrderID) {
-            top.$.jBox("iframe:${ctx}/order/cmOrderRemark/remarksView?orderID=" + orderID + "&shopOrderID=" + shopOrderID, {
-                iframeScrolling: 'yes',
-                top: 150,
-                width: 400,
-                height: 480,
-                persistent: true,
-                title: "订单备注信息",
-                buttons: {"确认": '1', "关闭": '-1'},
-                submit: function (v, h, f) {
-                    //确定
-                    var $jboxFrame = top.$('#jbox-iframe');
-                    var $mainFrame = top.$('#mainFrame');
-                    if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-                        var remarks = $jboxFrame[0].contentWindow.submit();
-//                        var arr = item.split(",");
-//                        var remarks = arr[0];
-                        if ('' == remarks) {
-                            alertx("备注信息不能为空!!!")
-                            return false;
-                        }
-                        saveRemarks(remarks, orderID, shopOrderID);
-                        return true;
-                    }
-                    return true;
-                },
-                loaded: function (h) {   //隐藏滚动条
-                    $(".jbox-content", top.document).css("overflow-y", "hidden");
-                }
-            });
-        }
-
-
-        function saveRemarks(remarks, orderID, shopOrderID) {
-            $.post("${ctx}/order/cmOrderRemark/addRemarks", {
-                "remarks": remarks, "orderID": orderID, "shopOrderID": shopOrderID
-            }, function (data) {
-                if (true == data.success) {
-                    refresh();
-                    $.jBox.tip(data.msg, 'info');
-                } else {
-                    $.jBox.tip(data.msg, 'error');
-                }
-            }, "JSON");//这里返回的类型有:json,html,xml,text
-        }
-
-        //修改订单状态弹窗
-        function updateOrderStatus(orderId) {
-            top.$.jBox("iframe:${ctx}/bulkpurchase/contractOrder/orderStatusEdit?orderId=" + orderId, {
-                iframeScrolling: 'yes',
-                top: 150,
-                width: 400,
-                height: 230,
-                persistent: true,
-                title: "更新订单状态",
-                buttons: {"确认修改": '1', "关闭": '-1'},
-                submit: function (v, h, f) {
-                    //确定
-                    var $jboxFrame = top.$('#jbox-iframe');
-                    var $mainFrame = top.$('#mainFrame');
-                    if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
-                        var item = $jboxFrame[0].contentWindow.submit();
-                        var arr = item.split(",");
-                        var orderStatus = arr[0];
-                        var updateDate = arr[1];
-                        if (updateDate == "") {
-                            alertx("时间不能为空!!!")
-                            return false;
-                        }
-                        saveOrderStatus(orderStatus, updateDate, orderId);
-
-                        return true;
-                    }
-                    return true;
-                }
-            });
-        }
-
-        function saveOrderStatus(orderStatus, updateDate, orderId) {
-            $.post("${ctx}/bulkpurchase/contractOrder/saveOrderStatus", {
-                'orderStatus': orderStatus, "updateDate": updateDate, "orderId": orderId
-            }, function (data) {
-                if (true == data.success) {
-                    refresh();
-                    $.jBox.tip(data.msg, 'info');
-                } else {
-                    $.jBox.tip(data.msg, 'error');
-                }
-            }, "JSON");//这里返回的类型有:json,html,xml,text
-        }
-
-        function refresh() {
-            window.location.href = "${ctx}/order/orderList/";
-        }
-
-        function checkfun() {
-            var orderID = $('#orderID').val();
-            var reg = /^[0-9]*$/;
-            if (!reg.test(orderID) && orderID.trim() != "") {
-                alertx("请输入正确的订单ID!");
-                // $('#orderID').val("");
-                return false;
-            }
-            return true;
-        }
-
-        //抹平收款
-        function collection(orderId) {
-            $.post("${ctx}/order/gatheringData", {
-                'orderId': orderId
-            }, function (data) {
-                if (true == data.success) {
-                    var html = "<div id='auditBox'>" +
-                        "<P>确定抹平收款吗?抹平后该订单将变为已收款状态</p>" +
-                        "<P><span>订单金额:<b>¥" + Number(data.payTotalFee).toFixed(2) + "</b></span></p>" +
-                        "<P><span>应收金额:<b>¥" + Number(data.payableAmount).toFixed(2) + "</b><span style='color:#FF0000'>(账户余额抵扣: ¥<b>" + Number(data.balancePayFee).toFixed(2) + "</b>)</span></span></p>" +
-                        "<P><span>已收金额:<b>¥" + Number(data.associateAmount).toFixed(2) + "</b></span></p>" +
-                        "<div><div class='note-div'><span style='color:#FF0000'>*</span>备注</div></div>" +
-                        "<textarea name='auditNote' style='width: 100%;min-height:60px;'></textarea>" +
-                        "<div class='note-div' style='display: none' id='noteError'><span style='color:#FF0000'>请填写备注</span> </div>" +
-                        "</div>";
-                    $.jBox(html, {
-                        title: "确认提示", width: 500, height: 400, buttons: {"确定": '1', "取消": '-1'},
-                        submit: function (v, h, f) {
-                            if ('1' == v) {
-                                if ((Number(data.payTotalFee) - Number(data.associateAmount)) > 10) {
-                                    alertx("订单剩余应收金额大于¥10.00,不能抹平!");
-                                    return false;
-                                }
-                                var content = document.getElementsByName("auditNote")[0].value;
-                                if (content == '' || content == null) {
-                                    document.getElementById('noteError').style.display = 'block';
-                                    return false;
-                                }
-                                $.post("${ctx}/order/smoothOutCollection", {
-                                    'orderID': orderId,
-                                    'balanceAccountsRemark': content
-                                });
-                                window.location.href = "${ctx}/order/detail?id=" + orderId;
-                            }
-                        }
-                    });
-
-                } else {
-                    $.jBox.tip(data.msg, 'error');
-                }
-            }, "JSON");//这里返回的类型有:json,html,xml,text
-        };
-
-        //抹平收款备注
-        /*function moPingNote(orderId) {
-            $.post("${ctx}/order/gatheringData", {
-                'orderId': orderId
-            }, function (data) {
-                if (true == data.success) {
-                    var html = "<div id='auditBox'>" +
-                        "<P><span>订单金额:<b>¥" + Number(data.payTotalFee).toFixed(2) + "</b></span></p>" +
-                        "<P><span>应收金额:<b>¥" + Number(data.payableAmount).toFixed(2) + "</b><span style='color:#FF0000'>(账户余额抵扣: ¥<b>" + Number(data.balancePayFee).toFixed(2) + "</b>)</span></span></p>" +
-                        "<P><span>已收金额:<b>¥" + Number(data.associateAmount).toFixed(2) + "</b></span></p>" +
-                        "<P><span>备注:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+data.balanceAccountsRemark+"</p></span></p>" +
-                        "</div>";
-                    $.jBox(html, {
-                        title: "备注", width: 450, height: 300, buttons: {"关闭": true}
-                    })
-                }
-            })
-        }*/
-
     </script>
 </head>
 <body>
@@ -868,7 +217,6 @@
         <li>退款状态</li>
         <li>待审核退款</li>
         <li>订单金额</li>
-        <%--        <li>抹平金额</li>--%>
         <li>下单时间</li>
         <li>确认时间</li>
         <li>操作</li>
@@ -1028,128 +376,6 @@
             </li>
             <li class="operation-wrap">
                 <a href="${ctx}/order/detail?id=${order.orderID}">查看详情</a>
-<%--                <a class="operation-btn">功能</a>--%>
-<%--                <div class="operation-block">--%>
-<%--                    <shiro:hasPermission name="order:order:edit">--%>
-<%--                        &lt;%&ndash;包含订单充值商品就不显示&ndash;%&gt;--%>
-<%--                        <c:if test="${empty order.rechargeGoods}">--%>
-<%--                            <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">--%>
-<%--                                <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>--%>
-<%--                            </c:if>--%>
-<%--                            <c:if test="${order.receiptStatus == 2 && order.status != 6 && order.status != 7}">--%>
-<%--                                <a href="javascript:void(0);" onclick="collection(${order.orderID})">抹平收款</a>--%>
-<%--                            </c:if>--%>
-<%--                        </c:if>--%>
-<%--                        &lt;%&ndash;<c:if test="${order.receiptStatus == 3 && order.confirmType != null && order.confirmType != ''}">--%>
-<%--                            <a href="javascript:void(0);" onclick="moPingNote(${order.orderID})">抹平收款备注</a>--%>
-<%--                        </c:if>&ndash;%&gt;--%>
-<%--                        &lt;%&ndash;采美订单确认/取消/修改订单&ndash;%&gt;--%>
-<%--                        <c:if test="${order.organizeID == 0}">--%>
-<%--                            <c:if test="${order.status == 0}">--%>
-<%--                                <a href="${ctx}/order/confirmOrder?orderID=${order.orderID}"--%>
-<%--                                   onclick="return confirmx('是否确认订单?', this.href)">确认订单</a>--%>
-<%--                            </c:if>--%>
-<%--                            <c:if test="${order.status == 0 || order.status == 11}">--%>
-<%--                                <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"--%>
-<%--                                   onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>--%>
-<%--                            </c:if>--%>
-
-<%--                            <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||--%>
-<%--				            order.status eq 23 || order.status eq 0}">--%>
-<%--                                <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">--%>
-<%--                                    <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">--%>
-<%--                                        <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>--%>
-<%--                                    </c:if>--%>
-<%--                                    <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">--%>
-<%--                                        <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>--%>
-<%--                                    </c:if>--%>
-<%--                                </c:if>--%>
-<%--                            </c:if>--%>
-<%--                            <c:if test="${order.status == 0}">--%>
-<%--                                <c:if test="${order.postageOrderFlag == 1}">--%>
-<%--                                    <a href="${ctx}/order/postageOrderForm?id=${order.orderID}">修改邮费订单</a>--%>
-<%--                                </c:if>--%>
-<%--                            </c:if>--%>
-<%--                        </c:if>--%>
-<%--                        <c:if test="${(order.organizeID == 0 or order.organizeID > 2) && order.status == 11 && order.payStatus == 1}">--%>
-<%--                            <a href="javascript:void(0);"--%>
-<%--                               onclick="modelShow('${order.orderID}')">编辑经理折扣</a>--%>
-<%--                        </c:if>--%>
-<%--                        <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1}">--%>
-<%--                            <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"--%>
-<%--                               onclick="return confirmx('确定将订单转为返佣订单吗?', this.href)">转为返佣订单</a>--%>
-<%--                        </c:if>--%>
-<%--                    </shiro:hasPermission>--%>
-
-<%--                    <shiro:hasPermission name="order:order:applyrefound">--%>
-<%--                        <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">--%>
-<%--                            &lt;%&ndash;  返佣订单不能申请退款(退货) &ndash;%&gt;--%>
-<%--                            <c:if test="${order.rebateOrder == '0'}">--%>
-<%--                                &lt;%&ndash;如果存在审核收款则不允许申请:1不能申请,其它可以申请&ndash;%&gt;--%>
-<%--                                <c:if test="${order.toAudit eq 1}">--%>
-<%--                                    &lt;%&ndash;弹窗提示&ndash;%&gt;--%>
-<%--                                    <a href="#" onclick="return alertx('订单存在未审核的收款,暂不能退款。请将收款审核通过后再操作退款。')">申请退款</a>--%>
-<%--                                </c:if>--%>
-<%--                                <c:if test="${order.toAudit ne 1}">--%>
-<%--                                    &lt;%&ndash;如果存在退款记录在待审核或者审核不通过记录不允许继续退款&ndash;%&gt;--%>
-<%--                                    <c:if test="${order.applyReturnedPurchaseFlag eq 1}">--%>
-<%--                                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}"--%>
-<%--                                           <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款!', this.href)"--%>
-<%--                                        </c:if>--%>
-<%--                                        >--%>
-<%--                                            申请退款--%>
-<%--                                        </a>--%>
-<%--                                    </c:if>--%>
-<%--                                    <c:if test="${order.applyReturnedPurchaseFlag ne 1}">--%>
-<%--                                        <font title="存在未处理完的申请,请前往退款列表处理!">申请退款</font>--%>
-<%--                                    </c:if>--%>
-<%--                                </c:if>--%>
-<%--                            </c:if>--%>
-<%--                        </c:if>--%>
-
-
-<%--                    </shiro:hasPermission>--%>
-
-
-<%--                    <shiro:hasPermission name="order:order:edit">--%>
-
-<%--                        --%>
-<%--                        <c:if test="${order.organizeID == 0}">--%>
-<%--                            <c:if test="${order.status == 11}">--%>
-<%--                                <c:if test="${order.splitFlag == 1}">--%>
-<%--                                    <a href="${ctx}/order/toSplit?id=${order.orderID}">--%>
-<%--                                        拆分订单--%>
-<%--                                    </a>--%>
-<%--                                </c:if>--%>
-<%--                            </c:if>--%>
-<%--                            <a href="javascript:" onclick="QRCodewin(${order.orderID},'${order.orderNo}')">分享二维码</a>--%>
-<%--                            <c:if test="${order.status ne 6 && order.status ne 7}">--%>
-<%--                                <a href="${ctx}/order/editclausecontent?id=${order.orderID}">修改售后条款</a>--%>
-<%--                            </c:if>--%>
-<%--                        </c:if>--%>
-<%--                        <c:if test="${order.status ne 0}">--%>
-<%--                            <a href="${ctx}/order/printOrder?orderID=${order.orderID}">打印发货单</a>--%>
-<%--                        </c:if>--%>
-<%--                        &lt;%&ndash;<a href="/">供应商链接</a>&ndash;%&gt;--%>
-<%--                        <a href="${ctx}/order/exportOrder?id=${order.orderID}">订单导出</a>--%>
-<%--                        <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=1">订单备注</a>--%>
-<%--                        &lt;%&ndash;                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>&ndash;%&gt;--%>
-<%--                        &lt;%&ndash;包含订单充值商品就不显示&ndash;%&gt;--%>
-<%--                        <c:if test="${empty order.rechargeGoods}">--%>
-<%--                            <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">--%>
-<%--                                <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>--%>
-<%--                            </c:if>--%>
-<%--                            <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">--%>
-<%--                                <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=1">收退款记录--%>
-<%--                                </a>--%>
-<%--                            </c:if>--%>
-<%--                            <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">--%>
-<%--                                <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款(退货)记录--%>
-<%--                                </a>--%>
-<%--                            </c:if>--%>
-<%--                        </c:if>--%>
-<%--                    </shiro:hasPermission>--%>
-<%--                </div>--%>
             </li>
         </ul>
     </c:forEach>