修复24-25日反馈的bug

wzp

2022-10-26 a3022b7241480fd71dae97443d98f12e313056be

 web/web/GwSp.aspx

@@ -1,5 +1,7 @@
<%@ Page Language="C#" masterpagefile="~/Main.master"  AutoEventWireup="true" CodeFile="GwSp.aspx.cs" Inherits="_GwSp" %>
<asp:Content runat="server" ID="Content1" ContentPlaceHolderID="head">
    <link href="../static/select2/select2.css" type="text/css" rel="stylesheet" />
    <script src="../static/select2/select2.js" language="javascript" type="text/javascript"></script>
 
    
    <script type="text/javascript" language="javascript">
@@ -17,10 +19,12 @@
                var routerType = $("#routerType").val();
                var clientName = $("#clientName").val();
                var chargeType = $("#chargeType").val();
                var resendStatus = $("#RESEND_STATUS").val();
                var productId = $("#productId").val();
                $.ajax({
                    url: "GwSp.ashx",
                    type: "POST",
                    data: { action: "loadGwSpAccountPageList", spID: spID, apID: apID, opID: opID, routerType: routerType, clientID: clientID, clientName: clientName, chargeType: chargeType, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
                    data: { action: "loadGwSpAccountPageList", spID: spID, apID: apID, opID: opID, routerType: routerType, clientID: clientID, clientName: clientName, chargeType: chargeType, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize(), resendStatus: resendStatus, productId: productId },
                    success: function(result) {
                        if (result.OK) {
                            $("#gwspTable tbody").html(result.Message.Table);
@@ -111,11 +115,18 @@
                }, "json");
            });

            $(document).on("click", ".action-modal-charge", function(e) {
                var id = $(this).data("id");
                $("#chargeDialog .action-charge").data("id", id);
                $("#chargeDialog .title").text(id + "账户充值");
                $("#chargeDialog").modal("show");
            //$(document).on("click", ".action-modal-charge", function(e) {
            //    var id = $(this).data("id");
            //    $("#chargeDialog .action-charge").data("id", id);
            //    $("#chargeDialog .title").text(id + "账户充值");
            //    $("#chargeDialog").modal("show");
            //});

            //充值
            $(document).on("click", ".action-modal-charge", function () {
                var spID = $(this).data("id");  //短信账号
                //window.open("gwOrderCreate.aspx?spId=" + spID, 'gwOrderCreate');
                window.location.href = "gwOrderCreate.aspx?spId=" + spID;
            });

            //编辑账号
@@ -131,8 +142,15 @@
          //新加  
            $(document).on("click", ".action-updateStatus", function () {
                var spid = $(this).attr("data-spid");
                var status=$(this).attr("data-status");
                mytek.confirm("是否需要修改该账户状态？", "是否操作！", function (b) {
                var status = $(this).attr("data-status");
                var statusMsg = "";
                if (status == 0) {
                    statusMsg = "【停用】";
                }
                else {
                    statusMsg = "【启用】";
                }
                mytek.confirm("是否需要" + statusMsg + "该账户状态？", "是否操作！", function (b) {
                    if (b) {
                        $.post("gwsp.ashx", { action: "updateSpStatus", spid: spid,status:status }, function (r) {
                            mytek.alert(r.Message, r.OK, function () {
@@ -168,7 +186,10 @@

            loadPageList();
            
            

            $(document).on("click", ".action-create", function () {
                window.location.href = "gwspupdate.aspx";
            });
            

            $(document).on("click", ".action-export", function() {
@@ -179,9 +200,17 @@
                window.location.href = url;
            });

            //充值日志
            /**
            $(document).on("click", ".action-modal-Acctunchargelog", function() {
                var id = $(this).data("id");
                window.location.href = "GwSpChargeLog.aspx?id=" + id + "";
            });
            **/

            $(document).on("click", ".action-modal-Acctunchargelog", function () {
                var spId = $(this).data("id");
                window.location.href = "GwOrderList.aspx?spId=" + spId + "";
            });

            var serverIp =<%=Newtonsoft.Json.JsonConvert.SerializeObject(ConfigurationManager.AppSettings["serverIp"])%>;
@@ -342,6 +371,12 @@
            }

        });


        $('#parentId').select2({
            placeholder: "请选择关联产品",
            allowClear: true
        });
    </script>
 </asp:Content> 
<asp:Content runat="server" ID="Content2" ContentPlaceHolderID="title">客户账号信息配置</asp:Content> 
@@ -354,7 +389,7 @@
        <div class="ibox">
            <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>
@@ -368,21 +403,30 @@
            -->
            <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>
            
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">通道ID</span>
                    <span class="input-group-addon">通道名</span>
                    <input type="text" name="opID" id="opID" class="form-control col-md-2" />
                </div>
            </div>

            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">关联产品名称</span>
                        <select name="productId" id="productId" class="form-control">
                            <%=GetProductOptions("")%>
                        </select>
                </div>
            </div>
            <div>
@@ -390,7 +434,7 @@
            <div class="form-group">
                <div class="input-group m-b">
                    <select name="routerType" class="form-control" id="routerType">
                        <option value="">路由模式</option>
                        <option value="">--路由模式--</option>
                        <option value="1">通道点路由</option>
                        <option value="3">通道组路由</option>
                    </select>
@@ -399,7 +443,7 @@
            <div class="form-group">
                <div class="input-group m-b">
                    <select name="chargeType" class="form-control" id="chargeType">
                        <option value="">付费方式</option>
                        <option value="">--付费方式--</option>
                        <option value="1">预付费</option>
                        <option value="2">后付费</option>
                    </select>
@@ -408,18 +452,27 @@
            <div class="form-group">
                <div class="input-group m-b">
                    <select name="apID" class="form-control" id="apID">
                        <option value="">接入协议</option>
                        <option value="">--接入协议--</option>
                        <option value="230001">CMPP</option>
                        <option value="230002">HTTP</option>
                    </select>
                </div>
            </div>
             <div class="form-group">
                <div class="input-group m-b">
                    <select name="RESEND_STATUS" class="form-control" id="RESEND_STATUS">
                        <option value="3">自动补发</option>
                        <option value="1">启用补发</option>
                        <option value="0">停用补发</option>
                    </select>
                </div>
            </div>
            <div class="form-group">
                <div class="input-group m-b">
                    <input type="button" value="查询" class="btn btn-primary action-query" />&nbsp;&nbsp;
                    <input class="btn btn-warning  action-create" value="创建新账号" type="button" />&nbsp;&nbsp;
                    <input type="button" value="批量修改通道" class="btn btn-danger action-modal-op" />&nbsp;&nbsp;
                    <input type="button" class="btn btn-info action-export" value="导出数据" />&nbsp;&nbsp;
                    <input class="btn btn-warning  action-create" value="创建新账号" type="button" />
                </div>
            </div>
        </div>
@@ -433,16 +486,41 @@
                        <input type='checkbox' name='checkAll' id='checkAll' />
                    </th>
                    <th>
                        SP账号/接入协议/归属客户
                        短信账号
                    </th>
                    <th>
                        关联产品
                    </th>
                    <th>
                        客户账号
                    </th>
                    <th>
                        公司名称
                    </th>
                    <th>
                        接入协议
                    </th>
                    <th>
                        通道
                    </th>
                    <!--
                    <th>
                        失败补发
                    </th>
                    -->
                    <th>
                        条数/余额/付费方式/单价/告警
                        付费方式
                    </th>
                    <th>
                        参数单价（元/条）
                    </th>
                    <th>
                        余额（总条数/基本条数/赠送条数）
                    </th>
                        <!-- add: yangzh by 2022-03-14 start
                    <th>
                        //条数/余额/付费方式/单价/告警
                        剩余总条数/基本条数/赠送条数/付费方式/单价/告警
                    </th>
                    <th>
                        账号配置属性
@@ -450,13 +528,17 @@
                    <th>
                        扩展号
                    </th>
                         -->
                    <th>
                        客户IP
                    </th>
                    <th>
                        状态
                    </th>
                    <th colspan="4">
                    <th>
                        激活时间
                    </th>
                    <th class="text-center" width="150px">
                        操作
                    </th>
                </tr>
@@ -474,7 +556,7 @@
                <div class="modal-header">
                    <h3>
                        批量修改通道</h3>
                    </span><a class="close" data-dismiss="modal" aria-hidden="true">×</a> <span class="text-muted">
                    <a class="close" data-dismiss="modal" aria-hidden="true">×</a> <span class="text-muted">
                        批量更改通道[组]将会更新所有选中的账号的通道[组]，<br />
                        如果移动、联通或电信 没有设置通道[组]，所选账号通道[组]都将被清空，请谨慎操作！ </span>
                </div>
@@ -483,11 +565,11 @@
                        <label class="col-sm-2 control-label">
                            移动通道
                        </label>
 <div class="col-sm-10">
 <select name="CMOPID" id="CMOPID" class="form-control">
                 <div class="col-sm-10">
                 <select name="CMOPID" id="CMOPID" class="form-control">
 
 <%=GetOpOptions(0)%>
  </select>
                 <%=GetOpOptions(0)%>
                  </select>
  
 
                        </div>
@@ -551,12 +633,54 @@
            </div>
        </div>
    </div>
    <%--
    <div class="modal inmodal fade" id="chargeDialog" tabindex="-1" role="dialog" aria-hidden="true">
        <div class="modal-dialog form-horizontal">
            <div class="modal-content animated ">
                <div class="modal-header">
                    <span class="title">账户充值</span><a class="close" data-dismiss="modal" aria-hidden="true">×</a></div>
                <div class="modal-body">
                    <div class="form-group">
                        <label class="col-sm-2 control-label">
                            充值金额</label>
                        <div class="col-sm-10 input-group m-b">
                            <input type="text" class="form-control" name="amount" id="amount" value="" />
                            <span class="input-group-addon">￥</span>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">
                            备注</label>
                        <div class="col-sm-10 input-group m-b">
                            <input type="text" class="form-control" name="remark" id="remark" value="" />
                            <span class="input-group-addon"></span>
                        </div>
                    </div>
                </div>
                <div class="modal-footer">
                    <button class="btn-default btn" data-dismiss="modal" aria-hidden="true">
                        取消</button>&nbsp;&nbsp;
                    <input class="btn btn-primary action-charge" value="确定充值" type="button" />
                </div>
            </div>
        </div>
    </div>
    --%>
    
    <div class="modal inmodal fade" id="chargeDialog" tabindex="-1" role="dialog" aria-hidden="true">
        <div class="modal-dialog form-horizontal">
            <div class="modal-content animated ">
                <div class="modal-header">
                    <span class="title">账户充值</span><a class="close" data-dismiss="modal" aria-hidden="true">×</a></div>
                <div class="modal-body">
                    <div class="form-group">
                        <label class="col-sm-2 control-label">
                            充值金额</label>
                        <div class="col-sm-10 input-group m-b">
                            <input type="text" class="form-control" name="amount" id="amount" value="" />
                            <span class="input-group-addon">￥</span>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">
                            充值金额</label>
@@ -604,5 +728,5 @@
        <div id="mask" class="mask">
            <span></span>
            <img src="img/spinning-circles.svg" alt="载入中..." /></div>
    </div>
    
   </asp:Content>