日志文件合并处理

yzh

2022-05-23 41ecad7e49a93c493832282b5ecd6c69f464b648

 web/web/GwOrderComplete.aspx

@@ -40,23 +40,22 @@

                //$("#orderDialog .modal-title").text("订单明细");
                //$("#orderDialog #action").val("detail");
                $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", false);
                $("#orderDialog #spId").val(r.Message.SpId);
                $("#orderDialog #clientId").val(r.Message.ClientId);
                $("#orderDialog #productId").val(r.Message.ProductId);
                $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", "readonly");
                $("#orderDialog #spId").val(r.Message.SpId).attr("readonly", "readonly");
                $("#orderDialog #clientId").val(r.Message.ClientId).attr("disabled", "disabled");
                $("#orderDialog #productId").val(r.Message.ProductId).attr("disabled", "disabled");
                //$("#orderDialog #comboId").val(r.Message.ComboId);
                $("#orderDialog #basicNum").val(r.Message.BasicNum, 0);
                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0);
                $("#orderDialog #price").val(r.Message.Price / 1000, 0.00);
                $("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0);
                $("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0);
                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0);
                $("#orderDialog #creator").val(r.Message.Creator);
                $("#orderDialog #createTime").val(r.Message.CreateTime);
                //$("#orderDialog #auditor").valval(r.Message.Auditor);
                //$("#orderDialog #auditTime").val(r.Message.AuditTime);
                $("#orderDialog #status").val(r.Message.Status);
                $("#orderDialog #remark").val(r.Message.Remark);
                $("#orderDialog #basicNum").val(r.Message.BasicNum, 0).attr("readonly", "readonly");
                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", "readonly");
                $("#orderDialog #price").val(r.Message.Price / 1000, 0.00).attr("readonly", "readonly");
                $("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0).attr("readonly", "readonly");
                $("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0).attr("readonly", "readonly");
                $("#orderDialog #payAmount").val(r.Message.PayAmount / 1000, 0).attr("readonly", "readonly");
                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
                $("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
                $("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
                $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

                $("#orderDialog").modal("show");
            }, "json");
@@ -94,13 +93,13 @@
        <div class="m-b">
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">代理商客户账户</span>
                    <span class="input-group-addon">客户账户</span>
                    <input type="text" name="ClientId" id="ClientId" class="form-control col-md-2" />
                </div>
            </div>
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">代理商客户名称</span>
                    <span class="input-group-addon">客户名称</span>
                    <input type="text" name="ClientName" id="ClientName" class="form-control col-md-2" />
                </div>
            </div>
@@ -151,6 +150,8 @@
                    <th>订单总条数
                    </th>
                    <th>订单总金额（元）
                    </th>
                    <th>充值金额（元）
                    </th>
                    <th>充值前账号余额（条）
                    </th>
@@ -283,6 +284,17 @@
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                充值金额</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                <input type="text" class="form-control" name="payAmount" id="payAmount" value="" maxlength="10"
                                    onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
                                    oncontextmenu="return false" /><span class="input-group-addon">元 </span>
                                </div>
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                充值前账号余额</label>
                            <div class="col-sm-4">
                                <div class="input-group">