修改bug

Pu Zhibing

5 天以前 51e1b16fcef453674897b96df4466f3fb58b83f7

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js

@@ -173,9 +173,12 @@
        },
        {title: '订单金额', field: 'orderMoney', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                var btn = "0";
                if(row.orderMoney != '' && row.orderMoney != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.orderMoney + '" onfocus="TUser.tooltip()">' + row.orderMoney + '</p>']
                }
                if(row.state == 10 && row.cancel_money != null){
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.cancel_money + '" onfocus="TUser.tooltip()">' + row.cancel_money + '</p>']
                }
                return btn;
            }
@@ -205,6 +208,12 @@
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已完成" onfocus="TUser.tooltip()">已完成</p>']
                    } else if (row.state == 10){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已取消" onfocus="TUser.tooltip()">已取消</p>']
                    } else if (row.state == 11){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="改派中" onfocus="TUser.tooltip()">改派中</p>']
                    } else if (row.state == 12){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="取消待支付" onfocus="TUser.tooltip()">取消待支付</p>']
                    } else if (row.state == 13){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="补差价" onfocus="TUser.tooltip()">补差价</p>']
                    }
                }
                return btn;
@@ -255,7 +264,8 @@
        } else {
            nickname = "【" + nickname + "】";
        }
        if (TOrderLogistics.seItem.state == 9 || TOrderLogistics.seItem.state == 10 ) {
        if (TOrderLogistics.seItem.state == 6 || TOrderLogistics.seItem.state == 7 || TOrderLogistics.seItem.state == 8 ||
                TOrderLogistics.seItem.state == 9 || TOrderLogistics.seItem.state == 10 ) {
            swal("取消失败", "【已完成】【已取消】状态下不能执行此操作", "warning");
            return;
        }