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

LR-20210131IOQH\Administrator

2021-08-10 d4a6d65f5e449c3e5464aa18ae97bf8953987217

 zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml

@@ -28,8 +28,13 @@
            {
                label: '操作', name: 'Caozuo', labtype: 'txt', hidden: false, width: 50,
                formatter: function (cellvalue, options, rowObject) {
                   
                    return "<a onclick=\"OpenWindow('" + rowObject.OrderNo + "','98%','100%', '/FiOrderrecievemoney/Edit?OrderId=" + rowObject.Id + "')\"  > 订单收款</a>";
                    if (rowObject.WeishouMoney > 0) {
                        return "<a onclick=\"OpenWindow('" + rowObject.OrderNo + "','98%','100%', '/FiOrderrecievemoney/Edit?OrderId=" + rowObject.Id + "')\"  > 订单收款</a>";

                    } else {
                        return "已付款";

                    }
                   

                }