开发第三版，主要是修复bug

wzp

2022-10-25 1961452ebc018cf758924f26d9c7aa0b31495227

 web/web/GwOrderComplete.aspx

@@ -9,14 +9,14 @@

        function loadPageList() {
            var clientId = $("#ClientId").val();
            var clientName = $("#ClientName").val();
            var compay = $("#Compay").val();
            var spId = $("#SpId").val();
            var startDate = $("#StartTime").val();
            var endDate = $("#EndTime").val();
            $.ajax({
                url: "GwOrder.ashx",
                type: "POST",
                data: { action: "listComplete", clientId: clientId, clientName: clientName, spId: spId, startDate: startDate, endDate: endDate, flag: 1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
                data: { action: "listComplete", clientId: clientId, compay: compay, spId: spId, startDate: startDate, endDate: endDate, flag: 1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
                success: function(result) {
                    if (result.OK) {
                        $("#orderTable tbody").html(result.Message.Table);
@@ -32,6 +32,31 @@

        $(".input-daterange").datepicker({ keyboardNavigation: !1, forceParse: !1, autoclose: !0 });

        //状态转换名称
        function statusToName(status) {
            if (status == "") {
                return "";
            }
            else if (status == 0) {
                return "待审核";
            }
            else if (status == 1) {
                return "审核中";
            }
            else if (status == 2) {
                return "审核通过";
            }
            else if (status == 3) {
                return "审核不通过";
            }
            else if (status == 4) {
                return "取消";
            }
            else {
                return status;
            }
        }

        $(document).on("click", ".action-modal-detail", function () {
            var orderId = $(this).data("orderid");
            $("#orderDialog .modal-title").text("订单明细");
@@ -40,23 +65,28 @@

                //$("#orderDialog .modal-title").text("订单明细");
                //$("#orderDialog #action").val("detail");
                $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", false);
                $("#orderDialog #spId").val(r.Message.SpId);
                $("#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 #clientId").val(r.Message.ClientId);
                $("#orderDialog #clientCompany").val(r.Message.Company).attr("disabled", "disabled");  //转换名称
                //$("#orderDialog #productId").val(r.Message.ProductId).attr("disabled", "disabled");
                $("#orderDialog #productId").val(r.Message.ProductId);
                $("#orderDialog #productName").val(r.Message.ProductName).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 #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 #status").val(r.Message.Status);
                $("#orderDialog #remark").val(r.Message.Remark);
                $("#orderDialog #statusName").val(statusToName(r.Message.Status)).attr("disabled", "disabled");  //转换名称
                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

                $("#orderDialog").modal("show");
            }, "json");
@@ -94,19 +124,19 @@
        <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>
                    <input type="text" name="ClientName" id="ClientName" class="form-control col-md-2" />
                    <span class="input-group-addon">公司名称</span>
                    <input type="text" name="Compay" id="Compay" class="form-control col-md-2" />
                </div>
            </div>
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">SP账号</span>
                    <span class="input-group-addon">短信账号</span>
                    <input type="text" name="SpId" id="SpId" class="form-control col-md-2" />
                </div>
            </div>
@@ -123,7 +153,7 @@
                </div>
            </div>
            <div class="form-group">
                <div class="input-group">
                <div class="input-group  m-b">
                    <input type="button" value="查询" class="btn btn-primary action-btn-GwOrderQuery" />
                </div>
            </div>
@@ -131,28 +161,36 @@
        <table class="table table-striped table-bordered table-hover" id="orderTable">
            <thead>
                <tr class="header">
                    <!--
                    <th>订单ID
                    </th>
                    <th>账号ID
                    -->
                    <th>短信账号
                    </th>
                    <th>客户ID
                    <th>客户账号
                    </th>
                    <th>产品ID
                    <th>公司名称
                    </th>
                    <th>产品名称
                    </th>
                    <%--<th>套餐ID
                    </th>
                         --%>
                    <th>订单基本条数
                    <th>订单基本条数（条）
                    </th>
                    <th>订单赠送条数
                    <th>订单赠送条数（条）
                    </th>
                    <th>单价（元/条）
                    </th>
                    <th>订单总条数
                    <th>订单总条数（条）
                    </th>
                    <th>订单总金额（元）
                    </th>
                    <th>充值金额（元）
                    </th>
                    <th>充值前账号余额（条）
                    </th>
                    <th>审核人(多级按“,”分隔)
                    </th>
                    <th>创建人
                    </th>
@@ -160,7 +198,7 @@
                    </th>
                    <th>状态
                    </th>
                    <th class="text-right">操作
                    <th class="text-center">操作
                    </th>
                </tr>
            </thead>
@@ -171,7 +209,6 @@
    <div id="pagination">
    </div>
    <div class="footBar">
      
    </div>

    <div class="modal inmodal fade" id="orderDialog" tabindex="-1" role="dialog" aria-hidden="true">
@@ -194,27 +231,41 @@
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                账号ID</label>
                                短信账号</label>
                            <div class="col-sm-4 ">
                                <input type="text" class="form-control" name="spId" id="spId" value="" />
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                客户ID</label>
                                客户账号</label>
                            <div class="col-sm-4 ">
                                <!--
                                <select name="clientId" id="clientId" class="form-control">
                                    <%=GetClientOptions("0")%>
                                    <!%=GetClientOptions("0")%>
                                </select>
                                -->
                                <input type="text" class="form-control" name="clientId" id="clientId" value="" readonly="readonly" />
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                产品ID</label>
                                公司名称</label>
                            <div class="col-sm-4 ">
                                <input type="text" class="form-control" name="clientCompany" id="clientCompany" value="" readonly="readonly" />
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                产品名称</label>
                            <div class="col-sm-4 ">
                                <!--
                                <select name="productId" id="productId" class="form-control">
                                    <%=GetProductOptions("0")%>
                                    <!%=GetProductOptions("0")%>
                                </select>
                                -->
                                <input type="text" class="form-control" name="productName" id="productName" value="" readonly="readonly" />
                                <input type="hidden" class="form-control" name="productId" id="productId" value="" />
                            </div>
                        </div>
                        <%--
@@ -283,6 +334,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">
@@ -310,7 +372,18 @@
                            <label class="col-sm-2 control-label">
                                状态</label>
                            <div class="col-sm-4 ">
                                <input type="text" class="form-control" name="status" id="status" value="" />
                                <!--
                                <select name="status" id="status" class="form-control">
                                    <option value=""></option>
                                    <option value="0">待审核</option>
                                    <option value="1">审核中</option>
                                    <option value="2">审核通过</option>
                                    <option value="3">审核不通过</option>
                                    <option value="4">取消</option>
                                </select>
                                -->
                                <input type="text" class="form-control" name="statusName" id="statusName" value="" />
                                <input type="hidden" class="form-control" name="status" id="status" value="" />
                            </div>
                        </div>
                        <div class="form-group">