日志文件合并处理

yzh

2022-05-23 41ecad7e49a93c493832282b5ecd6c69f464b648

 web/web/GwOrderAudit.aspx

@@ -51,11 +51,10 @@
                $("#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 #auditor").valval(r.Message.Auditor);
                //$("#orderDialog #auditTime").val(r.Message.AuditTime);
                $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

@@ -83,16 +82,15 @@
                $("#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).attr("readonly", "readonly");
                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", "readonly");
                $("#orderDialog #basicNum").val(r.Message.BasicNum, 0).attr("readonly", false);
                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", false);
                $("#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", false);
                $("#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 #auditor").valval(r.Message.Auditor);
                //$("#orderDialog #auditTime").val(r.Message.AuditTime);
                $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

@@ -141,11 +139,12 @@
            var orderId = $("#orderId").val();
            var basicNum = $("#basicNum").val();
            var givingNum = $("#givingNum").val();
            var payAmount = $("#payAmount").val();            
            var price = $("#price").val();
            var auditReason = $("#auditReason").val();
            mytek.confirm("是否确定审核通过该信息？", "数据更新后将无法恢复，请谨慎操作！", function (b) {
                if (b) {
                    $.post("gwOrder.ashx", { "action": "audit", status: 1, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, price: price, auditReason: auditReason }, function (result) {
                    $.post("gwOrder.ashx", { "action": "audit", status: 1, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, payAmount: payAmount, price: price, auditReason: auditReason }, function (result) {
                        mytek.alert(result.Message, result.OK, function () {
                            loadPageList();
                        });
@@ -161,11 +160,12 @@
            var orderId = $("#orderId").val();
            var basicNum = $("#basicNum").val();
            var givingNum = $("#givingNum").val();
            var payAmount = $("#payAmount").val();
            var price = $("#price").val();
            var auditReason = $("#auditReason").val();
            mytek.confirm("是否确定审核不通过该信息？", "数据更新后将无法恢复，请谨慎操作！", function (b) {
                if (b) {
                    $.post("gwOrder.ashx", { "action": "audit", status: 0, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, price: price, auditReason: auditReason }, function (result) {
                    $.post("gwOrder.ashx", { "action": "audit", status: 0, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, payAmount: payAmount, price: price, auditReason: auditReason }, function (result) {
                        mytek.alert(result.Message, result.OK, function () {
                            loadPageList();
                        });
@@ -199,13 +199,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>
@@ -256,6 +256,8 @@
                    <th>订单总条数
                    </th>
                    <th>订单总金额（元）
                    </th>
                    <th>充值金额（元）
                    </th>
                    <th>充值前账号余额（条）
                    </th>
@@ -336,7 +338,7 @@
                                订单基本条数</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                <input type="text" class="form-control" name="basicNum" id="basicNum" value="" maxlength="5"
                                <input type="text" class="form-control" name="basicNum" id="basicNum" 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>
@@ -347,7 +349,7 @@
                                订单赠送条数</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                <input type="text" class="form-control" name="givingNum" id="givingNum" value="" maxlength="5"
                                <input type="text" class="form-control" name="givingNum" id="givingNum" 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>
@@ -358,7 +360,7 @@
                                单价</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                    <input type="text" class="form-control" name="price" id="price" value="" maxlength="5"
                                    <input type="text" class="form-control" name="price" id="price" 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>
@@ -369,7 +371,7 @@
                                订单总条数</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                <input type="text" class="form-control" name="orderNumTotal" id="orderNumTotal" value="" maxlength="5"
                                <input type="text" class="form-control" name="orderNumTotal" id="orderNumTotal" 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>
@@ -380,7 +382,18 @@
                                订单总金额</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                <input type="text" class="form-control" name="orderAmountTotal" id="orderAmountTotal" value="" maxlength="5"
                                <input type="text" class="form-control" name="orderAmountTotal" id="orderAmountTotal" 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">
                                <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>
@@ -391,7 +404,7 @@
                                充值前账号余额</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                <input type="text" class="form-control" name="beforeBalanceNum" id="beforeBalanceNum" value="" maxlength="5"
                                <input type="text" class="form-control" name="beforeBalanceNum" id="beforeBalanceNum" 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>